Prefixes for *_device_instance.

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

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 1b16ee6a050db8bf62605c2758f5d6c6dcb378c8..06722c4fc80b20e31a310b0be4a1041e53f480f0 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -78,7 +78,7 @@ static uint8_t genmode_default[] = {
        0xbe, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */
+/* 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 limit_samples = 0;
@@ -91,12 +91,12 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id);
 
 static int hw_init(char *deviceinfo)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
 
        /* Avoid compiler warnings. */
        deviceinfo = deviceinfo;
 
-       sdi = sigrok_device_instance_new(0, ST_ACTIVE, DEMONAME, NULL, NULL);
+       sdi = sr_device_instance_new(0, ST_ACTIVE, DEMONAME, NULL, NULL);
        if (!sdi)
                return 0;
 
@@ -111,7 +111,7 @@ static int hw_opendev(int device_index)
        device_index = device_index;
 
        /* Nothing needed so far. */
-       return SIGROK_OK;
+       return SR_OK;
 }
 
 static void hw_closedev(int device_index)
@@ -129,10 +129,10 @@ static void hw_cleanup(void)
 
 static void *hw_get_device_info(int device_index, int device_info_id)
 {
-       struct sigrok_device_instance *sdi;
+       struct sr_device_instance *sdi;
        void *info = NULL;
 
-       if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+       if (!(sdi = sr_get_device_instance(device_instances, device_index)))
                return NULL;
 
        switch (device_info_id) {
@@ -177,28 +177,28 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 
        if (capability == HWCAP_PROBECONFIG) {
                /* Nothing to do. */
-               ret = SIGROK_OK;
+               ret = SR_OK;
        } else if (capability == HWCAP_LIMIT_SAMPLES) {
                tmp_u64 = value;
                limit_samples = *tmp_u64;
-               ret = SIGROK_OK;
+               ret = SR_OK;
        } else if (capability == HWCAP_LIMIT_MSEC) {
                tmp_u64 = value;
                limit_msec = *tmp_u64;
-               ret = SIGROK_OK;
+               ret = SR_OK;
        } else if (capability == HWCAP_PATTERN_MODE) {
                stropt = value;
                if (!strcmp(stropt, "random")) {
                        default_genmode = GENMODE_RANDOM;
-                       ret = SIGROK_OK;
+                       ret = SR_OK;
                } else if (!strcmp(stropt, "incremental")) {
                        default_genmode = GENMODE_INC;
-                       ret = SIGROK_OK;
+                       ret = SR_OK;
                } else {
-                       ret = SIGROK_ERR;
+                       ret = SR_ERR;
                }
        } else {
-               ret = SIGROK_ERR;
+               ret = SR_ERR;
        }
 
        return ret;
@@ -282,13 +282,13 @@ static void thread_func(void *data)
 /* Callback handling data */
 static int receive_data(int fd, int revents, void *user_data)
 {
-struct datafeed_packet packet;
-char c[BUFSIZE];
-uint64_t z;
+       struct sr_datafeed_packet packet;
+       char c[BUFSIZE];
+       gsize z;
 
-/* Avoid compiler warnings. */
-fd = fd;
-revents = revents;
+       /* Avoid compiler warnings. */
+       fd = fd;
+       revents = revents;
 
        do {
                g_io_channel_read_chars(channels[0],
@@ -320,13 +320,13 @@ revents = revents;
 
 static int hw_start_acquisition(int device_index, gpointer session_device_id)
 {
-       struct datafeed_packet *packet;
-       struct datafeed_header *header;
+       struct sr_datafeed_packet *packet;
+       struct sr_datafeed_header *header;
        struct databag *mydata;
 
        mydata = malloc(sizeof(struct databag));
        if (!mydata)
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
 
        mydata->sample_generator = default_genmode;
        mydata->session_device_id = session_device_id;
@@ -334,7 +334,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        mydata->samples_counter = 0;
 
        if (pipe(mydata->pipe_fds))
-               return SIGROK_ERR;
+               return SR_ERR;
 
        channels[0] = g_io_channel_unix_new(mydata->pipe_fds[0]);
        channels[1] = g_io_channel_unix_new(mydata->pipe_fds[1]);
@@ -357,15 +357,15 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        my_thread =
            g_thread_create((GThreadFunc)thread_func, mydata, TRUE, NULL);
        if (!my_thread)
-               return SIGROK_ERR;
+               return SR_ERR;
 
-       packet = malloc(sizeof(struct datafeed_packet));
-       header = malloc(sizeof(struct datafeed_header));
+       packet = malloc(sizeof(struct sr_datafeed_packet));
+       header = malloc(sizeof(struct sr_datafeed_header));
        if (!packet || !header)
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
 
        packet->type = DF_HEADER;
-       packet->length = sizeof(struct datafeed_header);
+       packet->length = sizeof(struct sr_datafeed_header);
        packet->payload = (unsigned char *)header;
        header->feed_version = 1;
        gettimeofday(&header->starttime, NULL);
@@ -377,7 +377,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        free(header);
        free(packet);
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
 static void hw_stop_acquisition(int device_index, gpointer session_device_id)
@@ -390,8 +390,9 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
        thread_running = 0;
 }
 
-struct device_plugin demo_plugin_info = {
+struct sr_device_plugin demo_plugin_info = {
        "demo",
+       "Demo driver and pattern generator",
        1,
        hw_init,
        hw_cleanup,