new-driver: hw_init() now takes a context.

[sigrok-util.git] / source / drv-api.c

diff --git a/source/drv-api.c b/source/drv-api.c
index 3d71daa08fd211d271d1c49e8203882ed380aa62..fee866e9840ecf6e91eb91f55dbcd41f2d84a01d 100644 (file)
--- a/source/drv-api.c
+++ b/source/drv-api.c
@@ -33,7 +33,9 @@ static int clear_instances(void)
        struct dev_context *devc;
        GSList *l;
 
-       drvc = di->priv;
+       if (!(drvc = di->priv))
+               return SR_OK;
+
        for (l = drvc->instances; l; l = l->next) {
                if (!(sdi = l->data))
                        continue;
@@ -51,7 +53,7 @@ static int clear_instances(void)
        return SR_OK;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
        struct drv_context *drvc;
 
@@ -62,6 +64,7 @@ static int hw_init(void)
 
        /* TODO */
 
+       drvc->sr_ctx = sr_ctx;
        di->priv = drvc;
 
        return SR_OK;
@@ -157,8 +160,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-                                  void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        (void)cb_data;