]> sigrok.org Git - libsigrok.git/blobdiff - hwdriver.c
Get rid of global session.
[libsigrok.git] / hwdriver.c
index f55a6790ccc4a941a1a05dd246290838254ab3ec..4434a5b7f93b3c5985f113581e834192e40e9679 100644 (file)
@@ -31,6 +31,8 @@
 #define LOG_PREFIX "hwdriver"
 /** @endcond */
 
+extern SR_PRIV struct sr_dev_driver *drivers_list[];
+
 /**
  * @file
  *
  */
 
 static struct sr_config_info sr_config_info_data[] = {
-       {SR_CONF_CONN, SR_T_CHAR, "conn",
+       {SR_CONF_CONN, SR_T_STRING, "conn",
                "Connection", NULL},
-       {SR_CONF_SERIALCOMM, SR_T_CHAR, "serialcomm",
+       {SR_CONF_SERIALCOMM, SR_T_STRING, "serialcomm",
                "Serial communication", NULL},
        {SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
                "Sample rate", NULL},
        {SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
                "Pre-trigger capture ratio", NULL},
-       {SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
+       {SR_CONF_PATTERN_MODE, SR_T_STRING, "pattern",
                "Pattern", NULL},
-       {SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
-               "Trigger types", NULL},
+       {SR_CONF_TRIGGER_MATCH, SR_T_INT32, "triggermatch",
+               "Trigger matches", NULL},
        {SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
                "External clock mode", NULL},
        {SR_CONF_SWAP, SR_T_BOOL, "swap",
                "Swap channel order", NULL},
        {SR_CONF_RLE, SR_T_BOOL, "rle",
                "Run Length Encoding", NULL},
-       {SR_CONF_TRIGGER_SLOPE, SR_T_CHAR, "triggerslope",
+       {SR_CONF_TRIGGER_SLOPE, SR_T_STRING, "triggerslope",
                "Trigger slope", NULL},
-       {SR_CONF_TRIGGER_SOURCE, SR_T_CHAR, "triggersource",
+       {SR_CONF_TRIGGER_SOURCE, SR_T_STRING, "triggersource",
                "Trigger source", NULL},
        {SR_CONF_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos",
                "Horizontal trigger position", NULL},
@@ -74,17 +76,17 @@ static struct sr_config_info sr_config_info_data[] = {
                "Buffer size", NULL},
        {SR_CONF_TIMEBASE, SR_T_RATIONAL_PERIOD, "timebase",
                "Time base", NULL},
-       {SR_CONF_FILTER, SR_T_CHAR, "filter",
+       {SR_CONF_FILTER, SR_T_STRING, "filter",
                "Filter targets", NULL},
        {SR_CONF_VDIV, SR_T_RATIONAL_VOLT, "vdiv",
                "Volts/div", NULL},
-       {SR_CONF_COUPLING, SR_T_CHAR, "coupling",
+       {SR_CONF_COUPLING, SR_T_STRING, "coupling",
                "Coupling", NULL},
        {SR_CONF_DATALOG, SR_T_BOOL, "datalog",
                "Datalog", NULL},
-       {SR_CONF_SPL_WEIGHT_FREQ, SR_T_CHAR, "spl_weight_freq",
+       {SR_CONF_SPL_WEIGHT_FREQ, SR_T_STRING, "spl_weight_freq",
                "Sound pressure level frequency weighting", NULL},
-       {SR_CONF_SPL_WEIGHT_TIME, SR_T_CHAR, "spl_weight_time",
+       {SR_CONF_SPL_WEIGHT_TIME, SR_T_STRING, "spl_weight_time",
                "Sound pressure level time weighting", NULL},
        {SR_CONF_HOLD_MAX, SR_T_BOOL, "hold_max",
                "Hold max", NULL},
@@ -96,7 +98,7 @@ static struct sr_config_info sr_config_info_data[] = {
                "Voltage threshold", NULL },
        {SR_CONF_POWER_OFF, SR_T_BOOL, "power_off",
                "Power off", NULL},
-       {SR_CONF_DATA_SOURCE, SR_T_CHAR, "data_source",
+       {SR_CONF_DATA_SOURCE, SR_T_STRING, "data_source",
                "Data source", NULL},
        {SR_CONF_NUM_LOGIC_CHANNELS, SR_T_INT32, "logic_channels",
                "Number of logic channels", NULL},
@@ -112,7 +114,7 @@ static struct sr_config_info sr_config_info_data[] = {
                "Maximum output current", NULL},
        {SR_CONF_OUTPUT_ENABLED, SR_T_BOOL, "output_enabled",
                "Output enabled", NULL},
-       {SR_CONF_OUTPUT_CHANNEL, SR_T_CHAR, "output_channel",
+       {SR_CONF_OUTPUT_CHANNEL, SR_T_STRING, "output_channel",
                "Output channel modes", NULL},
        {SR_CONF_OVER_VOLTAGE_PROTECTION, SR_T_BOOL, "ovp",
                "Over-voltage protection", NULL},
@@ -120,332 +122,17 @@ static struct sr_config_info sr_config_info_data[] = {
                "Over-current protection", NULL},
        {SR_CONF_LIMIT_SAMPLES, SR_T_UINT64, "limit_samples",
                "Sample limit", NULL},
-       {SR_CONF_CLOCK_EDGE, SR_T_CHAR, "clock_edge",
+       {SR_CONF_CLOCK_EDGE, SR_T_STRING, "clock_edge",
                "Clock edge", NULL},
        {0, 0, NULL, NULL, NULL},
 };
 
-/** @cond PRIVATE */
-#ifdef HAVE_HW_APPA_55II
-extern SR_PRIV struct sr_dev_driver appa_55ii_driver_info;
-#endif
-#ifdef HAVE_HW_ATTEN_PPS3XXX
-extern SR_PRIV struct sr_dev_driver atten_pps3203_driver_info;
-#endif
-#ifdef HAVE_HW_BRYMEN_BM86X
-extern SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info;
-#endif
-#ifdef HAVE_HW_BRYMEN_DMM
-extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
-#endif
-#ifdef HAVE_HW_CEM_DT_885X
-extern SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
-#endif
-#ifdef HAVE_HW_CENTER_3XX
-extern SR_PRIV struct sr_dev_driver center_309_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_k204_driver_info;
-#endif
-#ifdef HAVE_HW_COLEAD_SLM
-extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
-#endif
-#ifdef HAVE_HW_CONRAD_DIGI_35_CPU
-extern SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info;
-#endif
-#ifdef HAVE_HW_DEMO
-extern SR_PRIV struct sr_dev_driver demo_driver_info;
-#endif
-#ifdef HAVE_HW_GMC_MH_1X_2X
-extern SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info;
-extern SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info;
-#endif
-#ifdef HAVE_HW_HAMEG_HMO
-extern SR_PRIV struct sr_dev_driver hameg_hmo_driver_info;
-#endif
-#ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
-extern SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
-#endif
-#ifdef HAVE_HW_IKALOGIC_SCANAPLUS
-extern SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info;
-#endif
-#ifdef HAVE_HW_KECHENG_KC_330B
-extern SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info;
-#endif
-#ifdef HAVE_HW_LASCAR_EL_USB
-extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
-#endif
-#ifdef HAVE_HW_MIC_985XX
-extern SR_PRIV struct sr_dev_driver mic_98581_driver_info;
-extern SR_PRIV struct sr_dev_driver mic_98583_driver_info;
-#endif
-#ifdef HAVE_HW_NORMA_DMM
-extern SR_PRIV struct sr_dev_driver norma_dmm_driver_info;
-#endif
-#ifdef HAVE_HW_OLS
-extern SR_PRIV struct sr_dev_driver ols_driver_info;
-#endif
-#ifdef HAVE_HW_RIGOL_DS
-extern SR_PRIV struct sr_dev_driver rigol_ds_driver_info;
-#endif
-#ifdef HAVE_HW_SALEAE_LOGIC16
-extern SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
-#endif
-#ifdef HAVE_HW_SYSCLK_LWLA
-extern SR_PRIV struct sr_dev_driver sysclk_lwla_driver_info;
-#endif
-#ifdef HAVE_HW_TELEINFO
-extern SR_PRIV struct sr_dev_driver teleinfo_driver_info;
-#endif
-#ifdef HAVE_HW_TONDAJ_SL_814
-extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
-#endif
-#ifdef HAVE_HW_UNI_T_UT32X
-extern SR_PRIV struct sr_dev_driver uni_t_ut32x_driver_info;
-#endif
-#ifdef HAVE_HW_VICTOR_DMM
-extern SR_PRIV struct sr_dev_driver victor_dmm_driver_info;
-#endif
-#ifdef HAVE_HW_ZEROPLUS_LOGIC_CUBE
-extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
-#endif
-#ifdef HAVE_HW_ASIX_SIGMA
-extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
-#endif
-#ifdef HAVE_HW_CHRONOVU_LA
-extern SR_PRIV struct sr_dev_driver chronovu_la_driver_info;
-#endif
-#ifdef HAVE_HW_LINK_MSO19
-extern SR_PRIV struct sr_dev_driver link_mso19_driver_info;
-#endif
-#ifdef HAVE_HW_ALSA
-extern SR_PRIV struct sr_dev_driver alsa_driver_info;
-#endif
-#ifdef HAVE_HW_FX2LAFW
-extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
-#endif
-#ifdef HAVE_HW_HANTEK_DSO
-extern SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
-#endif
-#ifdef HAVE_HW_AGILENT_DMM
-extern SR_PRIV struct sr_dev_driver agdmm_driver_info;
-#endif
-#ifdef HAVE_HW_FLUKE_DMM
-extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
-#endif
-#ifdef HAVE_HW_SERIAL_DMM
-extern SR_PRIV struct sr_dev_driver bbcgm_m2110_driver_info;
-extern SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info;
-extern SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info;
-extern SR_PRIV struct sr_dev_driver metex_me31_driver_info;
-extern SR_PRIV struct sr_dev_driver peaktech_3410_driver_info;
-extern SR_PRIV struct sr_dev_driver mastech_mas345_driver_info;
-extern SR_PRIV struct sr_dev_driver va_va18b_driver_info;
-extern SR_PRIV struct sr_dev_driver va_va40b_driver_info;
-extern SR_PRIV struct sr_dev_driver metex_m3640d_driver_info;
-extern SR_PRIV struct sr_dev_driver metex_m4650cr_driver_info;
-extern SR_PRIV struct sr_dev_driver peaktech_4370_driver_info;
-extern SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info;
-extern SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info;
-extern SR_PRIV struct sr_dev_driver radioshack_22_805_driver_info;
-extern SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info;
-extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_m3650cr_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_m3650d_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_m4650cr_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_me42_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc830_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60a_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60e_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60g_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61b_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61c_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
-extern SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info;
-#endif
-#ifdef HAVE_HW_UNI_T_DMM
-extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60a_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60e_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut60g_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61b_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61c_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
-extern SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
-extern SR_PRIV struct sr_dev_driver tenma_72_7745_driver_info;
-extern SR_PRIV struct sr_dev_driver tenma_72_7750_driver_info;
-#endif
-/** @endcond */
-
-static struct sr_dev_driver *drivers_list[] = {
-#ifdef HAVE_HW_APPA_55II
-       &appa_55ii_driver_info,
-#endif
-#ifdef HAVE_HW_ATTEN_PPS3XXX
-       &atten_pps3203_driver_info,
-#endif
-#ifdef HAVE_HW_BRYMEN_BM86X
-       &brymen_bm86x_driver_info,
-#endif
-#ifdef HAVE_HW_BRYMEN_DMM
-       &brymen_bm857_driver_info,
-#endif
-#ifdef HAVE_HW_CEM_DT_885X
-       &cem_dt_885x_driver_info,
-#endif
-#ifdef HAVE_HW_CENTER_3XX
-       &center_309_driver_info,
-       &voltcraft_k204_driver_info,
-#endif
-#ifdef HAVE_HW_COLEAD_SLM
-       &colead_slm_driver_info,
-#endif
-#ifdef HAVE_HW_CONRAD_DIGI_35_CPU
-       &conrad_digi_35_cpu_driver_info,
-#endif
-#ifdef HAVE_HW_DEMO
-       &demo_driver_info,
-#endif
-#ifdef HAVE_HW_GMC_MH_1X_2X
-       &gmc_mh_1x_2x_rs232_driver_info,
-       &gmc_mh_2x_bd232_driver_info,
-#endif
-#ifdef HAVE_HW_HAMEG_HMO
-       &hameg_hmo_driver_info,
-#endif
-#ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
-       &ikalogic_scanalogic2_driver_info,
-#endif
-#ifdef HAVE_HW_IKALOGIC_SCANAPLUS
-       &ikalogic_scanaplus_driver_info,
-#endif
-#ifdef HAVE_HW_KECHENG_KC_330B
-       &kecheng_kc_330b_driver_info,
-#endif
-#ifdef HAVE_HW_LASCAR_EL_USB
-       &lascar_el_usb_driver_info,
-#endif
-#ifdef HAVE_HW_MIC_985XX
-       &mic_98581_driver_info,
-       &mic_98583_driver_info,
-#endif
-#ifdef HAVE_HW_NORMA_DMM
-       &norma_dmm_driver_info,
-#endif
-#ifdef HAVE_HW_OLS
-       &ols_driver_info,
-#endif
-#ifdef HAVE_HW_RIGOL_DS
-       &rigol_ds_driver_info,
-#endif
-#ifdef HAVE_HW_SALEAE_LOGIC16
-       &saleae_logic16_driver_info,
-#endif
-#ifdef HAVE_HW_SYSCLK_LWLA
-       &sysclk_lwla_driver_info,
-#endif
-#ifdef HAVE_HW_TELEINFO
-       &teleinfo_driver_info,
-#endif
-#ifdef HAVE_HW_TONDAJ_SL_814
-       &tondaj_sl_814_driver_info,
-#endif
-#ifdef HAVE_HW_UNI_T_UT32X
-       &uni_t_ut32x_driver_info,
-#endif
-#ifdef HAVE_HW_VICTOR_DMM
-       &victor_dmm_driver_info,
-#endif
-#ifdef HAVE_HW_ZEROPLUS_LOGIC_CUBE
-       &zeroplus_logic_cube_driver_info,
-#endif
-#ifdef HAVE_HW_ASIX_SIGMA
-       &asix_sigma_driver_info,
-#endif
-#ifdef HAVE_HW_CHRONOVU_LA
-       &chronovu_la_driver_info,
-#endif
-#ifdef HAVE_HW_LINK_MSO19
-       &link_mso19_driver_info,
-#endif
-#ifdef HAVE_HW_ALSA
-       &alsa_driver_info,
-#endif
-#ifdef HAVE_HW_FX2LAFW
-       &fx2lafw_driver_info,
-#endif
-#ifdef HAVE_HW_HANTEK_DSO
-       &hantek_dso_driver_info,
-#endif
-#ifdef HAVE_HW_AGILENT_DMM
-       &agdmm_driver_info,
-#endif
-#ifdef HAVE_HW_FLUKE_DMM
-       &flukedmm_driver_info,
-#endif
-#ifdef HAVE_HW_SERIAL_DMM
-       &bbcgm_m2110_driver_info,
-       &digitek_dt4000zc_driver_info,
-       &tekpower_tp4000zc_driver_info,
-       &metex_me31_driver_info,
-       &peaktech_3410_driver_info,
-       &mastech_mas345_driver_info,
-       &va_va18b_driver_info,
-       &va_va40b_driver_info,
-       &metex_m3640d_driver_info,
-       &metex_m4650cr_driver_info,
-       &peaktech_4370_driver_info,
-       &pce_pce_dm32_driver_info,
-       &radioshack_22_168_driver_info,
-       &radioshack_22_805_driver_info,
-       &radioshack_22_812_driver_info,
-       &tecpel_dmm_8061_ser_driver_info,
-       &voltcraft_m3650cr_driver_info,
-       &voltcraft_m3650d_driver_info,
-       &voltcraft_m4650cr_driver_info,
-       &voltcraft_me42_driver_info,
-       &voltcraft_vc820_ser_driver_info,
-       &voltcraft_vc830_ser_driver_info,
-       &voltcraft_vc840_ser_driver_info,
-       &uni_t_ut60a_ser_driver_info,
-       &uni_t_ut60e_ser_driver_info,
-       &uni_t_ut60g_ser_driver_info,
-       &uni_t_ut61b_ser_driver_info,
-       &uni_t_ut61c_ser_driver_info,
-       &uni_t_ut61d_ser_driver_info,
-       &uni_t_ut61e_ser_driver_info,
-       &iso_tech_idm103n_driver_info,
-       &tenma_72_7745_ser_driver_info,
-       &tenma_72_7750_ser_driver_info,
-#endif
-#ifdef HAVE_HW_UNI_T_DMM
-       &tecpel_dmm_8061_driver_info,
-       &uni_t_ut60a_driver_info,
-       &uni_t_ut60e_driver_info,
-       &uni_t_ut60g_driver_info,
-       &uni_t_ut61b_driver_info,
-       &uni_t_ut61c_driver_info,
-       &uni_t_ut61d_driver_info,
-       &uni_t_ut61e_driver_info,
-       &voltcraft_vc820_driver_info,
-       &voltcraft_vc830_driver_info,
-       &voltcraft_vc840_driver_info,
-       &tenma_72_7745_driver_info,
-       &tenma_72_7750_driver_info,
-#endif
-       NULL,
-};
-
 /**
  * Return the list of supported hardware drivers.
  *
  * @return Pointer to the NULL-terminated list of hardware driver pointers.
+ *
+ * @since 0.1.0
  */
 SR_API struct sr_dev_driver **sr_driver_list(void)
 {
@@ -469,6 +156,8 @@ SR_API struct sr_dev_driver **sr_driver_list(void)
  * @retval SR_ERR_ARG Invalid parameter(s).
  * @retval SR_ERR_BUG Internal errors.
  * @retval other Another negative error code upon other errors.
+ *
+ * @since 0.2.0
  */
 SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
 {
@@ -513,6 +202,8 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
  *         found (or errors were encountered). This list must be freed by the
  *         caller using g_slist_free(), but without freeing the data pointed
  *         to in the list.
+ *
+ * @since 0.2.0
  */
 SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
 {
@@ -603,6 +294,8 @@ SR_PRIV void sr_config_free(struct sr_config *src)
  * @retval SR_ERR_ARG The driver doesn't know that key, but this is not to be
  *          interpreted as an error by the caller; merely as an indication
  *          that it's not applicable.
+ *
+ * @since 0.3.0
  */
 SR_API int sr_config_get(const struct sr_dev_driver *driver,
                const struct sr_dev_inst *sdi,
@@ -642,6 +335,8 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver,
  * @retval SR_ERR_ARG The driver doesn't know that key, but this is not to be
  *          interpreted as an error by the caller; merely as an indication
  *          that it's not applicable.
+ *
+ * @since 0.3.0
  */
 SR_API int sr_config_set(const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg,
@@ -669,6 +364,8 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi,
  * @param sdi The device instance.
  *
  * @return SR_OK upon success or SR_ERR in case of error.
+ *
+ * @since 0.3.0
  */
 SR_API int sr_config_commit(const struct sr_dev_inst *sdi)
 {
@@ -704,6 +401,8 @@ SR_API int sr_config_commit(const struct sr_dev_inst *sdi)
  * @retval SR_ERR_ARG The driver doesn't know that key, but this is not to be
  *          interpreted as an error by the caller; merely as an indication
  *          that it's not applicable.
+ *
+ * @since 0.3.0
  */
 SR_API int sr_config_list(const struct sr_dev_driver *driver,
                const struct sr_dev_inst *sdi,
@@ -729,6 +428,8 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver,
  *
  * @return A pointer to a struct sr_config_info, or NULL if the key
  *         was not found.
+ *
+ * @since 0.2.0
  */
 SR_API const struct sr_config_info *sr_config_info_get(int key)
 {
@@ -749,6 +450,8 @@ SR_API const struct sr_config_info *sr_config_info_get(int key)
  *
  * @return A pointer to a struct sr_config_info, or NULL if the key
  *         was not found.
+ *
+ * @since 0.2.0
  */
 SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname)
 {
@@ -769,16 +472,53 @@ SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname)
  */
 SR_PRIV int sr_source_remove(int fd)
 {
-       return sr_session_source_remove(fd);
+       return sr_session_source_remove(sr_current_session, fd);
+}
+
+/** @private
+ *  @see sr_session_source_remove_pollfd()
+ */
+SR_PRIV int sr_source_remove_pollfd(GPollFD *pollfd)
+{
+       return sr_session_source_remove_pollfd(sr_current_session, pollfd);
+}
+
+/** @private
+ *  @see sr_session_source_remove_channel()
+ */
+SR_PRIV int sr_source_remove_channel(GIOChannel *channel)
+{
+       return sr_session_source_remove_channel(sr_current_session, channel);
 }
 
 /** @private
  *  @see sr_session_source_add()
  */
 SR_PRIV int sr_source_add(int fd, int events, int timeout,
-                         sr_receive_data_callback_t cb, void *cb_data)
+                         sr_receive_data_callback cb, void *cb_data)
+{
+       return sr_session_source_add(sr_current_session,
+                       fd, events, timeout, cb, cb_data);
+}
+
+/** @private
+ *  @see sr_session_source_add_pollfd()
+ */
+SR_PRIV int sr_source_add_pollfd(GPollFD *pollfd, int timeout,
+                         sr_receive_data_callback cb, void *cb_data)
+{
+       return sr_session_source_add_pollfd(sr_current_session,
+                       pollfd, timeout, cb, cb_data);
+}
+
+/** @private
+ *  @see sr_session_source_add_channel()
+ */
+SR_PRIV int sr_source_add_channel(GIOChannel *channel, int events, 
+                         int timeout, sr_receive_data_callback cb, void *cb_data)
 {
-       return sr_session_source_add(fd, events, timeout, cb, cb_data);
+       return sr_session_source_add_channel(sr_current_session,
+                       channel, events, timeout, cb, cb_data);
 }
 
 /** @} */