zketech-ebd-usb: Shorten function name prefix for better readability.

diff --git a/src/hardware/zketech-ebd-usb/api.c b/src/hardware/zketech-ebd-usb/api.c
index 4db306f6a7ddc2a403174431bb0dd9b2eb115d0b..4dbe841570673e0dbb1e1d121c395ed51c24c927 100644 (file)
--- a/src/hardware/zketech-ebd-usb/api.c
+++ b/src/hardware/zketech-ebd-usb/api.c
@@ -88,14 +88,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->priv = devc;
 
        /* Starting device. */
-       zketech_ebd_usb_init(serial, devc);
-       int ret = zketech_ebd_usb_read_chars(serial, MSG_LEN, reply);
+       ebd_init(serial, devc);
+       int ret = ebd_read_chars(serial, MSG_LEN, reply);
        if (ret != MSG_LEN || reply[MSG_FRAME_BEGIN_POS] != MSG_FRAME_BEGIN \
                        || reply[MSG_FRAME_END_POS] != MSG_FRAME_END) {
                sr_warn("Invalid message received!");
                ret = SR_ERR;
        }
-       zketech_ebd_usb_stop(serial, devc);
+       ebd_stop(serial, devc);
 
        serial_close(serial);
 
@@ -135,7 +135,7 @@ static int config_get(uint32_t key, GVariant **data,
        case SR_CONF_LIMIT_MSEC:
                return sr_sw_limits_config_get(&devc->limits, key, data);
        case SR_CONF_CURRENT_LIMIT:
-               ret = zketech_ebd_usb_get_current_limit(sdi, &fvalue);
+               ret = ebd_get_current_limit(sdi, &fvalue);
                if (ret == SR_OK)
                        *data = g_variant_new_double(fvalue);
                return ret;
@@ -163,7 +163,7 @@ static int config_set(uint32_t key, GVariant *data,
                value = g_variant_get_double(data);
                if (value < 0.0 || value > 4.0)
                        return SR_ERR_ARG;
-               return zketech_ebd_usb_set_current_limit(sdi, value);
+               return ebd_set_current_limit(sdi, value);
        default:
                return SR_ERR_NA;
        }
@@ -197,19 +197,19 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        sr_sw_limits_acquisition_start(&devc->limits);
        std_session_send_df_header(sdi);
 
-       zketech_ebd_usb_init(serial, devc);
-       if (!zketech_ebd_usb_current_is0(devc))
-               zketech_ebd_usb_loadstart(serial, devc);
+       ebd_init(serial, devc);
+       if (!ebd_current_is0(devc))
+               ebd_loadstart(serial, devc);
 
        serial_source_add(sdi->session, serial, G_IO_IN, 100,
-               zketech_ebd_usb_receive_data, (void *)sdi);
+               ebd_receive_data, (void *)sdi);
 
        return SR_OK;
 }
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       zketech_ebd_usb_loadstop(sdi->conn, sdi->priv);
+       ebd_loadstop(sdi->conn, sdi->priv);
 
        return std_serial_dev_acquisition_stop(sdi);
 }

diff --git a/src/hardware/zketech-ebd-usb/protocol.c b/src/hardware/zketech-ebd-usb/protocol.c
index b494aa14e7cf64d6877e20de2e25c057920284e4..be4aa285e2bad66ff0fff9e6c5e2515a46b2024b 100644 (file)
--- a/src/hardware/zketech-ebd-usb/protocol.c
+++ b/src/hardware/zketech-ebd-usb/protocol.c
@@ -80,8 +80,7 @@ static int send_cfg(struct sr_serial_dev_inst *serial, struct dev_context *devc)
 }
 
 /* Send the init/connect sequence; drive starts sending voltage and current. */
-SR_PRIV int zketech_ebd_usb_init(struct sr_serial_dev_inst *serial,
-               struct dev_context *devc)
+SR_PRIV int ebd_init(struct sr_serial_dev_inst *serial, struct dev_context *devc)
 {
        uint8_t init[] = { 0xfa, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xf8 };
 
@@ -95,15 +94,14 @@ SR_PRIV int zketech_ebd_usb_init(struct sr_serial_dev_inst *serial,
 }
 
 /* Start the load functionality. */
-SR_PRIV int zketech_ebd_usb_loadstart(struct sr_serial_dev_inst *serial,
-               struct dev_context *devc)
+SR_PRIV int ebd_loadstart(struct sr_serial_dev_inst *serial, struct dev_context *devc)
 {
        uint8_t start[] = { 0xfa, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf8 };
        int ret;
 
        ret = send_cmd(serial, start, 10);
        sr_dbg("Current limit: %f.", devc->current_limit);
-       if (zketech_ebd_usb_current_is0(devc))
+       if (ebd_current_is0(devc))
                return SR_OK;
 
        ret = send_cfg(serial, devc);
@@ -116,8 +114,7 @@ SR_PRIV int zketech_ebd_usb_loadstart(struct sr_serial_dev_inst *serial,
 }
 
 /* Stop the load functionality. */
-SR_PRIV int zketech_ebd_usb_loadstop(struct sr_serial_dev_inst *serial,
-               struct dev_context *devc)
+SR_PRIV int ebd_loadstop(struct sr_serial_dev_inst *serial, struct dev_context *devc)
 {
        int ret;
        uint8_t stop[] = { 0xfa, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xF8 };
@@ -130,8 +127,7 @@ SR_PRIV int zketech_ebd_usb_loadstop(struct sr_serial_dev_inst *serial,
 }
 
 /* Stop the drive. */
-SR_PRIV int zketech_ebd_usb_stop(struct sr_serial_dev_inst *serial,
-               struct dev_context *devc)
+SR_PRIV int ebd_stop(struct sr_serial_dev_inst *serial, struct dev_context *devc)
 {
        uint8_t stop[] = { 0xfa, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xF8 };
        int ret;
@@ -148,8 +144,7 @@ SR_PRIV int zketech_ebd_usb_stop(struct sr_serial_dev_inst *serial,
 }
 
 /** Read count bytes from the serial connection. */
-SR_PRIV int zketech_ebd_usb_read_chars(struct sr_serial_dev_inst *serial,
-               int count, uint8_t *buf)
+SR_PRIV int ebd_read_chars(struct sr_serial_dev_inst *serial, int count, uint8_t *buf)
 {
        int ret, received, turns;
 
@@ -172,7 +167,7 @@ SR_PRIV int zketech_ebd_usb_read_chars(struct sr_serial_dev_inst *serial,
        return received;
 }
 
-SR_PRIV int zketech_ebd_usb_receive_data(int fd, int revents, void *cb_data)
+SR_PRIV int ebd_receive_data(int fd, int revents, void *cb_data)
 {
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
@@ -197,7 +192,7 @@ SR_PRIV int zketech_ebd_usb_receive_data(int fd, int revents, void *cb_data)
        serial = sdi->conn;
 
        uint8_t reply[MSG_LEN];
-       int ret = zketech_ebd_usb_read_chars(serial, MSG_LEN, reply);
+       int ret = ebd_read_chars(serial, MSG_LEN, reply);
 
        /* Tests for correct message. */
        if (ret != MSG_LEN) {
@@ -274,8 +269,7 @@ SR_PRIV int zketech_ebd_usb_receive_data(int fd, int revents, void *cb_data)
        return TRUE;
 }
 
-SR_PRIV int zketech_ebd_usb_get_current_limit(const struct sr_dev_inst *sdi,
-               float *current)
+SR_PRIV int ebd_get_current_limit(const struct sr_dev_inst *sdi, float *current)
 {
        struct dev_context *devc;
 
@@ -289,8 +283,7 @@ SR_PRIV int zketech_ebd_usb_get_current_limit(const struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-SR_PRIV int zketech_ebd_usb_set_current_limit(const struct sr_dev_inst *sdi,
-               float current)
+SR_PRIV int ebd_set_current_limit(const struct sr_dev_inst *sdi, float current)
 {
        struct dev_context *devc;
        int ret;
@@ -310,20 +303,20 @@ SR_PRIV int zketech_ebd_usb_set_current_limit(const struct sr_dev_inst *sdi,
        sr_dbg("Setting current limit to %fV.", current);
 
        if (devc->load_activated) {
-               if (zketech_ebd_usb_current_is0(devc)) {
+               if (ebd_current_is0(devc)) {
                        /* Stop load. */
-                       ret = zketech_ebd_usb_loadstop(sdi->conn, devc);
+                       ret = ebd_loadstop(sdi->conn, devc);
                } else {
                        /* Send new current. */
                        ret = send_cfg(sdi->conn, devc);
                }
        } else {
-               if (zketech_ebd_usb_current_is0(devc)) {
+               if (ebd_current_is0(devc)) {
                        /* Nothing to do. */
                        ret = SR_OK;
                } else {
                        /* Start load. */
-                       ret = zketech_ebd_usb_loadstart(sdi->conn, devc);
+                       ret = ebd_loadstart(sdi->conn, devc);
                }
        }
 
@@ -332,7 +325,7 @@ SR_PRIV int zketech_ebd_usb_set_current_limit(const struct sr_dev_inst *sdi,
        return ret;
 }
 
-SR_PRIV gboolean zketech_ebd_usb_current_is0(struct dev_context *devc)
+SR_PRIV gboolean ebd_current_is0(struct dev_context *devc)
 {
        return devc->current_limit < 0.001;
 }

diff --git a/src/hardware/zketech-ebd-usb/protocol.h b/src/hardware/zketech-ebd-usb/protocol.h
index b7646dac2b620e818f03a630a618b2f4a7f24bca..004ce5fb25385bc3f3dcfc7edf9825eb350536d6 100644 (file)
--- a/src/hardware/zketech-ebd-usb/protocol.h
+++ b/src/hardware/zketech-ebd-usb/protocol.h
@@ -43,21 +43,18 @@ struct dev_context {
 };
 
 /* Communication via serial. */
-SR_PRIV int zketech_ebd_usb_read_chars(struct sr_serial_dev_inst *serial,
-               int count, uint8_t *buf);
+SR_PRIV int ebd_read_chars(struct sr_serial_dev_inst *serial, int count, uint8_t *buf);
 
 /* Commands. */
-SR_PRIV int zketech_ebd_usb_init(struct sr_serial_dev_inst *serial, struct dev_context *devc);
-SR_PRIV int zketech_ebd_usb_loadstart(struct sr_serial_dev_inst *serial, struct dev_context *devc);
-SR_PRIV int zketech_ebd_usb_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int zketech_ebd_usb_stop(struct sr_serial_dev_inst *serial, struct dev_context *devc);
-SR_PRIV int zketech_ebd_usb_loadstop(struct sr_serial_dev_inst *serial, struct dev_context *devc);
+SR_PRIV int ebd_init(struct sr_serial_dev_inst *serial, struct dev_context *devc);
+SR_PRIV int ebd_loadstart(struct sr_serial_dev_inst *serial, struct dev_context *devc);
+SR_PRIV int ebd_receive_data(int fd, int revents, void *cb_data);
+SR_PRIV int ebd_stop(struct sr_serial_dev_inst *serial, struct dev_context *devc);
+SR_PRIV int ebd_loadstop(struct sr_serial_dev_inst *serial, struct dev_context *devc);
 
 /* Configuration. */
-SR_PRIV int zketech_ebd_usb_get_current_limit(const struct sr_dev_inst *sdi,
-               float *current);
-SR_PRIV int zketech_ebd_usb_set_current_limit(const struct sr_dev_inst *sdi,
-               float current);
-SR_PRIV gboolean zketech_ebd_usb_current_is0(struct dev_context *devc);
+SR_PRIV int ebd_get_current_limit(const struct sr_dev_inst *sdi, float *current);
+SR_PRIV int ebd_set_current_limit(const struct sr_dev_inst *sdi, float current);
+SR_PRIV gboolean ebd_current_is0(struct dev_context *devc);
 
 #endif