X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=0cd23e3c9ae51bb962e1b5ed5409350f0261f9c2;hb=249ae2be8f0e5132d601ab431ac8783b5b1c7439;hp=d6e149de7fb86254f1c33c1c2c8d0ceb0f7c634c;hpb=d68e2d1a21ac5c3f24d88b7689f98764e4d57c30;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index d6e149de..0cd23e3c 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -27,8 +27,8 @@ #include #define pipe(fds) _pipe(fds, 4096, _O_BINARY) #endif -#include "sigrok.h" -#include "sigrok-internal.h" +#include "libsigrok.h" +#include "libsigrok-internal.h" /* TODO: Number of probes should be configurable. */ #define NUM_PROBES 8 @@ -64,21 +64,21 @@ enum { }; /* FIXME: Should not be global. */ -SR_PRIV GIOChannel *channels[2]; -struct databag { +struct context { int pipe_fds[2]; + GIOChannel *channels[2]; uint8_t sample_generator; uint8_t thread_running; uint64_t samples_counter; - int device_index; - gpointer session_data; + int dev_index; + void *session_dev_id; GTimer *timer; }; -static int capabilities[] = { +static const int hwcaps[] = { SR_HWCAP_LOGIC_ANALYZER, - SR_HWCAP_DEMO_DEVICE, + SR_HWCAP_DEMO_DEV, SR_HWCAP_SAMPLERATE, SR_HWCAP_PATTERN_MODE, SR_HWCAP_LIMIT_SAMPLES, @@ -86,7 +86,7 @@ static int capabilities[] = { SR_HWCAP_CONTINUOUS, }; -static struct sr_samplerates samplerates = { +static const struct sr_samplerates samplerates = { SR_HZ(1), SR_GHZ(1), SR_HZ(1), @@ -102,6 +102,7 @@ static const char *pattern_strings[] = { NULL, }; +/* We name the probes 0-7 on our demo driver. */ static const char *probe_names[NUM_PROBES + 1] = { "0", "1", @@ -125,7 +126,10 @@ static uint8_t pattern_sigrok[] = { 0xbe, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* List of struct sr_dev_inst, maintained by opendev()/closedev(). */ +/* Private, per-device-instance driver context. */ +/* TODO: struct context as with the other drivers. */ + +/* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */ static GSList *dev_insts = NULL; static uint64_t cur_samplerate = SR_KHZ(200); static uint64_t limit_samples = 0; @@ -134,14 +138,14 @@ static int default_pattern = PATTERN_SIGROK; static GThread *my_thread; static int thread_running; -static int hw_stop_acquisition(int device_index, gpointer session_data); +static int hw_dev_acquisition_stop(int dev_index, void *cb_data); -static int hw_init(const char *deviceinfo) +static int hw_init(const char *devinfo) { struct sr_dev_inst *sdi; /* Avoid compiler warnings. */ - (void)deviceinfo; + (void)devinfo; sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL); if (!sdi) { @@ -154,20 +158,20 @@ static int hw_init(const char *deviceinfo) return 1; } -static int hw_opendev(int device_index) +static int hw_dev_open(int dev_index) { /* Avoid compiler warnings. */ - (void)device_index; + (void)dev_index; /* Nothing needed so far. */ return SR_OK; } -static int hw_closedev(int device_index) +static int hw_dev_close(int dev_index) { /* Avoid compiler warnings. */ - (void)device_index; + (void)dev_index; /* Nothing needed so far. */ @@ -180,18 +184,18 @@ static int hw_cleanup(void) return SR_OK; } -static void *hw_get_device_info(int device_index, int device_info_id) +static const void *hw_dev_info_get(int dev_index, int dev_info_id) { struct sr_dev_inst *sdi; - void *info = NULL; + const void *info = NULL; - if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) { + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { sr_err("demo: %s: sdi was NULL", __func__); return NULL; } - switch (device_info_id) { - case SR_DI_INSTANCE: + switch (dev_info_id) { + case SR_DI_INST: info = sdi; break; case SR_DI_NUM_PROBES: @@ -206,7 +210,7 @@ static void *hw_get_device_info(int device_index, int device_info_id) case SR_DI_CUR_SAMPLERATE: info = &cur_samplerate; break; - case SR_DI_PATTERNMODES: + case SR_DI_PATTERNS: info = &pattern_strings; break; } @@ -214,46 +218,48 @@ static void *hw_get_device_info(int device_index, int device_info_id) return info; } -static int hw_get_status(int device_index) +static int hw_dev_status_get(int dev_index) { /* Avoid compiler warnings. */ - (void)device_index; + (void)dev_index; return SR_ST_ACTIVE; } -static int *hw_get_capabilities(void) +static const int *hw_hwcap_get_all(void) { - return capabilities; + return hwcaps; } -static int hw_set_configuration(int device_index, int capability, void *value) +static int hw_dev_config_set(int dev_index, int hwcap, const void *value) { int ret; - char *stropt; + const char *stropt; /* Avoid compiler warnings. */ - (void)device_index; + (void)dev_index; - if (capability == SR_HWCAP_PROBECONFIG) { + if (hwcap == SR_HWCAP_PROBECONFIG) { /* Nothing to do, but must be supported */ ret = SR_OK; - } else if (capability == SR_HWCAP_SAMPLERATE) { - cur_samplerate = *(uint64_t *)value; + } else if (hwcap == SR_HWCAP_SAMPLERATE) { + cur_samplerate = *(const uint64_t *)value; sr_dbg("demo: %s: setting samplerate to %" PRIu64, __func__, cur_samplerate); ret = SR_OK; - } else if (capability == SR_HWCAP_LIMIT_SAMPLES) { - limit_samples = *(uint64_t *)value; + } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) { + limit_msec = 0; + limit_samples = *(const uint64_t *)value; sr_dbg("demo: %s: setting limit_samples to %" PRIu64, __func__, limit_samples); ret = SR_OK; - } else if (capability == SR_HWCAP_LIMIT_MSEC) { - limit_msec = *(uint64_t *)value; + } else if (hwcap == SR_HWCAP_LIMIT_MSEC) { + limit_msec = *(const uint64_t *)value; + limit_samples = 0; sr_dbg("demo: %s: setting limit_msec to %" PRIu64, __func__, limit_msec); ret = SR_OK; - } else if (capability == SR_HWCAP_PATTERN_MODE) { + } else if (hwcap == SR_HWCAP_PATTERN_MODE) { stropt = value; ret = SR_OK; if (!strcmp(stropt, "sigrok")) { @@ -281,13 +287,13 @@ 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; + struct context *ctx = data; uint64_t i; /* TODO: Needed? */ memset(buf, 0, size); - switch (mydata->sample_generator) { + switch (ctx->sample_generator) { case PATTERN_SIGROK: /* sigrok pattern */ for (i = 0; i < size; i++) { *(buf + i) = ~(pattern_sigrok[p] >> 1); @@ -310,7 +316,8 @@ static void samples_generator(uint8_t *buf, uint64_t size, void *data) memset(buf, 0xff, size); break; default: - /* TODO: Error handling. */ + sr_err("demo: %s: unknown pattern %d", __func__, + ctx->sample_generator); break; } } @@ -318,17 +325,17 @@ static void samples_generator(uint8_t *buf, uint64_t size, void *data) /* Thread function */ static void thread_func(void *data) { - struct databag *mydata = data; + struct context *ctx = 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); + time_last = g_timer_elapsed(ctx->timer, NULL); while (thread_running) { /* Rate control */ - time_cur = g_timer_elapsed(mydata->timer, NULL); + time_cur = g_timer_elapsed(ctx->timer, NULL); time_diff = time_cur - time_last; time_last = time_cur; @@ -337,7 +344,7 @@ static void thread_func(void *data) if (limit_samples) { nb_to_send = MIN(nb_to_send, - limit_samples - mydata->samples_counter); + limit_samples - ctx->samples_counter); } /* Make sure we don't overflow. */ @@ -345,17 +352,17 @@ static void thread_func(void *data) if (nb_to_send) { samples_generator(buf, nb_to_send, data); - mydata->samples_counter += nb_to_send; + ctx->samples_counter += nb_to_send; - g_io_channel_write_chars(channels[1], (gchar *)&buf, + g_io_channel_write_chars(ctx->channels[1], (gchar *)&buf, nb_to_send, (gsize *)&bytes_written, NULL); } /* Check if we're done. */ if ((limit_msec && time_cur * 1000 > limit_msec) || - (limit_samples && mydata->samples_counter >= limit_samples)) + (limit_samples && ctx->samples_counter >= limit_samples)) { - close(mydata->pipe_fds[1]); + close(ctx->pipe_fds[1]); thread_running = 0; } @@ -364,8 +371,9 @@ static void thread_func(void *data) } /* Callback handling data */ -static int receive_data(int fd, int revents, void *session_data) +static int receive_data(int fd, int revents, void *cb_data) { + struct context *ctx = cb_data; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; static uint64_t samples_received = 0; @@ -377,7 +385,7 @@ static int receive_data(int fd, int revents, void *session_data) (void)revents; do { - g_io_channel_read_chars(channels[0], + g_io_channel_read_chars(ctx->channels[0], (gchar *)&c, BUFSIZE, &z, NULL); if (z > 0) { @@ -386,18 +394,18 @@ static int receive_data(int fd, int revents, void *session_data) logic.length = z; logic.unitsize = 1; logic.data = c; - sr_session_bus(session_data, &packet); + sr_session_send(ctx->session_dev_id, &packet); samples_received += z; } } while (z > 0); if (!thread_running && z <= 0) { /* Make sure we don't receive more packets. */ - g_io_channel_close(channels[0]); + g_io_channel_shutdown(ctx->channels[0], FALSE, NULL); /* Send last packet. */ packet.type = SR_DF_END; - sr_session_bus(session_data, &packet); + sr_session_send(ctx->session_dev_id, &packet); return FALSE; } @@ -405,50 +413,51 @@ static int receive_data(int fd, int revents, void *session_data) return TRUE; } -static int hw_start_acquisition(int device_index, gpointer session_data) +static int hw_dev_acquisition_start(int dev_index, void *cb_data) { struct sr_datafeed_packet *packet; struct sr_datafeed_header *header; - struct databag *mydata; + struct sr_datafeed_meta_logic meta; + struct context *ctx; - /* TODO: 'mydata' is never g_free()'d? */ - if (!(mydata = g_try_malloc(sizeof(struct databag)))) { - sr_err("demo: %s: mydata malloc failed", __func__); + /* TODO: 'ctx' is never g_free()'d? */ + if (!(ctx = g_try_malloc(sizeof(struct context)))) { + sr_err("demo: %s: ctx malloc failed", __func__); return SR_ERR_MALLOC; } - mydata->sample_generator = default_pattern; - mydata->session_data = session_data; - mydata->device_index = device_index; - mydata->samples_counter = 0; + ctx->sample_generator = default_pattern; + ctx->session_dev_id = cb_data; + ctx->dev_index = dev_index; + ctx->samples_counter = 0; - if (pipe(mydata->pipe_fds)) { + if (pipe(ctx->pipe_fds)) { /* TODO: Better error message. */ sr_err("demo: %s: pipe() failed", __func__); return SR_ERR; } - channels[0] = g_io_channel_unix_new(mydata->pipe_fds[0]); - channels[1] = g_io_channel_unix_new(mydata->pipe_fds[1]); + ctx->channels[0] = g_io_channel_unix_new(ctx->pipe_fds[0]); + ctx->channels[1] = g_io_channel_unix_new(ctx->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); + g_io_channel_set_encoding(ctx->channels[0], NULL, NULL); + g_io_channel_set_encoding(ctx->channels[1], NULL, NULL); /* Make channels to unbuffered. */ - g_io_channel_set_buffered(channels[0], FALSE); - g_io_channel_set_buffered(channels[1], FALSE); + g_io_channel_set_buffered(ctx->channels[0], FALSE); + g_io_channel_set_buffered(ctx->channels[1], FALSE); - sr_source_add(mydata->pipe_fds[0], G_IO_IN | G_IO_ERR, 40, - receive_data, session_data); + sr_session_source_add_channel(ctx->channels[0], G_IO_IN | G_IO_ERR, + 40, receive_data, ctx); /* Run the demo thread. */ g_thread_init(NULL); /* This must to be done between g_thread_init() & g_thread_create(). */ - mydata->timer = g_timer_new(); + ctx->timer = g_timer_new(); thread_running = 1; my_thread = - g_thread_create((GThreadFunc)thread_func, mydata, TRUE, NULL); + g_thread_create((GThreadFunc)thread_func, ctx, TRUE, NULL); if (!my_thread) { sr_err("demo: %s: g_thread_create failed", __func__); return SR_ERR; /* TODO */ @@ -468,20 +477,27 @@ static int hw_start_acquisition(int device_index, gpointer session_data) packet->payload = header; header->feed_version = 1; gettimeofday(&header->starttime, NULL); - header->samplerate = cur_samplerate; - header->num_logic_probes = NUM_PROBES; - sr_session_bus(session_data, packet); + sr_session_send(ctx->session_dev_id, packet); + + /* Send metadata about the SR_DF_LOGIC packets to come. */ + packet->type = SR_DF_META_LOGIC; + packet->payload = &meta; + meta.samplerate = cur_samplerate; + meta.num_probes = NUM_PROBES; + sr_session_send(ctx->session_dev_id, packet); + g_free(header); g_free(packet); return SR_OK; } -static int hw_stop_acquisition(int device_index, gpointer session_data) +/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */ +static int hw_dev_acquisition_stop(int dev_index, void *cb_data) { /* Avoid compiler warnings. */ - (void)device_index; - (void)session_data; + (void)dev_index; + (void)cb_data; /* Stop generate thread. */ thread_running = 0; @@ -489,18 +505,18 @@ static int hw_stop_acquisition(int device_index, gpointer session_data) return SR_OK; } -SR_PRIV struct sr_device_plugin demo_plugin_info = { +SR_PRIV struct sr_dev_driver demo_driver_info = { .name = "demo", .longname = "Demo driver and pattern generator", .api_version = 1, .init = hw_init, .cleanup = hw_cleanup, - .opendev = hw_opendev, - .closedev = hw_closedev, - .get_device_info = hw_get_device_info, - .get_status = hw_get_status, - .get_capabilities = hw_get_capabilities, - .set_configuration = hw_set_configuration, - .start_acquisition = hw_start_acquisition, - .stop_acquisition = hw_stop_acquisition, + .dev_open = hw_dev_open, + .dev_close = hw_dev_close, + .dev_info_get = hw_dev_info_get, + .dev_status_get = hw_dev_status_get, + .hwcap_get_all = hw_hwcap_get_all, + .dev_config_set = hw_dev_config_set, + .dev_acquisition_start = hw_dev_acquisition_start, + .dev_acquisition_stop = hw_dev_acquisition_stop, };