X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=0ecaeff6dea27d26cd211f20570ca5cbc57a9544;hb=68c12597efda33a30b6152cbac4b805604f3e671;hp=734b01da6bb86b61667bc972d7e150a1366666b8;hpb=29cbfeaf5c6a5e9112a6830a8fe4b584b33daf2a;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index 734b01da..0ecaeff6 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -23,6 +23,7 @@ #include #include #include +#include #ifdef _WIN32 #include #include @@ -64,9 +65,9 @@ static int capabilities[] = { }; static struct sr_samplerates samplerates = { - 1, - GHZ(1), - 1, + SR_HZ(1), + SR_GHZ(1), + SR_HZ(1), NULL, }; @@ -89,7 +90,7 @@ static uint8_t genmode_default[] = { /* List of struct sr_device_instance, maintained by opendev()/closedev(). */ static GSList *device_instances = NULL; -static uint64_t cur_samplerate = KHZ(200); +static uint64_t cur_samplerate = SR_KHZ(200); static uint64_t limit_samples = 0; static uint64_t limit_msec = 0; static int default_genmode = GENMODE_DEFAULT; @@ -98,7 +99,7 @@ static int thread_running; static void hw_stop_acquisition(int device_index, gpointer session_device_id); -static int hw_init(char *deviceinfo) +static int hw_init(const char *deviceinfo) { struct sr_device_instance *sdi; @@ -120,15 +121,18 @@ static int hw_opendev(int device_index) device_index = device_index; /* Nothing needed so far. */ + return SR_OK; } -static void hw_closedev(int device_index) +static int hw_closedev(int device_index) { /* Avoid compiler warnings. */ device_index = device_index; /* Nothing needed so far. */ + + return SR_OK; } static void hw_cleanup(void) @@ -181,7 +185,6 @@ static int *hw_get_capabilities(void) static int hw_set_configuration(int device_index, int capability, void *value) { int ret; - uint64_t *tmp_u64; char *stropt; /* Avoid compiler warnings. */ @@ -191,16 +194,19 @@ static int hw_set_configuration(int device_index, int capability, void *value) /* Nothing to do, but must be supported */ ret = SR_OK; } else if (capability == SR_HWCAP_SAMPLERATE) { - tmp_u64 = value; - cur_samplerate = *tmp_u64; + cur_samplerate = *(uint64_t *)value; + sr_dbg("demo: %s: setting samplerate to %" PRIu64, __func__, + cur_samplerate); ret = SR_OK; } else if (capability == SR_HWCAP_LIMIT_SAMPLES) { - tmp_u64 = value; - limit_samples = *tmp_u64; + limit_samples = *(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) { - tmp_u64 = value; - limit_msec = *tmp_u64; + limit_msec = *(uint64_t *)value; + sr_dbg("demo: %s: setting limit_msec to %" PRIu64, __func__, + limit_msec); ret = SR_OK; } else if (capability == SR_HWCAP_PATTERN_MODE) { stropt = value; @@ -213,6 +219,8 @@ static int hw_set_configuration(int device_index, int capability, void *value) } else { ret = SR_ERR; } + sr_dbg("demo: %s: setting patternmode to %d", __func__, + default_genmode); } else { ret = SR_ERR; } @@ -340,9 +348,11 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) struct sr_datafeed_header *header; struct databag *mydata; - mydata = malloc(sizeof(struct databag)); - if (!mydata) + /* TODO: 'mydata' is never g_free()'d? */ + if (!(mydata = g_try_malloc(sizeof(struct databag)))) { + sr_err("demo: %s: mydata malloc failed", __func__); return SR_ERR_MALLOC; + } mydata->sample_generator = default_genmode; mydata->session_device_id = session_device_id; @@ -363,8 +373,8 @@ 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); @@ -376,10 +386,15 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) if (!my_thread) return SR_ERR; - packet = malloc(sizeof(struct sr_datafeed_packet)); - header = malloc(sizeof(struct sr_datafeed_header)); - if (!packet || !header) + if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { + sr_err("demo: %s: packet malloc failed", __func__); return SR_ERR_MALLOC; + } + + if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { + sr_err("demo: %s: header malloc failed", __func__); + return SR_ERR_MALLOC; + } packet->type = SR_DF_HEADER; packet->length = sizeof(struct sr_datafeed_header); @@ -391,8 +406,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) header->num_logic_probes = NUM_PROBES; header->num_analog_probes = 0; sr_session_bus(session_device_id, packet); - free(header); - free(packet); + g_free(header); + g_free(packet); return SR_OK; } @@ -408,17 +423,17 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id) } struct sr_device_plugin demo_plugin_info = { - "demo", - "Demo driver and pattern generator", - 1, - hw_init, - hw_cleanup, - hw_opendev, - hw_closedev, - hw_get_device_info, - hw_get_status, - hw_get_capabilities, - hw_set_configuration, - hw_start_acquisition, - hw_stop_acquisition, + .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, };