]> sigrok.org Git - libsigrok.git/blobdiff - hwdriver.c
projects / libsigrok.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
build: Portability fixes.
[libsigrok.git] / hwdriver.c
diff --git a/hwdriver.c b/hwdriver.c
index f028ea1067fa7ff3db1b3645db000c66d603d8e8..04d877aeab2ed91db7493df6921ebd37c5f973c1 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -31,6 +31,8 @@
 #define LOG_PREFIX "hwdriver"
 /** @endcond */
 
+extern SR_PRIV struct sr_dev_driver *drivers_list[];
+
 /**
  * @file
  *
@@ -56,8 +58,8 @@ static struct sr_config_info sr_config_info_data[] = {
                "Pre-trigger capture ratio", NULL},
        {SR_CONF_PATTERN_MODE, SR_T_STRING, "pattern",
                "Pattern", NULL},
-       {SR_CONF_TRIGGER_TYPE, SR_T_STRING, "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",
@@ -125,317 +127,6 @@ static struct sr_config_info sr_config_info_data[] = {
        {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_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_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.
  *
@@ -774,23 +465,4 @@ SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname)
        return NULL;
 }
 
-/* Unnecessary level of indirection follows. */
-
-/** @private
- *  @see sr_session_source_remove()
- */
-SR_PRIV int sr_source_remove(int fd)
-{
-       return sr_session_source_remove(fd);
-}
-
-/** @private
- *  @see sr_session_source_add()
- */
-SR_PRIV int sr_source_add(int fd, int events, int timeout,
-                         sr_receive_data_callback cb, void *cb_data)
-{
-       return sr_session_source_add(fd, events, timeout, cb, cb_data);
-}
-
 /** @} */
Hardware access and backend lib