Fix #442 by renaming sr_dev_driver.priv to .context

[libsigrok.git] / src / hardware / deree-de5000 / api.c

diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c
index 40ace4eee8529b0169b2e75ef3d73b5e9188b19e..33e38881232b0be03c60039009492ecf6ed204eb 100644 (file)
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -28,48 +28,43 @@ static void std_dev_attach(struct sr_dev_driver *di, struct sr_dev_inst *sdi)
 {
        struct drv_context *drvc;
 
-       drvc = di->priv;
+       drvc = di->context;
 
        sdi->driver = di;
        drvc->instances = g_slist_append(drvc->instances, sdi);
 }
 
-static GSList *std_dev_list(struct sr_dev_driver *di)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)di->priv)->instances;
+       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_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, &deree_de5000_driver_info, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(&deree_de5000_driver_info, es51919_serial_clean);
+       return std_dev_clear(di, es51919_serial_clean);
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct sr_dev_inst *sdi;
 
        if (!(sdi = es51919_serial_scan(options, "DER EE", "DE-5000")))
                return NULL;
 
-       std_dev_attach(&deree_de5000_driver_info, sdi);
+       std_dev_attach(di, sdi);
 
        return g_slist_append(NULL, sdi);
 }
 
-static GSList *dev_list(void)
-{
-       return std_dev_list(&deree_de5000_driver_info);
-}
-
 SR_PRIV struct sr_dev_driver deree_de5000_driver_info = {
        .name = "deree-de5000",
        .longname = "DER EE DE-5000",
@@ -86,5 +81,5 @@ SR_PRIV struct sr_dev_driver deree_de5000_driver_info = {
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = es51919_serial_acquisition_start,
        .dev_acquisition_stop = es51919_serial_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };