X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=e117e6a59afa29cf065e6f0afcd4e0975eb68c89;hb=cdbc51d97d027c3889aad43c9d9ed3344cfb5a91;hp=d1f678ae71a61dc38e91efecfae9119ec7826442;hpb=85b5af068776cca18c704a101d6d56be1ec236b6;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index d1f678ae..e117e6a5 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -2,6 +2,7 @@ * This file is part of the sigrok project. * * Copyright (C) 2010 Uwe Hermann + * Copyright (C) 2011 Olivier Fauchon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,54 +19,41 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#define DEMO_ANALOG + #include #include #include #include +#include +#ifdef _WIN32 +#include +#include +#define pipe(fds) _pipe(fds, 4096, _O_BINARY) +#endif #include "config.h" -#define BUFSIZE 4096 - -#define NUM_PROBES 8 -#define NUM_TRIGGER_STAGES 4 -#define TRIGGER_TYPES "01" - -/* Software trigger implementation: positive values indicate trigger stage. */ -#define TRIGGER_FIRED -1 - -#define USB_MODEL_NAME "Demo Driver" -#define USB_VENDOR_NAME "Sigrok project" -#define USB_MODEL_VERSION "v1.0" - -#define GENMODE_RANDOM 1 -#define GENMODE_INC 2 - -static GThread *my_thread; -static int thread_running; - -static int capabilities[] = { - HWCAP_LOGIC_ANALYZER, - HWCAP_SAMPLERATE, - HWCAP_LIMIT_SAMPLES, -}; - -/* Random selection of samplerates this "device" shall support. */ -static uint64_t supported_samplerates[] = { - KHZ(100), - KHZ(500), - MHZ(1), - MHZ(2), - MHZ(12), - MHZ(24), - 0, +#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, }; -static struct samplerates samplerates = { - KHZ(100), - MHZ(24), - 0, - supported_samplerates, -}; +GIOChannel *channels[2]; struct databag { int pipe_fds[2]; @@ -73,38 +61,60 @@ struct databag { uint8_t thread_running; uint64_t samples_counter; int device_index; - int loop_sleep; gpointer session_device_id; + GTimer *timer; +}; + +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, + 0x7c, 0x82, 0x82, 0x92, 0x74, 0x00, 0x00, 0x00, + 0xfe, 0x12, 0x12, 0x32, 0xcc, 0x00, 0x00, 0x00, + 0x7c, 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, + 0xfe, 0x10, 0x28, 0x44, 0x82, 0x00, 0x00, 0x00, + 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; - -/* TODO: All of these should go in a device-specific struct. */ -static uint64_t cur_samplerate = 0; +static uint64_t cur_samplerate = KHZ(200); static uint64_t limit_samples = 0; -// static uint8_t probe_mask = 0; -// static uint8_t trigger_mask[NUM_TRIGGER_STAGES] = { 0 }; -// static uint8_t trigger_value[NUM_TRIGGER_STAGES] = { 0 }; -// static uint8_t trigger_buffer[NUM_TRIGGER_STAGES] = { 0 }; - -// static int trigger_stage = TRIGGER_FIRED; +static uint64_t limit_msec = 0; +static int default_genmode = GENMODE_DEFAULT; +static GThread *my_thread; +static int thread_running; -static int hw_set_configuration(int device_index, int capability, void *value); static void hw_stop_acquisition(int device_index, gpointer session_device_id); static int hw_init(char *deviceinfo) { - /* Avoid compiler warning. */ - deviceinfo = deviceinfo; - struct sigrok_device_instance *sdi; - sdi = sigrok_device_instance_new(0, ST_ACTIVE, - USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION); + /* Avoid compiler warnings. */ + deviceinfo = deviceinfo; + sdi = sigrok_device_instance_new(0, ST_ACTIVE, DEMONAME, NULL, NULL); if (!sdi) return 0; + device_instances = g_slist_append(device_instances, sdi); return 1; @@ -112,7 +122,7 @@ static int hw_init(char *deviceinfo) static int hw_opendev(int device_index) { - /* Avoid compiler warning. */ + /* Avoid compiler warnings. */ device_index = device_index; /* Nothing needed so far. */ @@ -121,7 +131,7 @@ static int hw_opendev(int device_index) static void hw_closedev(int device_index) { - /* Avoid compiler warning. */ + /* Avoid compiler warnings. */ device_index = device_index; /* Nothing needed so far. */ @@ -134,9 +144,6 @@ static void hw_cleanup(void) static void *hw_get_device_info(int device_index, int device_info_id) { - /* Avoid compiler warning. */ - device_index = device_index; - struct sigrok_device_instance *sdi; void *info = NULL; @@ -150,15 +157,12 @@ static void *hw_get_device_info(int device_index, int device_info_id) case DI_NUM_PROBES: info = GINT_TO_POINTER(NUM_PROBES); break; - case DI_SAMPLERATES: - info = &samplerates; - break; - case DI_TRIGGER_TYPES: - info = TRIGGER_TYPES; - break; case DI_CUR_SAMPLERATE: info = &cur_samplerate; break; + case DI_PATTERNMODES: + info = &patternmodes; + break; } return info; @@ -166,9 +170,10 @@ static void *hw_get_device_info(int device_index, int device_info_id) static int hw_get_status(int device_index) { - /* Avoid compiler warning. */ + /* Avoid compiler warnings. */ device_index = device_index; - return 0; /* FIXME */ + + return ST_ACTIVE; } static int *hw_get_capabilities(void) @@ -180,20 +185,36 @@ static int hw_set_configuration(int device_index, int capability, void *value) { int ret; uint64_t *tmp_u64; + char *stropt; - /* Avoid compiler warning. */ + /* Avoid compiler warnings. */ device_index = device_index; - if (capability == HWCAP_SAMPLERATE) { - cur_samplerate = *(uint64_t *) value; - ret = SIGROK_OK; - } else if (capability == HWCAP_PROBECONFIG) { - // ret = configure_probes((GSList *) value); FIXME + if (capability == HWCAP_PROBECONFIG) { + /* Nothing to do. */ ret = SIGROK_OK; } else if (capability == HWCAP_LIMIT_SAMPLES) { 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")) { + default_genmode = GENMODE_RANDOM; + ret = SIGROK_OK; + } 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; + } } else { ret = SIGROK_ERR; } @@ -201,26 +222,68 @@ static int hw_set_configuration(int device_index, int capability, void *value) return ret; } -static void samples_generator(uint8_t *buf, uint64_t sz, void *data) +static void samples_generator(uint8_t *buf, uint64_t size, void *data) { struct databag *mydata = data; - uint64_t i; - uint8_t val; + 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, sz); + memset(buf, 0, size); switch (mydata->sample_generator) { - case GENMODE_RANDOM: /* Random */ - for (i = 0; i < sz; i++) { - val = rand() & 0xff; - *(buf + i) = val; + case GENMODE_DEFAULT: + p = 0; + for (i = 0; i < size; i++) { + *(buf + i) = ~(genmode_default[p] >> 1); + if (++p == 64) + p = 0; } break; + case GENMODE_RANDOM: /* Random */ + for (i = 0; i < size; i++) + *(buf + i) = (uint8_t)(rand() & 0xff); + break; case GENMODE_INC: /* Simple increment */ - for (i = 0; i < sz; i++) + for (i = 0; i < size; i++) *(buf + i) = i; break; } +#endif } /* Thread function */ @@ -229,24 +292,53 @@ static void thread_func(void *data) struct databag *mydata = data; uint8_t buf[BUFSIZE]; 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) { - nb_to_send = limit_samples - mydata->samples_counter; + /* 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 = 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; - - write(mydata->pipe_fds[1], &buf, nb_to_send); - g_usleep(mydata->loop_sleep); + g_usleep(10); } } @@ -254,20 +346,82 @@ static void thread_func(void *data) static int receive_data(int fd, int revents, void *user_data) { struct datafeed_packet packet; - /* uint16_t samples[1000]; */ 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; - z = read(fd, &c, BUFSIZE); - if (z > 0) { - packet.type = DF_LOGIC8; - packet.length = z; - packet.payload = c; + 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]); + + /* Send last packet. */ + packet.type = DF_END; session_bus(user_data, &packet); + + return FALSE; } + return TRUE; } @@ -275,53 +429,61 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) { struct datafeed_packet *packet; struct datafeed_header *header; - unsigned char *buf; struct databag *mydata; mydata = malloc(sizeof(struct databag)); - /* TODO: Error handling. */ + if (!mydata) + return SIGROK_ERR_MALLOC; - mydata->sample_generator = GENMODE_RANDOM; + mydata->sample_generator = default_genmode; 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)) { - fprintf(stderr, "Pipe failed.\n"); - return SIGROK_ERR_MALLOC; /* FIXME */ + if (pipe(mydata->pipe_fds)) + return SIGROK_ERR; + + channels[0] = g_io_channel_unix_new(mydata->pipe_fds[0]); + channels[1] = g_io_channel_unix_new(mydata->pipe_fds[1]); + + /* Set channel encoding to binary (default is UTF-8). */ + g_io_channel_set_encoding(channels[0], NULL, NULL); + g_io_channel_set_encoding(channels[1], NULL, NULL); + + /* Make channels to unbuffered. */ + 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); /* 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); - if (!my_thread) { - fprintf(stderr, "demo: Thread creation failed.\n"); - return SIGROK_ERR_MALLOC; /* FIXME */ - } + if (!my_thread) + return SIGROK_ERR; packet = malloc(sizeof(struct datafeed_packet)); header = malloc(sizeof(struct datafeed_header)); - buf = malloc(2048); - if (!packet || !header || !buf) + if (!packet || !header) return SIGROK_ERR_MALLOC; - /* FIXME */ - memset(buf, 0x55, 2048); - 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; header->protocol_id = PROTO_RAW; - header->num_probes = NUM_PROBES; + header->num_logic_probes = NUM_PROBES; + header->num_analog_probes = 0; session_bus(session_device_id, packet); free(header); free(packet); @@ -329,17 +491,14 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) return SIGROK_OK; } -/* This stops acquisition on ALL devices, ignoring device_index. */ static void hw_stop_acquisition(int device_index, gpointer session_device_id) { - struct datafeed_packet packet; - - /* QUICK HACK */ + /* 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 = {