Various fax_modems.c related improvements

libs/spandsp/src/spandsp/fax_modems.h

@@ -65,10 +65,30 @@ SPAN_DECLARE_NONSTD(int) fax_modems_v17_v21_rx_fillin(void *user_data, int len);
 SPAN_DECLARE_NONSTD(int) fax_modems_v27ter_v21_rx_fillin(void *user_data, int len);
 SPAN_DECLARE_NONSTD(int) fax_modems_v29_v21_rx_fillin(void *user_data, int len);
 
+SPAN_DECLARE(void) fax_modems_hdlc_tx_frame(void *user_data, const uint8_t *msg, int len);
+
+SPAN_DECLARE(void) fax_modems_hdlc_tx_flags(fax_modems_state_t *s, int flags);
+
 SPAN_DECLARE(void) fax_modems_start_rx_modem(fax_modems_state_t *s, int which);
 
+SPAN_DECLARE(void) fax_modems_start_fast_modem(fax_modems_state_t *s, int which, int bit_rate, int short_train, int hdlc_mode);
+
+SPAN_DECLARE(void) fax_modems_start_slow_modem(fax_modems_state_t *s, int which);
+
 SPAN_DECLARE(void) fax_modems_set_tep_mode(fax_modems_state_t *s, int use_tep);
 
+SPAN_DECLARE(void) fax_modems_set_rx_handler(fax_modems_state_t *s,
+                                             span_rx_handler_t rx_handler,
+                                             void *rx_user_data,
+                                             span_rx_fillin_handler_t rx_fillin_handler,
+                                             void *rx_fillin_user_data);
+
+SPAN_DECLARE(void) fax_modems_set_rx_active(fax_modems_state_t *s, int active);
+
+SPAN_DECLARE(void) fax_modems_set_tx_handler(fax_modems_state_t *s, span_tx_handler_t handler, void *user_data);
+
+SPAN_DECLARE(void) fax_modems_set_next_tx_handler(fax_modems_state_t *s, span_tx_handler_t handler, void *user_data);
+
 SPAN_DECLARE(int) fax_modems_restart(fax_modems_state_t *s);
 
 /*! Get a pointer to the logging context associated with a FAX modems context.

libs/spandsp/src/spandsp/private/fax_modems.h

@@ -82,11 +82,30 @@ struct fax_modems_state_s
     /*! \brief */
     dc_restore_state_t dc_restore;
 
+    /*! \brief The fast modem type currently in use */
+    int fast_modem;
+
     /*! \brief The currently selected receiver type */
     int current_rx_type;
     /*! \brief The currently selected transmitter type */
     int current_tx_type;
 
+    int bit_rate;
+    int short_train;
+
+    /*! \brief The callback function used to put each bit received. */
+    put_bit_func_t put_bit;
+    /*! \brief A user specified opaque pointer passed to the put_bit routine. */
+    void *put_bit_user_data;
+
+    /*! \brief The callback function used to get the next bit to be transmitted. */
+    get_bit_func_t get_bit;
+    /*! \brief A user specified opaque pointer passed to the get_bit function. */
+    void *get_bit_user_data;
+
+    hdlc_frame_handler_t hdlc_accept;
+    void *hdlc_accept_user_data;
+
     /*! \brief TRUE if a carrier is present. Otherwise FALSE. */
     int rx_signal_present;
     /*! \brief TRUE if a modem has trained correctly. */
@@ -96,9 +115,9 @@ struct fax_modems_state_s
 
     /*! \brief The current receive signal handler */
     span_rx_handler_t rx_handler;
+    void *rx_user_data;
     /*! \brief The current receive missing signal fill-in handler */
     span_rx_fillin_handler_t rx_fillin_handler;
-    void *rx_user_data;
     void *rx_fillin_user_data;
 
     /*! \brief The current transmit signal handler */