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 ef954306ee741153108b7b9e33b41fa753646b6c..4d1d6bbcbb8f825746709f5b4aacd1707087d4ae 100644 (file)
--- a/src/hardware/kern-scale/api.c
+++ b/src/hardware/kern-scale/api.c
@@ -36,11 +36,6 @@ static const uint32_t devopts[] = {
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
 };
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(di, sr_ctx, LOG_PREFIX);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct scale_info *scale;
@@ -130,8 +125,7 @@ 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;
 
        return sr_sw_limits_config_set(&devc->limits, key, data);
 }
@@ -192,12 +186,12 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 #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, \
+                       .init = std_init, \
                        .cleanup = std_cleanup, \
                        .scan = scan, \
                        .dev_list = std_dev_list, \
@@ -212,7 +206,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
                }, \
                VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, \
                VALID, PARSE, sizeof(struct CHIPSET##_info) \
-       }
+       }).di
 
 /*
  * Some scales have (user-configurable) 14-byte or 15-byte packets.
@@ -224,11 +218,10 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
  * 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
-};
+       )
+);