alsa: Always use glib's memory allocation functions.

[libsigrok.git] / hardware / demo / demo.c

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 6bacaf03b85e0c530e300082171b692c8cd53e74..fb6dd7f23df6dae6ead4406b426d617048ee095b 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -64,9 +64,9 @@ static int capabilities[] = {
 };
 
 static struct sr_samplerates samplerates = {
-       1,
-       GHZ(1),
-       1,
+       SR_HZ(1),
+       SR_GHZ(1),
+       SR_HZ(1),
        NULL,
 };
 
@@ -89,7 +89,7 @@ static uint8_t genmode_default[] = {
 
 /* List of struct sr_device_instance, maintained by opendev()/closedev(). */
 static GSList *device_instances = NULL;
-static uint64_t cur_samplerate = KHZ(200);
+static uint64_t cur_samplerate = SR_KHZ(200);
 static uint64_t limit_samples = 0;
 static uint64_t limit_msec = 0;
 static int default_genmode = GENMODE_DEFAULT;
@@ -98,7 +98,7 @@ static int thread_running;
 
 static void hw_stop_acquisition(int device_index, gpointer session_device_id);
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
        struct sr_device_instance *sdi;