Match std_init() parameter order to the driver init() callback

The std_init() callback has the order of the first two paramters opposite
to the init() callback. This is primarily due to historical development.

Since the std_init() function is usually called from a driver's init()
callback aligning the order will allow direct register pass through rather
than having to swap them around. It also allow to eventually use the
std_init() function directly as the init() callback.

Signed-off-by: Lars-Peter Clausen <redacted>

diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c
index 1e5679b218392a1e3b8482eae4d1786758be0788..da6b84ca4b1492f62723ac321e0afd6994d036bd 100644 (file)
--- a/src/hardware/agilent-dmm/api.c
+++ b/src/hardware/agilent-dmm/api.c
@@ -74,7 +74,7 @@ SR_PRIV struct sr_dev_driver agdmm_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/appa-55ii/api.c b/src/hardware/appa-55ii/api.c
index 03c1452480974516e3841ec0fb88323cbdb2e925..6163f2df1e5420698d3f4799e8604844347ad4e9 100644 (file)
--- a/src/hardware/appa-55ii/api.c
+++ b/src/hardware/appa-55ii/api.c
@@ -46,7 +46,7 @@ SR_PRIV struct sr_dev_driver appa_55ii_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index e1bf5fc2cbb3157d20d8f3ad5f9794ddf88381a6..4543a025a65aab794d47b28dfd1cd60543fe72c5 100644 (file)
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -60,7 +60,7 @@ SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c
index 77e989a934e9a04a0414922dde14bfbafb361eb5..cb5eeca4b110b07e52b5000414119549ef04bed2 100644 (file)
--- a/src/hardware/asix-sigma/api.c
+++ b/src/hardware/asix-sigma/api.c
@@ -65,7 +65,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index 21968df4c77beac2dcc88461a074a2255d0e860c..e46bff41aef5fbf30c904c343d57ac11fe95339e 100644 (file)
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -79,7 +79,7 @@ SR_PRIV struct sr_dev_driver atten_pps3203_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index a556449c67654824a0e89d8935589db53799d91f..49cf96aed5c3ae66f72233966de57c9610540b6a 100644 (file)
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -55,7 +55,7 @@ static const uint64_t samplerates[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index 8694d8fde6c8eb607742305c22b2d91553968312..e8309bd258f80c4a565b4ad9cd81c75c9b3135a0 100644 (file)
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -62,7 +62,7 @@ static const uint64_t samplerates[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static struct dev_context *beaglelogic_devc_alloc(void)

diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index 3f270fb081f3819cab784c9b0eadca028be640dd..cf41e90d4cbb75648ded205c47acbc365a29b579 100644 (file)
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -37,7 +37,7 @@ SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c
index ffc0e9c6e3c3d9a5bdfe5abd22aa186b8de84e0c..28e2a5ba4528b065cce6fd54f10e7b7880382c97 100644 (file)
--- a/src/hardware/brymen-dmm/api.c
+++ b/src/hardware/brymen-dmm/api.c
@@ -37,7 +37,7 @@ static struct sr_dev_driver *di = &brymen_bm857_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *brymen_scan(const char *conn, const char *serialcomm)

diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c
index 435c236f148a08c5da2a1d01743ec624f55f007f..40b8c6d8b9622e6f44d0bf3dd97c8b8464c487c3 100644 (file)
--- a/src/hardware/cem-dt-885x/api.c
+++ b/src/hardware/cem-dt-885x/api.c
@@ -73,7 +73,7 @@ SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c
index 27fcad531186731013c5e1d74f9cbcf73eac77d8..6c0e08904a9ea74810e14bb760466be7585cb1da 100644 (file)
--- a/src/hardware/center-3xx/api.c
+++ b/src/hardware/center-3xx/api.c
@@ -58,7 +58,7 @@ SR_PRIV const struct center_dev_info center_devs[] = {
 
 static int init(struct sr_context *sr_ctx, int idx)
 {
-       return std_init(sr_ctx, center_devs[idx].di, LOG_PREFIX);
+       return std_init(center_devs[idx].di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *center_scan(const char *conn, const char *serialcomm, int idx)

diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index 1e6f5f415bdeed7f660766372b2588d1817c348d..fa28d82e014abc65344fe8487039711855cfc26b 100644 (file)
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -66,7 +66,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static int add_device(int model, struct libusb_device_descriptor *des,

diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c
index 01da31a96c8dd75f427110a8193e966823f0f3a9..7cbd2e671b664433e3b5779b06d9709cbc41527a 100644 (file)
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -46,7 +46,7 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/conrad-digi-35-cpu/api.c b/src/hardware/conrad-digi-35-cpu/api.c
index 92798e8212d2330895166b86f4d8ab6cea023336..357dad94563da385addc991b8a475b4b5f12579a 100644 (file)
--- a/src/hardware/conrad-digi-35-cpu/api.c
+++ b/src/hardware/conrad-digi-35-cpu/api.c
@@ -43,7 +43,7 @@ SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index 9a0232397564456156a339539e78d2fc9c5653b1..1587d5e7b8c5c64eaf45c324508a276fd058985b 100644 (file)
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -181,7 +181,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi);
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate)

diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c
index 2f1109b553f66646d1cd75d42a077041ce6aea1c..7a832022789adb9fe47cec018f8ad91faf37b519 100644 (file)
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -41,7 +41,7 @@ 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);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index b352355c35186b6ac0338e5694eb13fc1b0e7fac..8d4ed2bb32c96b277ae22b2c89b70ee632083844 100644 (file)
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -61,7 +61,7 @@ static const struct flukedmm_profile supported_flukedmm[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn,

diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c
index a1b3e967239b70107401cdccca42f23586a17099..c258be14e2da2c66526ceea01d6aab8ad8ebc1c6 100644 (file)
--- a/src/hardware/ftdi-la/api.c
+++ b/src/hardware/ftdi-la/api.c
@@ -86,7 +86,7 @@ static const struct ftdi_chip_desc *chip_descs[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static void scan_device(struct sr_dev_driver *di, struct libusb_device *dev, GSList **devices)

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index 6eeaed0b4c5f5520e6ce19448f79589814b43706..e56f152f5ff191069020fc3cdb22c382d4b3721d 100644 (file)
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -183,7 +183,7 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 2f0f671c90f6a8204da88632cf83e6ba576e7d84..67ad40d34a5d1c6a531830810b7524b075c254eb 100644 (file)
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -68,7 +68,7 @@ static const uint32_t devopts_bd[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 /**

diff --git a/src/hardware/gwinstek-gds-800/api.c b/src/hardware/gwinstek-gds-800/api.c
index 0da6760ab875d253ba370302b919610efa543b3f..5e4a67fc3d2b0d14fe916b15f0258b7d10e39362 100644 (file)
--- a/src/hardware/gwinstek-gds-800/api.c
+++ b/src/hardware/gwinstek-gds-800/api.c
@@ -35,7 +35,7 @@ SR_PRIV struct sr_dev_driver gwinstek_gds_800_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index b810b9f1d6d42d1d7083c23bf4d2cb2a5d1be13e..f75f55e07a7c89054a7cbcb24e14ff51921e86ba 100644 (file)
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -49,7 +49,7 @@ enum {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static int check_manufacturer(const char *manufacturer)

diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c
index 1d600648ce15420124a89da34f32cd537d9d91a4..ab866a47753268e9a74c8af22018d7a4abd61234 100644 (file)
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -165,7 +165,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 8a2f42c5f7335864bcdccf70080616670dc86de8..6162d5c13f022b34ddcbf6501bae618c01fab0b2 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -256,7 +256,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/hp-3457a/api.c b/src/hardware/hp-3457a/api.c
index 5dedc9213292beca4ff3f7c276afb20eb3dcbfc5..a5ff7d98db0ab72a1d2627e4026fb0b7dcac36a6 100644 (file)
--- a/src/hardware/hp-3457a/api.c
+++ b/src/hardware/hp-3457a/api.c
@@ -168,7 +168,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/hung-chang-dso-2100/api.c b/src/hardware/hung-chang-dso-2100/api.c
index 791fd5d67c026bc44a7a677cdde5cc54069f37ee..eb2246f61a6a8465dfd1cb7b58ba386efc80524a 100644 (file)
--- a/src/hardware/hung-chang-dso-2100/api.c
+++ b/src/hardware/hung-chang-dso-2100/api.c
@@ -106,7 +106,7 @@ static const uint8_t coupling_map[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan_port(GSList *devices, struct sr_dev_driver *di,

diff --git a/src/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c
index 1ce3b91c9d771b97a450561dda2d08615b796c68..6a8e095636eed82035afaf17ccb752a71cfcbb83 100644 (file)
--- a/src/hardware/ikalogic-scanalogic2/api.c
+++ b/src/hardware/ikalogic-scanalogic2/api.c
@@ -56,7 +56,7 @@ SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/ikalogic-scanaplus/api.c b/src/hardware/ikalogic-scanaplus/api.c
index 8c8ee13f33750f0921ebd4d12061a889f6a8b541..898d7a3a574bcc377dab5e52b2fc640e0f15e503 100644 (file)
--- a/src/hardware/ikalogic-scanaplus/api.c
+++ b/src/hardware/ikalogic-scanaplus/api.c
@@ -67,7 +67,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/kecheng-kc-330b/api.c b/src/hardware/kecheng-kc-330b/api.c
index 86ac30b15a5dfd7f435129adf4cefde36b553441..309b1b6408667096285d233a05eb9863e1d55d1d 100644 (file)
--- a/src/hardware/kecheng-kc-330b/api.c
+++ b/src/hardware/kecheng-kc-330b/api.c
@@ -65,7 +65,7 @@ SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static int scan_kecheng(struct sr_dev_driver *di,

diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c
index 0705750a52776766f52f54610f9fe507d6905299..ef954306ee741153108b7b9e33b41fa753646b6c 100644 (file)
--- a/src/hardware/kern-scale/api.c
+++ b/src/hardware/kern-scale/api.c
@@ -38,7 +38,7 @@ static const uint32_t devopts[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index 5361908a374b79149e20d2f9ecf958e41f1ab196..9a2b916946cbd3794a222f323d2caeb64205a54f 100644 (file)
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -66,7 +66,7 @@ SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index 3b78b198b3c3c35009eddede52a3e7c3009114df..ce61f46229ecd8b5f8fcc365519049f348ba183b 100644 (file)
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -40,7 +40,7 @@ static const uint32_t devopts[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c
index b6c5116083f4822c457212e4f1e1879035b4bb4d..8e58bd04ac6f79ad2f282eea84f6b780ff86828a 100644 (file)
--- a/src/hardware/lecroy-logicstudio/api.c
+++ b/src/hardware/lecroy-logicstudio/api.c
@@ -75,7 +75,7 @@ SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static struct sr_dev_inst *create_device(struct sr_dev_driver *di,

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index c35fc718903eb41b202786432250ac1e43460bc5..e25c5578f72ba4fa5a89857c763565b99c779626 100644 (file)
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -87,7 +87,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c
index 29a29f9f48e0ee8bea6df937a1835e4d94d2a370..4ce5909b164fae829c9467d3fbf4114387cd2d49 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -77,7 +77,7 @@ SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index b99f8eeb2a565193f516e1f7437ed40c88c1f97a..59f9c7ff960d67ef34968df8c479ed9d702e1660 100644 (file)
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -113,7 +113,7 @@ SR_PRIV struct sr_dev_driver maynuo_m97_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus)

diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c
index b0b6411523c5ed28d6143e864532ebb5a5357def..f6d77f0515f0dc7dd386aaa13bac6167a3145c5c 100644 (file)
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/api.c
@@ -59,7 +59,7 @@ SR_PRIV const struct mic_dev_info mic_devs[] = {
 
 static int init(struct sr_context *sr_ctx, int idx)
 {
-       return std_init(sr_ctx, mic_devs[idx].di, LOG_PREFIX);
+       return std_init(mic_devs[idx].di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index 02ee76dc752e55e53313dbe8a4fb1aaf29a12ba9..8d87da0280cf47ffd1210943ddd7eb59d52a6c4d 100644 (file)
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -135,7 +135,7 @@ static const struct lps_modelspec models[] = {
 
 static int init_lps301(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 /** Send command to device with va_list.

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index 91fc5a1bd7fe3a47c1b9c4fee5fb735ac8983fb9..fa32fa65c669d8bd76d11e18cb462b724dbfa15e 100644 (file)
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -67,7 +67,7 @@ static const char *get_typestr(int type, struct sr_dev_driver *drv)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *drv, GSList *options)

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index 9a96e234407f3bf24f095786d1ed7439e56d6800..96a7cc0986023bf7326b3d19ea3e94ecbd22e168 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -89,7 +89,7 @@ SR_PRIV struct sr_dev_driver ols_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index a2b01dce199b648f874dfa17355003ae19b584cf..c4d0cf370ec4d7559b00a0bf1bccdc95d30a7a1e 100644 (file)
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -79,7 +79,7 @@ SR_PRIV struct sr_dev_driver p_ols_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index f38ad8db24990aa2c8c5583677f97329f7af9eeb..53208a7237aa24adfdac96142c6ca7f36d5db07e 100644 (file)
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -274,7 +274,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)

diff --git a/src/hardware/saleae-logic16/api.c b/src/hardware/saleae-logic16/api.c
index 4990ce82cff0fe317a64dc9f5d9558b79e9e03fc..5c587effd555eca90420ab16c100a3e07c7f1a79 100644 (file)
--- a/src/hardware/saleae-logic16/api.c
+++ b/src/hardware/saleae-logic16/api.c
@@ -97,7 +97,7 @@ static const uint64_t samplerates[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static gboolean check_conf_profile(libusb_device *dev)

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 5fd83d4e9215d83c6d327109ec4b00eedfc8ca82..01ae50cce66aa70e9c6b1a0da6b1ec163f1cf4a7 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -43,7 +43,7 @@ static const struct pps_channel_instance pci[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index b66274c5d7730c985e3d9d10387e3e1a62c86098..b16caa9abff77771dd64ece7363b16189cefb0fb 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -43,7 +43,7 @@ static const uint32_t devopts[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index 0a614f9dbc4023f2a0f44780efd0f8cd10565731..33992ffef0ee268202c1c462888eb902f9dfaa48 100644 (file)
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -65,7 +65,7 @@ static const char *const signal_edge_names[] = {
  */
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 /* Create a new sigrok device instance for the indicated LWLA model.

diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index be4261c976c0d8da3d35775d693989de048df33e..a99fd37f6ea86634999e784964bf4bb9518aeadd 100644 (file)
--- a/src/hardware/teleinfo/api.c
+++ b/src/hardware/teleinfo/api.c
@@ -40,7 +40,7 @@ SR_PRIV struct sr_dev_driver teleinfo_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c
index a6146e08d339603300ebaa027127cc696334d171..79a11b430bd43c79ff86a67d7921b8dfd9e90842 100644 (file)
--- a/src/hardware/testo/api.c
+++ b/src/hardware/testo/api.c
@@ -45,7 +45,7 @@ static const struct testo_model models[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/tondaj-sl-814/api.c b/src/hardware/tondaj-sl-814/api.c
index 20beb2325006d63247c7e5f4f091ce3edbec3cf1..7c9c1bf85e8b7ef0011e731e811896efbeaed5ef 100644 (file)
--- a/src/hardware/tondaj-sl-814/api.c
+++ b/src/hardware/tondaj-sl-814/api.c
@@ -43,7 +43,7 @@ SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index 2d8cff1efb37323e3ec1c99937fe55eeb8e5544b..1c1cd300507100f95f52f13d5e4f15e499ec1d9e 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -48,7 +48,7 @@ static const uint32_t devopts[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/uni-t-ut32x/api.c b/src/hardware/uni-t-ut32x/api.c
index 7ed3f88ce8fa1f38d8b159584d92224b02357298..5e8be27ba085c034a8f4c9ddd0f332c2afd1ca34 100644 (file)
--- a/src/hardware/uni-t-ut32x/api.c
+++ b/src/hardware/uni-t-ut32x/api.c
@@ -41,7 +41,7 @@ SR_PRIV struct sr_dev_driver uni_t_ut32x_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c
index 47854ee929d75dbfe8a0d57885c6d917264ffa25..c00c29fb4654adc1cfdb838e56f25e7f02623c4b 100644 (file)
--- a/src/hardware/victor-dmm/api.c
+++ b/src/hardware/victor-dmm/api.c
@@ -52,7 +52,7 @@ static const uint32_t devopts[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index 082c01796ef5d578f4edcdbd78de28d8d14fc2fb..547179d0082bf0dff6ce0da6bb1357da75b275bb 100644 (file)
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -65,7 +65,7 @@ enum {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index 23a2e69f986c75d88deffa0c4ec37bb7ea576d85..32c868996ee2ec3676cf7a439191b8cc1a919b94 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -157,7 +157,7 @@ SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 589d0a4d00eb1e3b1533e4ae4c1c2ab5d435dbfd..328e17078f32b77faa91a6643e8166e6b2749dc3 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -859,7 +859,7 @@ SR_PRIV int sr_analog_init(struct sr_datafeed_analog *analog,
 typedef int (*dev_close_callback)(struct sr_dev_inst *sdi);
 typedef void (*std_dev_clear_callback)(void *priv);
 
-SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
+SR_PRIV int std_init(struct sr_dev_driver *di, struct sr_context *sr_ctx,
                const char *prefix);
 SR_PRIV int std_cleanup(const struct sr_dev_driver *di);
 #ifdef HAVE_LIBSERIALPORT

diff --git a/src/session_driver.c b/src/session_driver.c
index d56c22c23866f088323f4c8ab43d669396572f13..c7f2b3d72692fe9d832d46c2a8295fafad5248a0 100644 (file)
--- a/src/session_driver.c
+++ b/src/session_driver.c
@@ -208,7 +208,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)

diff --git a/src/std.c b/src/std.c
index aadf8236a790a3f79c38ece2cf6ebd191166991c..8f6f3786339472dd06136ceab46368ea3a0e0764 100644 (file)
--- a/src/std.c
+++ b/src/std.c
@@ -39,13 +39,13 @@
  * It creates a new 'struct drv_context' (drvc), assigns sr_ctx to it, and
  * then 'drvc' is assigned to the 'struct sr_dev_driver' (di) that is passed.
  *
- * @param sr_ctx The libsigrok context to assign.
  * @param di The driver instance to use.
+ * @param sr_ctx The libsigrok context to assign.
  * @param[in] prefix A driver-specific prefix string used for log messages.
  *
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
  */
-SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
+SR_PRIV int std_init(struct sr_dev_driver *di, struct sr_context *sr_ctx,
                     const char *prefix)
 {
        struct drv_context *drvc;