sr: fx2lafw: Add basic support for USBee DX and clones

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index 7ec0dd0efe604c4732d81f5ea5f2d92f46acfe57..bd3bf8a16ac9b0ec3e395e8c826af33fdb67b451 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -23,8 +23,8 @@
 #include <dirent.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 /*
  * This enumerates which driver capabilities correspond to user-settable
@@ -44,6 +44,10 @@ SR_API struct sr_hwcap_option sr_hwcap_options[] = {
        {SR_HWCAP_TIMEBASE, SR_T_RATIONAL_PERIOD, "Time base", "timebase"},
        {SR_HWCAP_FILTER, SR_T_CHAR, "Filter targets", "filter"},
        {SR_HWCAP_VDIV, SR_T_RATIONAL_VOLT, "Volts/div", "vdiv"},
+       {SR_HWCAP_COUPLING, SR_T_CHAR, "Coupling", "coupling"},
+       {SR_HWCAP_MODEL, SR_T_KEYVALUE, "Model", "model"},
+       {SR_HWCAP_CONN, SR_T_CHAR, "Connection", "connect"},
+       {SR_HWCAP_SERIALCOMM, SR_T_CHAR, "Serial communication", "serialcomm"},
        {0, 0, NULL, NULL},
 };
 
@@ -72,7 +76,10 @@ extern SR_PRIV struct sr_dev_driver alsa_driver_info;
 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;
+extern SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
+#endif
+#ifdef HAVE_HW_GENERICDMM
+extern SR_PRIV struct sr_dev_driver genericdmm_driver_info;
 #endif
 
 static struct sr_dev_driver *drivers_list[] = {
@@ -101,7 +108,10 @@ static struct sr_dev_driver *drivers_list[] = {
        &fx2lafw_driver_info,
 #endif
 #ifdef HAVE_HW_HANTEK_DSO
-       &hantek_dso_plugin_info,
+       &hantek_dso_driver_info,
+#endif
+#ifdef HAVE_HW_GENERICDMM
+       &genericdmm_driver_info,
 #endif
        NULL,
 };
@@ -227,7 +237,7 @@ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
 
        udi->bus = bus;
        udi->address = address;
-       udi->devhdl = hdl; /* TODO: Check if this is NULL? */
+       udi->devhdl = hdl;
 
        return udi;
 }
@@ -275,7 +285,8 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
  */
 SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap)
 {
-       int *hwcaps, i;
+       const int *hwcaps;
+       int i;
 
        if (!driver) {
                sr_err("hwdriver: %s: driver was NULL", __func__);
@@ -303,7 +314,7 @@ SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap)
  * @return A pointer to a struct with information about the parameter, or NULL
  *         if the capability was not found.
  */
-SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap)
+SR_API const struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap)
 {
        int i;