X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fsaleae-logic-pro%2Fprotocol.c;h=94cab7fbeea63405c7faf6785a7ed0cf5281a3bc;hb=6c1a4cb44ccd24b2b23477c86273a8e405758c03;hp=1d7eba408bb38ddddd36058d9f49fd2fcc4cb32f;hpb=da39089014f845085efdb10acca83f0742b7e9fd;p=libsigrok.git

diff --git a/src/hardware/saleae-logic-pro/protocol.c b/src/hardware/saleae-logic-pro/protocol.c
index 1d7eba40..94cab7fb 100644
--- a/src/hardware/saleae-logic-pro/protocol.c
+++ b/src/hardware/saleae-logic-pro/protocol.c
@@ -217,7 +217,7 @@ static int write_adc(const struct sr_dev_inst *sdi,
 		{REG_ADC_VAL_MSB, value >> 8},
 	};
 
-	return write_regs(sdi, regs, G_N_ELEMENTS(regs));
+	return write_regs(sdi, ARRAY_AND_SIZE(regs));
 }
 
 static int read_eeprom(const struct sr_dev_inst *sdi,
@@ -564,7 +564,7 @@ static int set_led(const struct sr_dev_inst *sdi, uint8_t r, uint8_t g, uint8_t
 
 	authenticate(sdi);
 
-	return write_regs(sdi, regs, G_N_ELEMENTS(regs));
+	return write_regs(sdi, ARRAY_AND_SIZE(regs));
 }
 #endif
 
@@ -788,8 +788,8 @@ SR_PRIV int saleae_logic_pro_prepare(const struct sr_dev_inst *sdi)
 	authenticate(sdi);
 
 	write_reg(sdi, 0x15, 0x03);
-	write_regs(sdi, regs_unknown, G_N_ELEMENTS(regs_unknown));
-	write_regs(sdi, regs_config, G_N_ELEMENTS(regs_config));
+	write_regs(sdi, ARRAY_AND_SIZE(regs_unknown));
+	write_regs(sdi, ARRAY_AND_SIZE(regs_config));
 
 	transact(sdi, start_req, sizeof(start_req), start_rsp, sizeof(start_rsp));