Add sr_ prefix to session_{add,remove}.

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

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 5ab3969ef8e529092331c7226aa3b688396329b9..6bacaf03b85e0c530e300082171b692c8cd53e74 100644 (file)
--- 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 {
@@ -54,11 +55,19 @@ struct databag {
 };
 
 static int capabilities[] = {
-       HWCAP_LOGIC_ANALYZER,
-       HWCAP_PATTERN_MODE,
-       HWCAP_LIMIT_SAMPLES,
-       HWCAP_LIMIT_MSEC,
-       HWCAP_CONTINUOUS
+       SR_HWCAP_LOGIC_ANALYZER,
+       SR_HWCAP_SAMPLERATE,
+       SR_HWCAP_PATTERN_MODE,
+       SR_HWCAP_LIMIT_SAMPLES,
+       SR_HWCAP_LIMIT_MSEC,
+       SR_HWCAP_CONTINUOUS,
+};
+
+static struct sr_samplerates samplerates = {
+       1,
+       GHZ(1),
+       1,
+       NULL,
 };
 
 static const char *patternmodes[] = {
@@ -96,7 +105,7 @@ static int hw_init(char *deviceinfo)
        /* Avoid compiler warnings. */
        deviceinfo = deviceinfo;
 
-       sdi = sr_device_instance_new(0, ST_ACTIVE, DEMONAME, NULL, NULL);
+       sdi = sr_device_instance_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
        if (!sdi)
                return 0;
 
@@ -132,20 +141,23 @@ static void *hw_get_device_info(int device_index, int device_info_id)
        struct sr_device_instance *sdi;
        void *info = NULL;
 
-       if (!(sdi = get_sr_device_instance(device_instances, device_index)))
+       if (!(sdi = sr_get_device_instance(device_instances, device_index)))
                return NULL;
 
        switch (device_info_id) {
-       case DI_INSTANCE:
+       case SR_DI_INSTANCE:
                info = sdi;
                break;
-       case DI_NUM_PROBES:
+       case SR_DI_NUM_PROBES:
                info = GINT_TO_POINTER(NUM_PROBES);
                break;
-       case DI_CUR_SAMPLERATE:
+       case SR_DI_SAMPLERATES:
+               info = &samplerates;
+               break;
+       case SR_DI_CUR_SAMPLERATE:
                info = &cur_samplerate;
                break;
-       case DI_PATTERNMODES:
+       case SR_DI_PATTERNMODES:
                info = &patternmodes;
                break;
        }
@@ -158,7 +170,7 @@ static int hw_get_status(int device_index)
        /* Avoid compiler warnings. */
        device_index = device_index;
 
-       return ST_ACTIVE;
+       return SR_ST_ACTIVE;
 }
 
 static int *hw_get_capabilities(void)
@@ -175,18 +187,22 @@ static int hw_set_configuration(int device_index, int capability, void *value)
        /* Avoid compiler warnings. */
        device_index = device_index;
 
-       if (capability == HWCAP_PROBECONFIG) {
-               /* Nothing to do. */
+       if (capability == SR_HWCAP_PROBECONFIG) {
+               /* Nothing to do, but must be supported */
+               ret = SR_OK;
+       } else if (capability == SR_HWCAP_SAMPLERATE) {
+               tmp_u64 = value;
+               cur_samplerate = *tmp_u64;
                ret = SR_OK;
-       } else if (capability == HWCAP_LIMIT_SAMPLES) {
+       } else if (capability == SR_HWCAP_LIMIT_SAMPLES) {
                tmp_u64 = value;
                limit_samples = *tmp_u64;
                ret = SR_OK;
-       } else if (capability == HWCAP_LIMIT_MSEC) {
+       } else if (capability == SR_HWCAP_LIMIT_MSEC) {
                tmp_u64 = value;
                limit_msec = *tmp_u64;
                ret = SR_OK;
-       } else if (capability == HWCAP_PATTERN_MODE) {
+       } else if (capability == SR_HWCAP_PATTERN_MODE) {
                stropt = value;
                if (!strcmp(stropt, "random")) {
                        default_genmode = GENMODE_RANDOM;
@@ -206,14 +222,14 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 
 static void samples_generator(uint8_t *buf, uint64_t size, void *data)
 {
+       static uint64_t p = 0;
        struct databag *mydata = data;
-       uint64_t p, i;
+       uint64_t i;
 
        memset(buf, 0, size);
 
        switch (mydata->sample_generator) {
        case GENMODE_DEFAULT:
-               p = 0;
                for (i = 0; i < size; i++) {
                        *(buf + i) = ~(genmode_default[p] >> 1);
                        if (++p == 64)
@@ -282,7 +298,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;
 
@@ -295,11 +311,11 @@ static int receive_data(int fd, int revents, void *user_data)
                                        (gchar *)&c, BUFSIZE, &z, NULL);
 
                if (z > 0) {
-                       packet.type = DF_LOGIC;
+                       packet.type = SR_DF_LOGIC;
                        packet.length = z;
                        packet.unitsize = 1;
                        packet.payload = c;
-                       session_bus(user_data, &packet);
+                       sr_session_bus(user_data, &packet);
                }
        } while (z > 0);
 
@@ -309,8 +325,8 @@ static int receive_data(int fd, int revents, void *user_data)
                g_io_channel_close(channels[0]);
 
                /* Send last packet. */
-               packet.type = DF_END;
-               session_bus(user_data, &packet);
+               packet.type = SR_DF_END;
+               sr_session_bus(user_data, &packet);
 
                return FALSE;
        }
@@ -320,8 +336,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));
@@ -347,11 +363,12 @@ 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);
+       /* this needs to be done between g_thread_init() and g_thread_create() */
        mydata->timer = g_timer_new();
        thread_running = 1;
        my_thread =
@@ -359,21 +376,21 @@ 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->type = SR_DF_HEADER;
+       packet->length = sizeof(struct sr_datafeed_header);
        packet->payload = (unsigned char *)header;
        header->feed_version = 1;
        gettimeofday(&header->starttime, NULL);
        header->samplerate = cur_samplerate;
-       header->protocol_id = PROTO_RAW;
+       header->protocol_id = SR_PROTO_RAW;
        header->num_logic_probes = NUM_PROBES;
        header->num_analog_probes = 0;
-       session_bus(session_device_id, packet);
+       sr_session_bus(session_device_id, packet);
        free(header);
        free(packet);
 
@@ -390,8 +407,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,