std: Drop hw_ from function names.

The per-driver API calls no longer have a hw_ prefix (e.g. hw_init()
became init() and so on), so drop the 'hw_' from the std versions
for those API callbacks too.

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index a7f3beb58e351128ee3ebfde2b80751b7dfa5135..41e3075db12ad5542680398092a5b019da3a74b1 100644 (file)
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -68,7 +68,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)
@@ -283,7 +283,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       return std_hw_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+       return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
                        sdi->conn, LOG_PREFIX);
 }
 

diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c
index aeac8713541c17e4f369cabe9bbf5142e57e9238..2d4da2631ec4c4dff483795dcc72d43cb74004b9 100644 (file)
--- a/hardware/alsa/api.c
+++ b/hardware/alsa/api.c
@@ -53,7 +53,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 2ddbbea9bc684e272f7c5f5054eec17e25911694..a0975776be0490fc7e7dd229c7e3171affe26b7e 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -396,7 +396,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/hardware/brymen-dmm/api.c b/hardware/brymen-dmm/api.c
index ac0ad86b9bf7a641455ca26beb1305ebe2537b96..fc371a793829a7a4107535f9f0a215393be3a74d 100644 (file)
--- a/hardware/brymen-dmm/api.c
+++ b/hardware/brymen-dmm/api.c
@@ -36,7 +36,7 @@ static struct sr_dev_driver *di = &brymen_bm857_driver_info;
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static int clear_instances(void)
@@ -264,8 +264,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       return std_hw_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
-                                                 sdi->conn, LOG_PREFIX);
+       return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+                                              sdi->conn, LOG_PREFIX);
 }
 
 SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {

diff --git a/hardware/chronovu-la8/api.c b/hardware/chronovu-la8/api.c
index 13ed80624c27d9b4f366acadd5e6c05526c9c874..cbf91df3040eb738386ae36ce87c646fd531226f 100644 (file)
--- a/hardware/chronovu-la8/api.c
+++ b/hardware/chronovu-la8/api.c
@@ -73,7 +73,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index a16872764b76043deb46834b782b2090075d3ce6..4406402979551d5f60512cc38c36342bff35863b 100644 (file)
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -52,7 +52,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)
@@ -231,8 +231,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       return std_hw_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
-              sdi->conn, LOG_PREFIX);
+       return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+                       sdi->conn, LOG_PREFIX);
 }
 
 SR_PRIV struct sr_dev_driver colead_slm_driver_info = {

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index fa07cad38f82d794baf7e0f3cf7b0f9fcbcc32c1..93d47c29e7d8cc087a6cf0fa76f9203bdd020200 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -152,7 +152,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index c64aa5ca4451c668a41d70d0ba485500416095d9..20021d77393a057e566437de37a5669c5250e6ae 100644 (file)
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -65,7 +65,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *fluke_scan(const char *conn, const char *serialcomm)
@@ -323,8 +323,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       return std_hw_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
-              sdi->conn, LOG_PREFIX);
+       return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+                       sdi->conn, LOG_PREFIX);
 }
 
 SR_PRIV struct sr_dev_driver flukedmm_driver_info = {

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 278563a41472ebaa2c887a8db5ad18a4f852ef8d..5932e553c47b41f030c9e727acb36dbb17eed671 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -353,7 +353,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index dee781eb68a74d5929a10269090ff98bd464e0aa..6ac9ba616cb09ae6c5d13a2aff923e6acf440c4f 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -251,7 +251,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c
index 761862d2ad2829a7a75de0e2a699ccfe2952b4c8..d2eaecdeb9e25c7d0567a56b7160aba8312cce05 100644 (file)
--- a/hardware/lascar-el-usb/api.c
+++ b/hardware/lascar-el-usb/api.c
@@ -45,7 +45,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index b11818ef95e7c4a0cd1d8b4fd020bf82b3da43c1..a77a37e2a962899caf30d9ce831efaa88090d75d 100644 (file)
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -53,7 +53,7 @@ static struct sr_dev_driver *di = &link_mso19_driver_info;
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/hardware/mic-985xx/api.c b/hardware/mic-985xx/api.c
index 98ec7f793d2603d5b909e05030a0ba54ce3bba60..858f2a3e92c5c2f0b651962635ce402c731a9ddc 100644 (file)
--- a/hardware/mic-985xx/api.c
+++ b/hardware/mic-985xx/api.c
@@ -58,7 +58,7 @@ static int init(struct sr_context *sr_ctx, int idx)
 {
        sr_dbg("Selected '%s' subdriver.", mic_devs[idx].di->name);
 
-       return std_hw_init(sr_ctx, mic_devs[idx].di, LOG_PREFIX);
+       return std_init(sr_ctx, mic_devs[idx].di, LOG_PREFIX);
 }
 
 static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
@@ -262,8 +262,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       return std_hw_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
-                                                 sdi->conn, LOG_PREFIX);
+       return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+                                              sdi->conn, LOG_PREFIX);
 }
 
 /* Driver-specific API function wrappers */

diff --git a/hardware/nexus-osciprime/api.c b/hardware/nexus-osciprime/api.c
index 3aafb0660726585fd8f9e0db7c7442d1fce9fb84..b6d1a60b08235ad73e682b8d80e4961d54670725 100644 (file)
--- a/hardware/nexus-osciprime/api.c
+++ b/hardware/nexus-osciprime/api.c
@@ -112,7 +112,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index 31f386568d32e4972a7399cce92d8f8bd0d7d672..04a06b2e1c0878f213796b72ccaa4f01e5deda46 100644 (file)
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -55,7 +55,7 @@ static struct sr_dev_driver *di = &ols_driver_info;
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 81ea66950c06a560d2868fa0ac2ef18d80913729..04d3f0aecd4c5845741eb9057f99e3e6235aeeeb 100644 (file)
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -178,7 +178,7 @@ static int set_cfg(const struct sr_dev_inst *sdi, const char *format, ...)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static int probe_port(const char *port, GSList **devices)

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 330ada965c5aff423eb436922fa4fd78648a1b60..b0c097cde51eabce1c673ee0508d467adb71f6aa 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -201,7 +201,7 @@ static int init(struct sr_context *sr_ctx, int dmm)
 {
        sr_dbg("Selected '%s' subdriver.", dmms[dmm].di->name);
 
-       return std_hw_init(sr_ctx, dmms[dmm].di, LOG_PREFIX);
+       return std_init(sr_ctx, dmms[dmm].di, LOG_PREFIX);
 }
 
 static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm)
@@ -445,8 +445,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       return std_hw_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
-                                                 sdi->conn, LOG_PREFIX);
+       return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+                                              sdi->conn, LOG_PREFIX);
 }
 
 /* Driver-specific API function wrappers */

diff --git a/hardware/tondaj-sl-814/api.c b/hardware/tondaj-sl-814/api.c
index 583b942256c2f224b79c33e433f3eeb879f5014c..36a884a533a1b7ab7dd9a147df6be04ee786bf13 100644 (file)
--- a/hardware/tondaj-sl-814/api.c
+++ b/hardware/tondaj-sl-814/api.c
@@ -47,7 +47,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)
@@ -227,8 +227,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       return std_hw_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
-                                                 sdi->conn, LOG_PREFIX);
+       return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+                                              sdi->conn, LOG_PREFIX);
 }
 
 SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info = {

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index b5866531e6523bee4a51a9ed89cd365858a1e6d3..4570e5268b2c07aeee2cfc2bb01cc873b0651a54 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -98,7 +98,7 @@ static int init(struct sr_context *sr_ctx, int dmm)
 {
        sr_dbg("Selected '%s' subdriver.", udmms[dmm].di->name);
 
-       return std_hw_init(sr_ctx, udmms[dmm].di, LOG_PREFIX);
+       return std_init(sr_ctx, udmms[dmm].di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options, int dmm)

diff --git a/hardware/victor-dmm/api.c b/hardware/victor-dmm/api.c
index ea293168048e9d48228a95872604eae5a9863494..41edc1d804ed1850f70d2dfe8e71b195fb0f9c8f 100644 (file)
--- a/hardware/victor-dmm/api.c
+++ b/hardware/victor-dmm/api.c
@@ -53,7 +53,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/hardware/zeroplus-logic-cube/api.c b/hardware/zeroplus-logic-cube/api.c
index ab062ea277ce530c3e5b4e18a34cc36b074ad49b..2117afbc4d29be633face6912c591e2da881dc59 100644 (file)
--- a/hardware/zeroplus-logic-cube/api.c
+++ b/hardware/zeroplus-logic-cube/api.c
@@ -245,7 +245,7 @@ static int clear_instances(void)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, "zeroplus: ");
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index e21aa43de8b3b637b793cafc7421d9c671d0cc4f..5fc0fbfabcea5303a3669a71c739fbbe7f6c6842 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -125,9 +125,9 @@ SR_PRIV int sr_session_stop_sync(void);
 typedef int (*dev_close_t)(struct sr_dev_inst *sdi);
 typedef void (*std_dev_clear_t)(void *priv);
 
-SR_PRIV int std_hw_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
+SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
                const char *prefix);
-SR_PRIV int std_hw_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
+SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
                void *cb_data, dev_close_t dev_close_fn,
                struct sr_serial_dev_inst *serial, const char *prefix);
 SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,

diff --git a/std.c b/std.c
index 059bf759013ef5274af32aa6c797a913c55b3da5..46ab5ad95dc30c343dd0fe858b3552cbd919127f 100644 (file)
--- a/std.c
+++ b/std.c
@@ -37,8 +37,8 @@
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
  *         SR_ERR_MALLOC upon memory allocation errors.
  */
-SR_PRIV int std_hw_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
-                       const char *prefix)
+SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
+                    const char *prefix)
 {
        struct drv_context *drvc;
 
@@ -120,7 +120,7 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
  *         SR_ERR upon other errors.
  */
-SR_PRIV int std_hw_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
+SR_PRIV int std_dev_acquisition_stop_serial(struct sr_dev_inst *sdi,
                        void *cb_data, dev_close_t dev_close_fn,
                        struct sr_serial_dev_inst *serial, const char *prefix)
 {