X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fderee-de5000%2Fapi.c;h=a20f817a4a732a6189035e47469f3420199d2cf8;hb=b02bb45f4cf6378520e5a5b82ff39013cfa270b6;hp=fdf0bc3ede1a7d89c1339ec3a03ac2f6df7917b2;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git
diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c
index fdf0bc3e..a20f817a 100644
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -24,31 +25,9 @@
#include
#include "libsigrok-internal.h"
-static void std_dev_attach(struct sr_dev_driver *di, struct sr_dev_inst *sdi)
-{
- struct drv_context *drvc;
-
- drvc = di->context;
-
- sdi->driver = di;
- drvc->instances = g_slist_append(drvc->instances, sdi);
-}
-
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
- return ((struct drv_context *)di->context)->instances;
-}
-
#define LOG_PREFIX "deree-de5000"
-SR_PRIV struct sr_dev_driver deree_de5000_driver_info;
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
-static int cleanup(const struct sr_dev_driver *di)
+static int dev_clear(const struct sr_dev_driver *di)
{
return std_dev_clear(di, es51919_serial_clean);
}
@@ -60,26 +39,25 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
if (!(sdi = es51919_serial_scan(options, "DER EE", "DE-5000")))
return NULL;
- std_dev_attach(di, sdi);
-
- return g_slist_append(NULL, sdi);
+ return std_scan_complete(di, g_slist_append(NULL, sdi));
}
-SR_PRIV struct sr_dev_driver deree_de5000_driver_info = {
+static struct sr_dev_driver deree_de5000_driver_info = {
.name = "deree-de5000",
.longname = "DER EE DE-5000",
.api_version = 1,
- .init = init,
- .cleanup = cleanup,
+ .init = std_init,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
- .dev_clear = NULL,
+ .dev_list = std_dev_list,
+ .dev_clear = dev_clear,
.config_get = es51919_serial_config_get,
.config_set = es51919_serial_config_set,
.config_list = es51919_serial_config_list,
.dev_open = std_serial_dev_open,
.dev_close = std_serial_dev_close,
.dev_acquisition_start = es51919_serial_acquisition_start,
- .dev_acquisition_stop = es51919_serial_acquisition_stop,
+ .dev_acquisition_stop = std_serial_dev_acquisition_stop,
.context = NULL,
};
+SR_REGISTER_DEV_DRIVER(deree_de5000_driver_info);