Add a struct sr_context * parameter to hw_init()

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index fcd51d54130ffeedb7dc5908fd77a981e441db95..b68c9e7fbe2e55a6a42f05fc02f042f102e4cb11 100644 (file)
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -94,7 +94,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;
 

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index 55d96c32419ac51541c0f05ab8aa3a4b79a005b3..23339dcd211a6a7bc48f74f3d75dad9a48ea46fe 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -75,7 +75,7 @@ struct context {
        void *session_dev_id;
 };
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 515718c14ef017ac585fb4bc7d7c5c94f7571b8c..6d9bea2d7b656d01f23b75068cb8752bc2983e2a 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -432,7 +432,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;
 

diff --git a/hardware/chronovu-la8/api.c b/hardware/chronovu-la8/api.c
index 705a68bc54f487e9ac2e1f84a9b03252ed8a9fbc..b3c37910c0e81adb0d1858a02ecc00ebbbb5b456 100644 (file)
--- a/hardware/chronovu-la8/api.c
+++ b/hardware/chronovu-la8/api.c
@@ -68,7 +68,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;
 

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index 45e19ba670116f82fd8e6db7f688dd3c6ea349e3..f7d596dc4fb0f059794922647c51f7cf9cd79e5c 100644 (file)
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -77,7 +77,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;
 

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 0c4c211e9f085d2f1aadc4bf124d4709759a89a1..ff7ba06b7ce39ea3d1f7274f9690a260cf2345cf 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -153,7 +153,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;
 

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index d6391fa08d71f4c14949ab20594d4818ead7c123..2687c12eaa5f663b2d649355b4e0a4ce4099b76f 100644 (file)
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -81,7 +81,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;
 

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index b3df9731fbc6e294c608285578c67878b39df95f..c82cef8742d95fd5bf4ff1e16bb305dbc2730d50 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -399,7 +399,7 @@ static int clear_instances(void)
  * API callbacks
  */
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
        struct drv_context *drvc;
 

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index c819fbbe97ddcc21cafd1f19a0b345c3994129b0..e221b5f20a871d49c0e20ae6c789ff13ac344f89 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -253,7 +253,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;
 

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index 521c8440acb08ab5591eabe88f9beedee9272bb7..6fdf51c6032ba3781946cb88f93c00b01c4005bc 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -401,7 +401,7 @@ static int mso_parse_serial(const char *iSerial, const char *iProduct,
        return SR_OK;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
        /* Nothing to do. */
 

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index a8d9dbea908d11996c341c9183412e90c5cf1902..4d369bace57cf1bd962e7dfa22198ea4dd8956a1 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -362,7 +362,7 @@ static struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
        return sdi;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
        struct drv_context *drvc;
 

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 986e649bbed8eaa65a11494b2e01cff7219f013c..a146ec86f460bd09384cbcf0867b32d7dec1767c 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -169,7 +169,7 @@ static int clear_instances(void)
        return SR_OK;
 }
 
-static int hw_init(int dmm)
+static int hw_init(struct sr_context *sr_ctx, int dmm)
 {
        struct drv_context *drvc;
 
@@ -207,59 +207,59 @@ static int hw_init(int dmm)
        return SR_OK;
 }
 
-static int hw_init_digitek_dt4000zc(void)
+static int hw_init_digitek_dt4000zc(struct sr_context *sr_ctx)
 {
-       return hw_init(DIGITEK_DT4000ZC);
+       return hw_init(sr_ctx, DIGITEK_DT4000ZC);
 }
 
-static int hw_init_tekpower_tp4000zc(void)
+static int hw_init_tekpower_tp4000zc(struct sr_context *sr_ctx)
 {
-       return hw_init(TEKPOWER_TP4000ZC);
+       return hw_init(sr_ctx, TEKPOWER_TP4000ZC);
 }
 
-static int hw_init_metex_me31(void)
+static int hw_init_metex_me31(struct sr_context *sr_ctx)
 {
-       return hw_init(METEX_ME31);
+       return hw_init(sr_ctx, METEX_ME31);
 }
 
-static int hw_init_peaktech_3410(void)
+static int hw_init_peaktech_3410(struct sr_context *sr_ctx)
 {
-       return hw_init(PEAKTECH_3410);
+       return hw_init(sr_ctx, PEAKTECH_3410);
 }
 
-static int hw_init_mastech_mas345(void)
+static int hw_init_mastech_mas345(struct sr_context *sr_ctx)
 {
-       return hw_init(MASTECH_MAS345);
+       return hw_init(sr_ctx, MASTECH_MAS345);
 }
 
-static int hw_init_va_va18b(void)
+static int hw_init_va_va18b(struct sr_context *sr_ctx)
 {
-       return hw_init(VA_VA18B);
+       return hw_init(sr_ctx, VA_VA18B);
 }
 
-static int hw_init_metex_m3640d(void)
+static int hw_init_metex_m3640d(struct sr_context *sr_ctx)
 {
-       return hw_init(METEX_M3640D);
+       return hw_init(sr_ctx, METEX_M3640D);
 }
 
-static int hw_init_peaktech_4370(void)
+static int hw_init_peaktech_4370(struct sr_context *sr_ctx)
 {
-       return hw_init(PEAKTECH_4370);
+       return hw_init(sr_ctx, PEAKTECH_4370);
 }
 
-static int hw_init_pce_pce_dm32(void)
+static int hw_init_pce_pce_dm32(struct sr_context *sr_ctx)
 {
-       return hw_init(PCE_PCE_DM32);
+       return hw_init(sr_ctx, PCE_PCE_DM32);
 }
 
-static int hw_init_radioshack_22_168(void)
+static int hw_init_radioshack_22_168(struct sr_context *sr_ctx)
 {
-       return hw_init(RADIOSHACK_22_168);
+       return hw_init(sr_ctx, RADIOSHACK_22_168);
 }
 
-static int hw_init_radioshack_22_812(void)
+static int hw_init_radioshack_22_812(struct sr_context *sr_ctx)
 {
-       return hw_init(RADIOSHACK_22_812);
+       return hw_init(sr_ctx, RADIOSHACK_22_812);
 }
 
 static GSList *scan(const char *conn, const char *serialcomm, int dmm)

diff --git a/hardware/tondaj-sl-814/api.c b/hardware/tondaj-sl-814/api.c
index beb8c3378724859c1e67a07530c7877f15dd0afd..8962437069de2147ee8b55816148faa1802ac058 100644 (file)
--- a/hardware/tondaj-sl-814/api.c
+++ b/hardware/tondaj-sl-814/api.c
@@ -73,7 +73,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;
 

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index cf4c3435199c1bf1f2effeac0118d2e1d26b25eb..e96cf00aa399b3cf0767a25d945a524fdcdceb5e 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -53,7 +53,7 @@ static int clear_instances(void)
        return SR_OK;
 }
 
-static int hw_init(int dmm)
+static int hw_init(struct sr_context *sr_ctx, int dmm)
 {
        int ret;
        struct drv_context *drvc;
@@ -80,14 +80,14 @@ static int hw_init(int dmm)
        return SR_OK;
 }
 
-static int hw_init_ut61d(void)
+static int hw_init_ut61d(struct sr_context *sr_ctx)
 {
-       return hw_init(UNI_T_UT61D);
+       return hw_init(sr_ctx, UNI_T_UT61D);
 }
 
-static int hw_init_vc820(void)
+static int hw_init_vc820(struct sr_context *sr_ctx)
 {
-       return hw_init(VOLTCRAFT_VC820);
+       return hw_init(sr_ctx, VOLTCRAFT_VC820);
 }
 
 static GSList *hw_scan(GSList *options)

diff --git a/hardware/victor-dmm/api.c b/hardware/victor-dmm/api.c
index ae471d76fe82a124c37e406febe1d1fb8720646a..b5a28a6e28d93b5e1fa91a7531d62d3629403870 100644 (file)
--- a/hardware/victor-dmm/api.c
+++ b/hardware/victor-dmm/api.c
@@ -76,7 +76,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;
 

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index cb83d11dd5194c42ac7277fe7927c4553f06958c..57345da8769ff0c4a8ae8d388e3fed3ad5774eae 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -303,7 +303,7 @@ static int clear_instances(void)
  * API callbacks
  */
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
        struct drv_context *drvc;
 

diff --git a/hwdriver.c b/hwdriver.c
index d2f62e3a88d0768d26d4af1901b69e239926bc38..2b04e2298ef082f47ecfff8deb5de01bc6dcf59a 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -222,7 +222,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
 {
 
        if (driver->init)
-               return driver->init();
+               return driver->init(ctx);
 
        return SR_OK;
 }

diff --git a/libsigrok.h b/libsigrok.h
index d7d31a33f131d9a46fa0e572945e5bd7e1c4824f..94bc52291a7dbaa2eaa1c8bce7a13d5558adaa9d 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -605,7 +605,7 @@ struct sr_dev_driver {
        char *name;
        char *longname;
        int api_version;
-       int (*init) (void);
+       int (*init) (struct sr_context *sr_ctx);
        int (*cleanup) (void);
        GSList *(*scan) (GSList *options);
        GSList *(*dev_list) (void);

diff --git a/session_driver.c b/session_driver.c
index 43ad24d6b0b489ddc4763cdaa0f760902863d187..011b731201943665f4e2d459230a9a2ccdaa6aad 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -117,8 +117,10 @@ static int receive_data(int fd, int revents, void *cb_data)
 /* driver callbacks */
 static int hw_cleanup(void);
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
+       (void)sr_ctx;
+
        return SR_OK;
 }