sr: initial support for Hantek 2xxx/5200 USB oscilloscopes

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index 9b0df152b9d3e38bb3a002e8b497a855a6011d24..41e99dedcc44f532021d7819e19c6576b68fb70b 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -34,7 +34,7 @@
 SR_API struct sr_hwcap_option sr_hwcap_options[] = {
        {SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"},
        {SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"},
-       {SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"},
+       {SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "pattern"},
        {SR_HWCAP_RLE, SR_T_BOOL, "Run Length Encoding", "rle"},
        {0, 0, NULL, NULL},
 };
@@ -42,9 +42,6 @@ SR_API struct sr_hwcap_option sr_hwcap_options[] = {
 #ifdef HAVE_LA_DEMO
 extern SR_PRIV struct sr_dev_driver demo_driver_info;
 #endif
-#ifdef HAVE_LA_SALEAE_LOGIC
-extern SR_PRIV struct sr_dev_driver saleae_logic_driver_info;
-#endif
 #ifdef HAVE_LA_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #endif
@@ -66,14 +63,14 @@ extern SR_PRIV struct sr_dev_driver alsa_driver_info;
 #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_plugin_info;
+#endif
 
 static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_LA_DEMO
        &demo_driver_info,
 #endif
-#ifdef HAVE_LA_SALEAE_LOGIC
-       &saleae_logic_driver_info,
-#endif
 #ifdef HAVE_LA_OLS
        &ols_driver_info,
 #endif
@@ -94,6 +91,9 @@ static struct sr_dev_driver *drivers_list[] = {
 #endif
 #ifdef HAVE_LA_FX2LAFW
        &fx2lafw_driver_info,
+#endif
+#ifdef HAVE_HW_HANTEK_DSO
+       &hantek_dso_plugin_info,
 #endif
        NULL,
 };
@@ -307,15 +307,15 @@ SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap)
        return NULL;
 }
 
-/* unnecessary level of indirection follows. */
+/* Unnecessary level of indirection follows. */
 
-SR_PRIV void sr_source_remove(int fd)
+SR_PRIV int sr_source_remove(int fd)
 {
-       sr_session_source_remove(fd);
+       return sr_session_source_remove(fd);
 }
 
-SR_PRIV void sr_source_add(int fd, int events, int timeout,
-                  sr_receive_data_callback rcv_cb, void *user_data)
+SR_PRIV int sr_source_add(int fd, int events, int timeout,
+                         sr_receive_data_callback_t cb, void *cb_data)
 {
-       sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
+       return sr_session_source_add(fd, events, timeout, cb, cb_data);
 }