Pass driver struct pointer to driver callbacks.

[libsigrok.git] / src / hardware / norma-dmm / api.c

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index c5f95d28e020526f62d5d5e5e00b9272a068267f..6fe8e39d8b37ae90c7d23c941fe16e0f4ff32f86 100644 (file)
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -66,23 +66,17 @@ static const char* get_typestr(int type, struct sr_dev_driver* drv)
        return nameref[type-1][(drv == &siemens_b102x_driver_info)];
 }
 
-static int init_norma_dmm(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, &norma_dmm_driver_info, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static int init_siemens_b102x(struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, &siemens_b102x_driver_info, LOG_PREFIX);
-}
-
-static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
+static GSList *scan(struct sr_dev_driver* drv, GSList *options)
 {
        struct sr_dev_inst *sdi;
        struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_config *src;
-       struct sr_channel *ch;
        struct sr_serial_dev_inst *serial;
        GSList *l, *devices;
        int len, cnt;
@@ -112,10 +106,9 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
        if (!serialcomm)
                serialcomm = SERIALCOMM;
 
-       if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-               return NULL;
+       serial = sr_serial_dev_inst_new(conn, serialcomm);
 
-       if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+       if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
        serial_flush(serial);
@@ -129,9 +122,8 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
                 nmadmm_requests[NMADMM_REQ_IDN].req_str);
        g_usleep(150 * 1000); /* Wait a little to allow serial port to settle. */
        for (cnt = 0; cnt < 7; cnt++) {
-               if (serial_write(serial, req, strlen(req)) == -1) {
-                       sr_err("Unable to send identification request: %d %s.",
-                              errno, strerror(errno));
+               if (serial_write_blocking(serial, req, strlen(req), 0) < 0) {
+                       sr_err("Unable to send identification request.");
                        return NULL;
                }
                len = BUF_MAX;
@@ -145,24 +137,19 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
                        auxtype = xgittoint(buf[7]);
                        sr_spew("%s %s DMM %s detected!", get_brandstr(drv), get_typestr(auxtype, drv), buf + 9);
 
-                       if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
-                                               get_brandstr(drv), get_typestr(auxtype, drv), buf + 9)))
-                               return NULL;
-                       if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-                               sr_err("Device context malloc failed.");
-                               return NULL;
-                       }
+                       sdi = g_malloc0(sizeof(struct sr_dev_inst));
+                       sdi->status = SR_ST_INACTIVE;
+                       sdi->vendor = g_strdup(get_brandstr(drv));
+                       sdi->model = g_strdup(get_typestr(auxtype, drv));
+                       sdi->version = g_strdup(buf + 9);
+                       devc = g_malloc0(sizeof(struct dev_context));
                        devc->type = auxtype;
                        devc->version = g_strdup(&buf[9]);
                        devc->elapsed_msec = g_timer_new();
-
                        sdi->conn = serial;
                        sdi->priv = devc;
                        sdi->driver = drv;
-                       if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE,
-                               "P1")))
-                               return NULL;
-                       sdi->channels = g_slist_append(sdi->channels, ch);
+                       sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
                        drvc->instances = g_slist_append(drvc->instances, sdi);
                        devices = g_slist_append(devices, sdi);
                        break;
@@ -189,24 +176,9 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
        return devices;
 }
 
-static GSList *scan_norma_dmm(GSList *options)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return do_scan(&norma_dmm_driver_info, options);
-}
-
-static GSList *scan_siemens_b102x(GSList *options)
-{
-       return do_scan(&siemens_b102x_driver_info, options);
-}
-
-static GSList *dev_list_norma_dmm(void)
-{
-       return ((struct drv_context *)(norma_dmm_driver_info.priv))->instances;
-}
-
-static GSList *dev_list_siemens_b102x(void)
-{
-       return ((struct drv_context *)(siemens_b102x_driver_info.priv))->instances;
+       return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -225,14 +197,9 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup_norma_dmm(void)
-{
-       return std_dev_clear(&norma_dmm_driver_info, NULL);
-}
-
-static int cleanup_siemens_b102x(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(&siemens_b102x_driver_info, NULL);
+       return std_dev_clear(di, NULL);
 }
 
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
@@ -339,10 +306,10 @@ SR_PRIV struct sr_dev_driver norma_dmm_driver_info = {
        .name = "norma-dmm",
        .longname = "Norma DM9x0 DMMs",
        .api_version = 1,
-       .init = init_norma_dmm,
-       .cleanup = cleanup_norma_dmm,
-       .scan = scan_norma_dmm,
-       .dev_list = dev_list_norma_dmm,
+       .init = init,
+       .cleanup = cleanup,
+       .scan = scan,
+       .dev_list = dev_list,
        .dev_clear = NULL,
        .config_get = NULL,
        .config_set = config_set,
@@ -359,10 +326,10 @@ SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = {
        .name = "siemens-b102x",
        .longname = "Siemens B102x DMMs",
        .api_version = 1,
-       .init = init_siemens_b102x,
-       .cleanup = cleanup_siemens_b102x,
-       .scan = scan_siemens_b102x,
-       .dev_list = dev_list_siemens_b102x,
+       .init = init,
+       .cleanup = cleanup,
+       .scan = scan,
+       .dev_list = dev_list,
        .dev_clear = NULL,
        .config_get = NULL,
        .config_set = config_set,