Merge pull request #3 from drowe67/dr-cleanup21.2.0

Cleanup Part 2

1 files changed, 33 insertions, 23 deletions

diff --git a/src/freedv_data_channel.h b/src/freedv_data_channel.h
index f7fac4a..e0b5f42 100644
--- a/src/freedv_data_channel.h
+++ b/src/freedv_data_channel.h
@@ -35,36 +35,46 @@
 
 #define FREEDV_DATA_CHANNEL_PACKET_MAX 2048
 
-typedef void (*freedv_data_callback_rx)(void *, unsigned char *packet, size_t size);
-typedef void (*freedv_data_callback_tx)(void *, unsigned char *packet, size_t *size);
+typedef void (*freedv_data_callback_rx)(void *, unsigned char *packet,
+                                        size_t size);
+typedef void (*freedv_data_callback_tx)(void *, unsigned char *packet,
+                                        size_t *size);
 
 struct freedv_data_channel {
-    freedv_data_callback_rx cb_rx;
-    void *cb_rx_state;
-     freedv_data_callback_tx cb_tx;
-    void *cb_tx_state;
-   
-    unsigned char rx_header[8];
-    unsigned char packet_rx[FREEDV_DATA_CHANNEL_PACKET_MAX + 2];
-    int packet_rx_cnt;
-    
-    unsigned char tx_header[8];
-    unsigned char packet_tx[FREEDV_DATA_CHANNEL_PACKET_MAX + 2];
-    int packet_tx_cnt;
-    size_t packet_tx_size;
+  freedv_data_callback_rx cb_rx;
+  void *cb_rx_state;
+  freedv_data_callback_tx cb_tx;
+  void *cb_tx_state;
+
+  unsigned char rx_header[8];
+  unsigned char packet_rx[FREEDV_DATA_CHANNEL_PACKET_MAX + 2];
+  int packet_rx_cnt;
+
+  unsigned char tx_header[8];
+  unsigned char packet_tx[FREEDV_DATA_CHANNEL_PACKET_MAX + 2];
+  int packet_tx_cnt;
+  size_t packet_tx_size;
 };
 
-
 struct freedv_data_channel *freedv_data_channel_create(void);
 void freedv_data_channel_destroy(struct freedv_data_channel *fdc);
 
-void freedv_data_set_cb_rx(struct freedv_data_channel *fdc, freedv_data_callback_rx cb, void *state);
-void freedv_data_set_cb_tx(struct freedv_data_channel *fdc, freedv_data_callback_tx cb, void *state);
-
-void freedv_data_channel_rx_frame(struct freedv_data_channel *fdc, unsigned char *data, size_t size, int from_bit, int bcast_bit, int crc_bit, int end_bits);
-void freedv_data_channel_tx_frame(struct freedv_data_channel *fdc, unsigned char *data, size_t size, int *from_bit, int *bcast_bit, int *crc_bit, int *end_bits);
-
-void freedv_data_set_header(struct freedv_data_channel *fdc, unsigned char *header);
+void freedv_data_set_cb_rx(struct freedv_data_channel *fdc,
+                           freedv_data_callback_rx cb, void *state);
+void freedv_data_set_cb_tx(struct freedv_data_channel *fdc,
+                           freedv_data_callback_tx cb, void *state);
+
+void freedv_data_channel_rx_frame(struct freedv_data_channel *fdc,
+                                  unsigned char *data, size_t size,
+                                  int from_bit, int bcast_bit, int crc_bit,
+                                  int end_bits);
+void freedv_data_channel_tx_frame(struct freedv_data_channel *fdc,
+                                  unsigned char *data, size_t size,
+                                  int *from_bit, int *bcast_bit, int *crc_bit,
+                                  int *end_bits);
+
+void freedv_data_set_header(struct freedv_data_channel *fdc,
+                            unsigned char *header);
 int freedv_data_get_n_tx_frames(struct freedv_data_channel *fdc, size_t size);
 
 #endif /* _FREEDV_DATA_CHANNEL_H */