]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/mic-985xx/api.c
pce-322a: Pass driver dev_close callback std_serial_dev_acquisition_stop()
[libsigrok.git] / src / hardware / mic-985xx / api.c
index 329a14b6da8335109fdc89291169d44587512aef..f12aa845a62529cd88c6cf681894f4a33cc1c0b8 100644 (file)
@@ -60,18 +60,14 @@ SR_PRIV const struct mic_dev_info mic_devs[] = {
 static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
 {
        struct sr_dev_inst *sdi;
-       struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
-       GSList *devices;
 
        serial = sr_serial_dev_inst_new(conn, serialcomm);
 
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
-       drvc = mic_devs[idx].di->context;
-       devices = NULL;
        serial_flush(serial);
 
        /* TODO: Query device type. */
@@ -89,19 +85,15 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
        sdi->priv = devc;
-       sdi->driver = mic_devs[idx].di;
 
        sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Temperature");
 
        if (mic_devs[idx].has_humidity)
                sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "Humidity");
 
-       drvc->instances = g_slist_append(drvc->instances, sdi);
-       devices = g_slist_append(devices, sdi);
-
        serial_close(serial);
 
-       return devices;
+       return std_scan_complete(mic_devs[idx].di, g_slist_append(NULL, sdi));
 }
 
 static GSList *scan(GSList *options, int idx)