]> sigrok.org Git - libsigrok.git/commitdiff
nexus-osciprime: Use std_dev_clear().
authorUwe Hermann <redacted>
Fri, 31 May 2013 13:18:22 +0000 (15:18 +0200)
committerUwe Hermann <redacted>
Sun, 2 Jun 2013 11:52:40 +0000 (13:52 +0200)
hardware/nexus-osciprime/api.c

index 326dc29184a6fc26ad8a686e89617963595f462d..3aafb0660726585fd8f9e0db7c7442d1fce9fb84 100644 (file)
@@ -102,37 +102,12 @@ static const uint64_t vdivs[][2] = {
        { 10, 1 },
 };
 
-
 SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
 static struct sr_dev_driver *di = &nexus_osciprime_driver_info;
-static int dev_close(struct sr_dev_inst *sdi);
 
-/* Properly close and free all devices. */
 static int clear_instances(void)
 {
-       struct sr_dev_inst *sdi;
-       struct drv_context *drvc;
-       struct dev_context *devc;
-       GSList *l;
-
-       if (!(drvc = di->priv))
-               return SR_OK;
-
-       for (l = drvc->instances; l; l = l->next) {
-               if (!(sdi = l->data))
-                       continue;
-               if (!(devc = sdi->priv))
-                       continue;
-
-               dev_close(sdi);
-               sr_usb_dev_inst_free(devc->usb);
-               sr_dev_inst_free(sdi);
-       }
-
-       g_slist_free(drvc->instances);
-       drvc->instances = NULL;
-
-       return SR_OK;
+       return std_dev_clear(di, NULL);
 }
 
 static int init(struct sr_context *sr_ctx)
@@ -234,11 +209,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-       clear_instances();
-
-       /* TODO */
-
-       return SR_OK;
+       return clear_instances();
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)