Put driver pointers into special section

[libsigrok.git] / src / hardware / kern-scale / api.c

diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c
index 0443f5e6f01b3c82c1bd0c43db01d3ff00b0b42f..4d1d6bbcbb8f825746709f5b4aacd1707087d4ae 100644 (file)
--- a/src/hardware/kern-scale/api.c
+++ b/src/hardware/kern-scale/api.c
@@ -36,16 +36,6 @@ static const uint32_t devopts[] = {
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
 };
 
-static int dev_clear(const struct sr_dev_driver *di)
-{
-       return std_dev_clear(di, NULL);
-}
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct scale_info *scale;
@@ -110,6 +100,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->vendor = g_strdup(scale->vendor);
        sdi->model = g_strdup(scale->device);
        devc = g_malloc0(sizeof(struct dev_context));
+       sr_sw_limits_init(&devc->limits);
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
        sdi->priv = devc;
@@ -124,16 +115,6 @@ scan_cleanup:
        return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-       return ((struct drv_context *)(di->context))->instances;
-}
-
-static int cleanup(const struct sr_dev_driver *di)
-{
-       return dev_clear(di);
-}
-
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
@@ -144,21 +125,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       if (!(devc = sdi->priv))
-               return SR_ERR_BUG;
+       devc = sdi->priv;
 
-       switch (key) {
-       case SR_CONF_LIMIT_SAMPLES:
-               devc->limit_samples = g_variant_get_uint64(data);
-               break;
-       case SR_CONF_LIMIT_MSEC:
-               devc->limit_msec = g_variant_get_uint64(data);
-               break;
-       default:
-               return SR_ERR_NA;
-       }
-
-       return SR_OK;
+       return sr_sw_limits_config_set(&devc->limits, key, data);
 }
 
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -183,7 +152,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        return SR_OK;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
@@ -191,11 +160,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       if (!(devc = sdi->priv))
-               return SR_ERR_BUG;
-
-       devc->cb_data = cb_data;
-
+       devc = sdi->priv;
        serial = sdi->conn;
 
        sr_spew("Set O1 mode (continuous values, stable and unstable ones).");
@@ -203,11 +168,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                return SR_ERR;
        /* Device replies with "A00\r\n" (OK) or "E01\r\n" (Error). Ignore. */
 
-       devc->num_samples = 0;
-       devc->starttime = g_get_monotonic_time();
-
-       /* Send header packet to the session bus. */
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       sr_sw_limits_acquisition_start(&devc->limits);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
        /* Poll every 50ms, or whenever some data comes in. */
        serial_source_add(sdi->session, serial, G_IO_IN, 50,
@@ -216,24 +178,23 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
+       return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
                        sdi->conn, LOG_PREFIX);
 }
 
 #define SCALE(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, \
                        VALID, PARSE) \
-       &(struct scale_info) { \
+       &((struct scale_info) { \
                { \
                        .name = ID, \
                        .longname = VENDOR " " MODEL, \
                        .api_version = 1, \
-                       .init = init, \
-                       .cleanup = cleanup, \
+                       .init = std_init, \
+                       .cleanup = std_cleanup, \
                        .scan = scan, \
-                       .dev_list = dev_list, \
-                       .dev_clear = dev_clear, \
+                       .dev_list = std_dev_list, \
                        .config_get = NULL, \
                        .config_set = config_set, \
                        .config_list = config_list, \
@@ -245,7 +206,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
                }, \
                VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, \
                VALID, PARSE, sizeof(struct CHIPSET##_info) \
-       }
+       }).di
 
 /*
  * Some scales have (user-configurable) 14-byte or 15-byte packets.
@@ -257,11 +218,10 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
  * the user override them via "serialcomm".
  */
 
-SR_PRIV const struct scale_info *kern_scale_drivers[] = {
+SR_REGISTER_DEV_DRIVER_LIST(kern_scale_drivers,
        SCALE(
                "kern-ew-6200-2nm", kern,
                "KERN", "EW 6200-2NM", "1200/8n2", 1200,
                15 /* (or 14) */, sr_kern_packet_valid, sr_kern_parse
-       ),
-       NULL
-};
+       )
+);