X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=d362f13b76c88083c704d855afc2110a394aa01b;hb=f1b296fcd290a53c269f5fb0d9e1a3480c1346b6;hp=d4ae56057204c23b8e86957dd14cddfe6c2eb2f3;hpb=048e8babf73565721707dd9e9ecf4f915941d23e;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index d4ae5605..d362f13b 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -57,11 +57,15 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Serial communication", NULL},
 	{SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
 		"Sample rate", NULL},
-	{SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
+    {SR_CONF_CLOCK_TYPE, SR_T_BOOL, "clocktype",
+        "Using External Clock", NULL},
+    {SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
 		"Pre-trigger capture ratio", NULL},
-	{SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
-		"Pattern generator mode", NULL},
-	{SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
+    {SR_CONF_DEVICE_MODE, SR_T_CHAR, "device",
+        "Device Mode", NULL},
+    {SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
+        "Pattern mode", NULL},
+    {SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
 		"Trigger types", NULL},
 	{SR_CONF_RLE, SR_T_BOOL, "rle",
 		"Run Length Encoding", NULL},
@@ -87,180 +91,20 @@ static struct sr_config_info sr_config_info_data[] = {
 };
 
 /** @cond PRIVATE */
-#ifdef HAVE_HW_BRYMEN_DMM
-extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
-#endif
-#ifdef HAVE_HW_COLEAD_SLM
-extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
-#endif
 #ifdef HAVE_LA_DEMO
 extern SR_PRIV struct sr_dev_driver demo_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_NEXUS_OSCIPRIME
-extern SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
-#endif
-#ifdef HAVE_LA_OLS
-extern SR_PRIV struct sr_dev_driver ols_driver_info;
-#endif
-#ifdef HAVE_HW_RIGOL_DS1XX2
-extern SR_PRIV struct sr_dev_driver rigol_ds1xx2_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_VICTOR_DMM
-extern SR_PRIV struct sr_dev_driver victor_dmm_driver_info;
-#endif
-#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
-extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
-#endif
-#ifdef HAVE_LA_ASIX_SIGMA
-extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
-#endif
-#ifdef HAVE_LA_CHRONOVU_LA8
-extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
-#endif
-#ifdef HAVE_LA_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_LA_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 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 metex_m3640d_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_8060_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
-extern SR_PRIV struct sr_dev_driver voltcraft_vc840_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;
-#endif
-#ifdef HAVE_HW_UNI_T_DMM
-extern SR_PRIV struct sr_dev_driver tecpel_dmm_8060_driver_info;
-extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_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_vc840_driver_info;
+#ifdef HAVE_LA_DSLOGIC
+extern SR_PRIV struct sr_dev_driver DSLogic_driver_info;
 #endif
 /** @endcond */
 
 static struct sr_dev_driver *drivers_list[] = {
-#ifdef HAVE_HW_BRYMEN_DMM
-	&brymen_bm857_driver_info,
-#endif
-#ifdef HAVE_HW_COLEAD_SLM
-	&colead_slm_driver_info,
-#endif
 #ifdef HAVE_LA_DEMO
 	&demo_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_NEXUS_OSCIPRIME
-	&nexus_osciprime_driver_info,
-#endif
-#ifdef HAVE_LA_OLS
-	&ols_driver_info,
-#endif
-#ifdef HAVE_HW_RIGOL_DS1XX2
-	&rigol_ds1xx2_driver_info,
-#endif
-#ifdef HAVE_HW_TONDAJ_SL_814
-	&tondaj_sl_814_driver_info,
-#endif
-#ifdef HAVE_HW_VICTOR_DMM
-	&victor_dmm_driver_info,
-#endif
-#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
-	&zeroplus_logic_cube_driver_info,
-#endif
-#ifdef HAVE_LA_ASIX_SIGMA
-	&asix_sigma_driver_info,
-#endif
-#ifdef HAVE_LA_CHRONOVU_LA8
-	&chronovu_la8_driver_info,
-#endif
-#ifdef HAVE_LA_LINK_MSO19
-	&link_mso19_driver_info,
-#endif
-#ifdef HAVE_HW_ALSA
-	&alsa_driver_info,
-#endif
-#ifdef HAVE_LA_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
-	&digitek_dt4000zc_driver_info,
-	&tekpower_tp4000zc_driver_info,
-	&metex_me31_driver_info,
-	&peaktech_3410_driver_info,
-	&mastech_mas345_driver_info,
-	&va_va18b_driver_info,
-	&metex_m3640d_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_8060_ser_driver_info,
-	&tecpel_dmm_8061_ser_driver_info,
-	&voltcraft_vc820_ser_driver_info,
-	&voltcraft_vc840_ser_driver_info,
-	&uni_t_ut61d_ser_driver_info,
-	&uni_t_ut61e_ser_driver_info,
-#endif
-#ifdef HAVE_HW_UNI_T_DMM
-	&tecpel_dmm_8060_driver_info,
-	&tecpel_dmm_8061_driver_info,
-	&uni_t_ut61d_driver_info,
-	&uni_t_ut61e_driver_info,
-	&voltcraft_vc820_driver_info,
-	&voltcraft_vc840_driver_info,
+#ifdef HAVE_LA_DSLOGIC
+    &DSLogic_driver_info,
 #endif
 	NULL,
 };
@@ -553,7 +397,7 @@ SR_PRIV int sr_source_remove(int fd)
 SR_PRIV int sr_source_add(int fd, int events, int timeout,
 			  sr_receive_data_callback_t cb, void *cb_data)
 {
-	return sr_session_source_add(fd, events, timeout, cb, cb_data);
+    return sr_session_source_add(fd, events, timeout, cb, cb_data);
 }
 
 /** @} */