X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=ec8a74bc3f5c225a64fe55e5e5c8e77ef270804f;hb=01bd1ed396f33efc7126703210f44c4b5730d064;hp=dcf5e7c28e4ec1947b50039a45949fa563a9cc6f;hpb=ba3d481bb78a3bdb009c8d0aed3885a0a0192a04;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index dcf5e7c2..ec8a74bc 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -23,51 +23,25 @@ #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 DEMONAME "Demo device" +/* size of chunks to send through the session bus */ +#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 "demodevice" -#define USB_VENDOR_NAME "demovendor" -#define USB_MODEL_VERSION "1.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, - HWCAP_CONTINUOUS +enum { + GENMODE_DEFAULT, + GENMODE_RANDOM, + GENMODE_INC, }; -/* 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, -}; - -static struct samplerates samplerates = { - KHZ(100), - MHZ(24), - 0, - supported_samplerates, -}; +GIOChannel *channels[2]; struct databag { int pipe_fds[2]; @@ -77,36 +51,56 @@ struct databag { 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", + NULL, +}; + +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, }; /* 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 limit_samples = -1; -// 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_samples = 0; +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; @@ -114,7 +108,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. */ @@ -123,7 +117,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. */ @@ -149,15 +143,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; @@ -165,10 +156,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 +171,33 @@ 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 { + ret = SIGROK_ERR; + } } else { ret = SIGROK_ERR; } @@ -204,11 +208,19 @@ static int hw_set_configuration(int device_index, int capability, void *value) static void samples_generator(uint8_t *buf, uint64_t size, void *data) { struct databag *mydata = data; - uint64_t i; + uint64_t p, 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) + p = 0; + } + break; case GENMODE_RANDOM: /* Random */ for (i = 0; i < size; i++) *(buf + i) = (uint8_t)(rand() & 0xff); @@ -226,12 +238,20 @@ static void thread_func(void *data) struct databag *mydata = data; uint8_t buf[BUFSIZE]; uint64_t nb_to_send = 0; + int bytes_written; + unsigned int msec_elapsed; while (thread_running) { if (limit_samples) nb_to_send = limit_samples - mydata->samples_counter; else - nb_to_send = BUFSIZE; // CONTINUOUS MODE + nb_to_send = BUFSIZE; /* Continuous mode */ + + if (limit_msec) { + msec_elapsed = g_timer_elapsed(mydata->timer, NULL) * 1000; + if (msec_elapsed > limit_msec) + nb_to_send = 0; + } if (nb_to_send == 0) { close(mydata->pipe_fds[1]); @@ -245,7 +265,9 @@ static void thread_func(void *data) samples_generator(buf, nb_to_send, data); mydata->samples_counter += nb_to_send; - write(mydata->pipe_fds[1], &buf, nb_to_send); + g_io_channel_write_chars(channels[1], (gchar *)&buf, + nb_to_send, (gsize *)&bytes_written, NULL); + g_usleep(mydata->loop_sleep); } } @@ -254,14 +276,16 @@ 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; /* Avoid compiler warnings. */ + fd = fd; revents = revents; - z = read(fd, &c, BUFSIZE); + g_io_channel_read_chars(channels[0], (gchar *)&c, BUFSIZE, + (gsize *)&z, NULL); + if (z > 0) { packet.type = DF_LOGIC; packet.length = z; @@ -276,46 +300,50 @@ 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)); 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); + if (limit_msec) + 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; @@ -332,12 +360,11 @@ 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; /* Send last packet. */