X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=e4356d9e4d72159da4f94829423079d48238a2ba;hb=82957b65b111437ebe445b7f165719eec2d4e147;hp=81ef3e8c7a96188d3457e308e7afa60e22dcd2df;hpb=6f1be0a2d40b3998abd8d10b5479e4538bc4ff1e;p=libsigrok.git

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index 81ef3e8c..e4356d9e 100644
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -73,23 +73,23 @@ static GTimeVal firmware_updated = { 0, 0 };
 static libusb_context *usb_context = NULL;
 
 static uint64_t supported_samplerates[] = {
-	KHZ(200),
-	KHZ(250),
-	KHZ(500),
-	MHZ(1),
-	MHZ(2),
-	MHZ(4),
-	MHZ(8),
-	MHZ(12),
-	MHZ(16),
-	MHZ(24),
+	SR_KHZ(200),
+	SR_KHZ(250),
+	SR_KHZ(500),
+	SR_MHZ(1),
+	SR_MHZ(2),
+	SR_MHZ(4),
+	SR_MHZ(8),
+	SR_MHZ(12),
+	SR_MHZ(16),
+	SR_MHZ(24),
 	0,
 };
 
 static struct sr_samplerates samplerates = {
-	KHZ(200),
-	MHZ(24),
-	0,
+	SR_KHZ(200),
+	SR_MHZ(24),
+	SR_HZ(0),
 	supported_samplerates,
 };
 
@@ -291,7 +291,7 @@ static int configure_probes(GSList *probes)
  * API callbacks
  */
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
 	struct sr_device_instance *sdi;
 	struct libusb_device_descriptor des;