X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=e117e6a59afa29cf065e6f0afcd4e0975eb68c89;hb=6ea7e23526b6be4d6c762b1136e361e4d3caccf6;hp=5227b800fdbf000238d5457b03fb319bd8cd3573;hpb=d35aaf0256aa646af0f23035932271579ca65a3d;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index 5227b800..e117e6a5 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -19,10 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#define DEMO_ANALOG + #include #include #include #include +#include #ifdef _WIN32 #include #include @@ -30,15 +33,24 @@ #endif #include "config.h" +#ifdef DEMO_ANALOG +#define NUM_PROBES 9 +#else #define NUM_PROBES 8 +#endif #define DEMONAME "Demo device" /* size of chunks to send through the session bus */ +#ifdef DEMO_ANALOG +#define BUFSIZE 32768 +#else #define BUFSIZE 4096 +#endif enum { GENMODE_DEFAULT, GENMODE_RANDOM, GENMODE_INC, + GENMODE_SINE, }; GIOChannel *channels[2]; @@ -49,26 +61,26 @@ struct databag { uint8_t thread_running; uint64_t samples_counter; int device_index; - int loop_sleep; gpointer session_device_id; + GTimer *timer; }; -static GThread *my_thread; -static int thread_running; - static int capabilities[] = { HWCAP_LOGIC_ANALYZER, HWCAP_PATTERN_MODE, HWCAP_LIMIT_SAMPLES, + HWCAP_LIMIT_MSEC, HWCAP_CONTINUOUS }; static const char *patternmodes[] = { "random", "incremental", + "sine", NULL, }; +#ifndef DEMO_ANALOG static uint8_t genmode_default[] = { 0x4c, 0x92, 0x92, 0x92, 0x64, 0x00, 0x00, 0x00, 0x82, 0xfe, 0xfe, 0x82, 0x00, 0x00, 0x00, 0x00, @@ -79,12 +91,16 @@ static uint8_t genmode_default[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbe, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +#endif /* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */ static GSList *device_instances = NULL; -static uint64_t cur_samplerate = 0; -static uint64_t limit_samples = -1; +static uint64_t cur_samplerate = KHZ(200); +static uint64_t limit_samples = 0; +static uint64_t limit_msec = 0; static int default_genmode = GENMODE_DEFAULT; +static GThread *my_thread; +static int thread_running; static void hw_stop_acquisition(int device_index, gpointer session_device_id); @@ -181,6 +197,10 @@ static int hw_set_configuration(int device_index, int capability, void *value) tmp_u64 = value; limit_samples = *tmp_u64; ret = SIGROK_OK; + } else if (capability == HWCAP_LIMIT_MSEC) { + tmp_u64 = value; + limit_msec = *tmp_u64; + ret = SIGROK_OK; } else if (capability == HWCAP_PATTERN_MODE) { stropt = value; if (!strcmp(stropt, "random")) { @@ -189,6 +209,9 @@ static int hw_set_configuration(int device_index, int capability, void *value) } else if (!strcmp(stropt, "incremental")) { default_genmode = GENMODE_INC; ret = SIGROK_OK; + } else if (!strcmp(stropt, "sine")) { + default_genmode = GENMODE_SINE; + ret = SIGROK_OK; } else { ret = SIGROK_ERR; } @@ -203,6 +226,42 @@ static void samples_generator(uint8_t *buf, uint64_t size, void *data) { struct databag *mydata = data; uint64_t p, i; +#ifdef DEMO_ANALOG + /* + * We will simulate a device with 8 logic probes and 1 analog probe. + * This fictional device sends the data packed: 8 bits for 8 logic + * probes and 16 bits for the analog probe, in this order. + * Total of 24 bits. + * I could just generate a properly formatted DF_ANALOG packet here, + * but I will leave the formatting to receive_data() to make its code + * more like a real hardware driver. + */ + memset(buf, 0, size * 3); + + switch (mydata->sample_generator) { + default: + case GENMODE_DEFAULT: + case GENMODE_SINE: + for (i = 0; i < size * 3; i += 3) { + *(buf + i) = i / 3; + *(uint16_t *) (buf + i + 1) = + (uint16_t) (sin(i / 3) * 256 * 30); + } + break; + case GENMODE_RANDOM: + for (i = 0; i < size * 3; i += 3) { + *(buf + i) = (uint8_t)(rand() & 0xff); + *(uint16_t *) (buf + i + 1) = (uint16_t)(rand() & 0xffff); + } + break; + case GENMODE_INC: + for (i = 0; i < size * 3; i += 3) { + *(buf + i) = i / 3; + *(uint16_t *)(buf + i + 1) = i / 3 * 256 * 10; + } + break; + } +#else memset(buf, 0, size); @@ -224,6 +283,7 @@ static void samples_generator(uint8_t *buf, uint64_t size, void *data) *(buf + i) = i; break; } +#endif } /* Thread function */ @@ -234,28 +294,51 @@ static void thread_func(void *data) uint64_t nb_to_send = 0; int bytes_written; + double time_cur, time_last, time_diff; + + time_last = g_timer_elapsed(mydata->timer, NULL); + while (thread_running) { + /* Rate control */ + time_cur = g_timer_elapsed(mydata->timer, NULL); + + time_diff = time_cur - time_last; + time_last = time_cur; + + nb_to_send = cur_samplerate * time_diff; + if (limit_samples) - nb_to_send = limit_samples - mydata->samples_counter; - else - nb_to_send = BUFSIZE; /* Continuous mode */ + nb_to_send = MIN(nb_to_send, + limit_samples - mydata->samples_counter); + + /* Make sure we don't overflow. */ +#ifdef DEMO_ANALOG + nb_to_send = MIN(nb_to_send, BUFSIZE / 3); +#else + nb_to_send = MIN(nb_to_send, BUFSIZE); +#endif + + if (nb_to_send) { + samples_generator(buf, nb_to_send, data); + mydata->samples_counter += nb_to_send; +#ifdef DEMO_ANALOG + g_io_channel_write_chars(channels[1], (gchar *) &buf, + nb_to_send * 3, (gsize *) &bytes_written, NULL); +#else + g_io_channel_write_chars(channels[1], (gchar *) &buf, + nb_to_send, (gsize *) &bytes_written, NULL); +#endif + } - if (nb_to_send == 0) { + /* Check if we're done. */ + if ((limit_msec && time_cur * 1000 > limit_msec) || + (limit_samples && mydata->samples_counter >= limit_samples)) + { close(mydata->pipe_fds[1]); thread_running = 0; - hw_stop_acquisition(mydata->device_index, - mydata->session_device_id); - } else if (nb_to_send > BUFSIZE) { - nb_to_send = BUFSIZE; } - samples_generator(buf, nb_to_send, data); - mydata->samples_counter += nb_to_send; - - g_io_channel_write_chars(channels[1], (gchar *)&buf, - nb_to_send, &bytes_written, NULL); - - g_usleep(mydata->loop_sleep); + g_usleep(10); } } @@ -265,19 +348,80 @@ static int receive_data(int fd, int revents, void *user_data) struct datafeed_packet packet; char c[BUFSIZE]; uint64_t z; +#ifdef DEMO_ANALOG + struct analog_sample *sample; + unsigned int i, x; + int sample_size = sizeof(struct analog_sample) + + (NUM_PROBES * sizeof(struct analog_probe)); + char *buf; +#endif /* Avoid compiler warnings. */ + fd = fd; revents = revents; - g_io_channel_read_chars(channels[0], (gchar *)&c, BUFSIZE, &z, NULL); + do { + g_io_channel_read_chars(channels[0], + (gchar *) &c, BUFSIZE, (gsize *) &z, NULL); + + if (z > 0) { +#ifdef DEMO_ANALOG + packet.type = DF_ANALOG; + + packet.length = (z / 3) * sample_size; + packet.unitsize = sample_size; + + buf = malloc(sample_size * packet.length); + if (!buf) + return FALSE; + + /* Craft our packet. */ + for (i = 0; i < z / 3; i++) { + sample = (struct analog_sample *) (buf + (i * sample_size)); + sample->num_probes = NUM_PROBES; + + /* 8 Logic probes */ + for (x = 0; x < NUM_PROBES - 1; x++) { + sample->probes[x].val = + (c[i * 3] >> x) & 1; + sample->probes[x].res = 1; + } + + /* 1 Analog probe, 16 bit adc */ + for (; x < NUM_PROBES; x++) { + sample->probes[x].val = + *(uint16_t *) (c + i * 3 + 1); + sample->probes[x].val &= ((1 << 16) - 1); + sample->probes[x].res = 16; + } + + } + + packet.payload = buf; + session_bus(user_data, &packet); + free(buf); +#else + packet.type = DF_LOGIC; + packet.length = z; + packet.unitsize = 1; + packet.payload = c; + session_bus(user_data, &packet); +#endif + } + } while (z > 0); + + if (!thread_running && z <= 0) + { + /* Make sure we don't receive more packets */ + g_io_channel_close(channels[0]); - if (z > 0) { - packet.type = DF_LOGIC; - packet.length = z; - packet.unitsize = 1; - packet.payload = c; + /* Send last packet. */ + packet.type = DF_END; session_bus(user_data, &packet); + + return FALSE; } + return TRUE; } @@ -295,7 +439,6 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) mydata->session_device_id = session_device_id; mydata->device_index = device_index; mydata->samples_counter = 0; - mydata->loop_sleep = 100000; if (pipe(mydata->pipe_fds)) return SIGROK_ERR; @@ -316,6 +459,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) /* Run the demo thread. */ g_thread_init(NULL); + mydata->timer = g_timer_new(); thread_running = 1; my_thread = g_thread_create((GThreadFunc)thread_func, mydata, TRUE, NULL); @@ -330,6 +474,10 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) packet->type = DF_HEADER; packet->length = sizeof(struct datafeed_header); packet->payload = (unsigned char *)header; +#ifdef DEMO_ANALOG + packet->unitsize = sizeof(struct analog_sample) + + (NUM_PROBES * sizeof(struct analog_probe)); +#endif header->feed_version = 1; gettimeofday(&header->starttime, NULL); header->samplerate = cur_samplerate; @@ -345,14 +493,12 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) static void hw_stop_acquisition(int device_index, gpointer session_device_id) { - struct datafeed_packet packet; - /* Avoid compiler warnings. */ device_index = device_index; + session_device_id = session_device_id; - /* Send last packet. */ - packet.type = DF_END; - session_bus(session_device_id, &packet); + /* Stop generate thread. */ + thread_running = 0; } struct device_plugin demo_plugin_info = {