Prefixes for *_device_instance.

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

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index ac7dea9a8977d79092a10b8a6c5bf9da00032ea2..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;
 
@@ -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) {
@@ -282,7 +282,7 @@ static void thread_func(void *data)
 /* Callback handling data */
 static int receive_data(int fd, int revents, void *user_data)
 {
-       struct datafeed_packet packet;
+       struct sr_datafeed_packet packet;
        char c[BUFSIZE];
        gsize z;
 
@@ -320,8 +320,8 @@ static int receive_data(int fd, int revents, void *user_data)
 
 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));
@@ -359,13 +359,13 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        if (!my_thread)
                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 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);
@@ -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,