kecheng-kc-330b: Flesh out driver, add scan functionality

diff --git a/hardware/kecheng-kc-330b/api.c b/hardware/kecheng-kc-330b/api.c
index 931e02546d0324774591aa6ff135f76664c7897e..a817191a2a28628fbd64a3642296455bf0e361c5 100644 (file)
--- a/hardware/kecheng-kc-330b/api.c
+++ b/hardware/kecheng-kc-330b/api.c
@@ -19,6 +19,18 @@
 
 #include "protocol.h"
 
+#define USB_CONN "1041.8101"
+#define VENDOR "Kecheng"
+#define USB_INTERFACE 0
+#define EP_IN 0x80 | 1
+#define EP_OUT 2
+
+static const int32_t hwcaps[] = {
+       SR_CONF_SOUNDLEVELMETER,
+       SR_CONF_LIMIT_SAMPLES,
+       SR_CONF_CONTINUOUS,
+};
+
 SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info;
 static struct sr_dev_driver *di = &kecheng_kc_330b_driver_info;
 
@@ -28,19 +40,91 @@ static int init(struct sr_context *sr_ctx)
        return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
+static int scan_kecheng(struct sr_usb_dev_inst *usb, char **model)
+{
+       struct drv_context *drvc;
+       int len, ret;
+       unsigned char cmd, buf[32];
+
+       drvc = di->priv;
+       if (sr_usb_open(drvc->sr_ctx->libusb_ctx, usb) != SR_OK)
+               return SR_ERR;
+
+       cmd = CMD_IDENTIFY;
+       ret = libusb_bulk_transfer(usb->devhdl, EP_OUT, &cmd, 1, &len, 5);
+       if (ret != 0) {
+               libusb_close(usb->devhdl);
+               sr_dbg("Failed to send Identify command: %s", libusb_error_name(ret));
+               return SR_ERR;
+       }
+
+       ret = libusb_bulk_transfer(usb->devhdl, EP_IN, buf, 32, &len, 10);
+       if (ret != 0) {
+               libusb_close(usb->devhdl);
+               sr_dbg("Failed to receive response: %s", libusb_error_name(ret));
+               return SR_ERR;
+       }
+
+       libusb_close(usb->devhdl);
+       usb->devhdl = NULL;
+
+       if (len < 2 || buf[0] != (CMD_IDENTIFY | 0x80) || buf[1] > 30) {
+               sr_dbg("Invalid response to Identify command");
+               return SR_ERR;
+       }
+
+       buf[buf[1] + 2] = '\x0';
+       *model = g_strndup((const gchar *)buf + 2, 30);
+       //g_strstrip(*model);
+
+       return SR_OK;
+}
+
 static GSList *scan(GSList *options)
 {
        struct drv_context *drvc;
-       GSList *devices;
+       struct dev_context *devc;
+       struct sr_dev_inst *sdi;
+       struct sr_probe *probe;
+       GSList *usb_devices, *devices, *l;
+       char *model;
 
        (void)options;
 
-       devices = NULL;
        drvc = di->priv;
        drvc->instances = NULL;
 
-       /* TODO: scan for devices, either based on a SR_CONF_CONN option
-        * or on a USB scan. */
+       devices = NULL;
+       if ((usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, USB_CONN))) {
+               /* We have a list of sr_usb_dev_inst matching the connection
+                * string. Wrap them in sr_dev_inst and we're done. */
+               for (l = usb_devices; l; l = l->next) {
+                       if (scan_kecheng(l->data, &model) != SR_OK)
+                               continue;
+                       if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR,
+                                       model, NULL)))
+                               return NULL;
+                       g_free(model);
+                       sdi->driver = di;
+                       sdi->inst_type = SR_INST_USB;
+                       sdi->conn = l->data;
+                       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "SPL")))
+                               return NULL;
+                       sdi->probes = g_slist_append(sdi->probes, probe);
+
+                       if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
+                               sr_dbg("Device context malloc failed.");
+                               return NULL;
+                       }
+                       sdi->priv = devc;
+                       devc->limit_samples = 0;
+
+                       drvc->instances = g_slist_append(drvc->instances, sdi);
+                       devices = g_slist_append(devices, sdi);
+               }
+               g_slist_free(usb_devices);
+       } else
+               g_slist_free_full(usb_devices, g_free);
 
        return devices;
 }
@@ -61,21 +145,47 @@ static int dev_clear(void)
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
-       (void)sdi;
+       struct drv_context *drvc;
+       struct sr_usb_dev_inst *usb;
+       int ret;
+
+       if (!(drvc = di->priv)) {
+               sr_err("Driver was not initialized.");
+               return SR_ERR;
+       }
+
+       usb = sdi->conn;
 
-       /* TODO: get handle from sdi->conn and open it. */
+       if (sr_usb_open(drvc->sr_ctx->libusb_ctx, usb) != SR_OK)
+               return SR_ERR;
 
+       if ((ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE))) {
+               sr_err("Failed to claim interface: %s.", libusb_error_name(ret));
+               return SR_ERR;
+       }
        sdi->status = SR_ST_ACTIVE;
 
-       return SR_OK;
+       return ret;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-       (void)sdi;
+       struct sr_usb_dev_inst *usb;
+
+       if (!di->priv) {
+               sr_err("Driver was not initialized.");
+               return SR_ERR;
+       }
+
+       usb = sdi->conn;
 
-       /* TODO: get handle from sdi->conn and close it. */
+       if (!usb->devhdl)
+               /*  Nothing to do. */
+               return SR_OK;
 
+       libusb_release_interface(usb->devhdl, USB_INTERFACE);
+       libusb_close(usb->devhdl);
+       usb->devhdl = NULL;
        sdi->status = SR_ST_INACTIVE;
 
        return SR_OK;
@@ -83,42 +193,57 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-       dev_clear();
+       int ret;
+       struct drv_context *drvc;
 
-       /* TODO: free other driver resources, if any. */
+       if (!(drvc = di->priv))
+               /* Can get called on an unused driver, doesn't matter. */
+               return SR_OK;
 
-       return SR_OK;
+       ret = dev_clear();
+       g_free(drvc);
+       di->priv = NULL;
+
+       return ret;
 }
 
 static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
 {
-       int ret;
+       struct dev_context *devc;
 
-       (void)sdi;
-       (void)data;
-
-       ret = SR_OK;
+       devc = sdi->priv;
        switch (key) {
-       /* TODO */
+       case SR_CONF_LIMIT_SAMPLES:
+               *data = g_variant_new_uint64(devc->limit_samples);
+               break;
        default:
                return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 {
+       struct dev_context *devc;
        int ret;
 
-       (void)data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
+       if (!di->priv) {
+               sr_err("Driver was not initialized.");
+               return SR_ERR;
+       }
+
+       devc = sdi->priv;
        ret = SR_OK;
        switch (key) {
-       /* TODO */
+       case SR_CONF_LIMIT_SAMPLES:
+               devc->limit_samples = g_variant_get_uint64(data);
+               sr_dbg("Setting sample limit to %" PRIu64 ".",
+                      devc->limit_samples);
+               break;
        default:
                ret = SR_ERR_NA;
        }
@@ -128,19 +253,19 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 {
-       int ret;
 
        (void)sdi;
-       (void)data;
 
-       ret = SR_OK;
        switch (key) {
-       /* TODO */
+       case SR_CONF_DEVICE_OPTIONS:
+               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+                               hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
+               break;
        default:
                return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi,

diff --git a/hardware/kecheng-kc-330b/protocol.h b/hardware/kecheng-kc-330b/protocol.h
index 027e6f3476f80a4b8f2dc3787ab04093e0ff8bc9..76e138915bf462e9dc84a2d74790bcf190e858ed 100644 (file)
--- a/hardware/kecheng-kc-330b/protocol.h
+++ b/hardware/kecheng-kc-330b/protocol.h
@@ -34,11 +34,16 @@
 #define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
 #define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
+SR_PRIV enum {
+       CMD_IDENTIFY = 0x02,
+};
+
 /** Private, per-device-instance driver context. */
 struct dev_context {
        /* Model-specific information */
 
        /* Acquisition settings */
+       uint64_t limit_samples;
 
        /* Operational state */