X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkern-scale%2Fapi.c;h=4d1d6bbcbb8f825746709f5b4aacd1707087d4ae;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;hp=6ec40a626642bd0338b9225fd658756a41483b3b;hpb=e32862ebccac5ae063abc68d9ce13a66ad46bb97;p=libsigrok.git

diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c
index 6ec40a62..4d1d6bbc 100644
--- a/src/hardware/kern-scale/api.c
+++ b/src/hardware/kern-scale/api.c
@@ -186,7 +186,7 @@ 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, \
@@ -206,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.
@@ -218,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
-};
+	)
+);