X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=fb6dd7f23df6dae6ead4406b426d617048ee095b;hb=92b3101cfc71581a273e667f185b18be0f0c364f;hp=281d9da4521f50f9c1ed114486703ac58281de0b;hpb=4bfbf9fce71f91b3e7b7e968d436f7c436fc9648;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 281d9da4..fb6dd7f2 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -41,6 +41,7 @@ enum {
 	GENMODE_INC,
 };
 
+/* FIXME: Should not be global. */
 GIOChannel *channels[2];
 
 struct databag {
@@ -63,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,
 };
 
@@ -88,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;
@@ -97,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;
 
@@ -362,8 +363,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	g_io_channel_set_buffered(channels[0], FALSE);
 	g_io_channel_set_buffered(channels[1], FALSE);
 
-	source_add(mydata->pipe_fds[0], G_IO_IN | G_IO_ERR, 40, receive_data,
-		   session_device_id);
+	sr_source_add(mydata->pipe_fds[0], G_IO_IN | G_IO_ERR, 40,
+		      receive_data, session_device_id);
 
 	/* Run the demo thread. */
 	g_thread_init(NULL);