X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=0ebfd271701e99d146752c6d741a9a2973ef2a1f;hb=4af22da5950cf490f2300199dfacd705e1d220b3;hp=f36024c8c3d1fa351146739c68728fd2fbfaec95;hpb=cddd1c5f4739e43365a48a9d17e49cb105d929c7;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index f36024c8..0ebfd271 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -23,6 +23,7 @@ #include #include #include +#include #ifdef _WIN32 #include #include @@ -41,6 +42,7 @@ enum { GENMODE_INC, }; +/* FIXME: Should not be global. */ GIOChannel *channels[2]; struct databag { @@ -55,12 +57,20 @@ struct databag { static int capabilities[] = { SR_HWCAP_LOGIC_ANALYZER, + SR_HWCAP_SAMPLERATE, SR_HWCAP_PATTERN_MODE, SR_HWCAP_LIMIT_SAMPLES, SR_HWCAP_LIMIT_MSEC, SR_HWCAP_CONTINUOUS, }; +static struct sr_samplerates samplerates = { + SR_HZ(1), + SR_GHZ(1), + SR_HZ(1), + NULL, +}; + static const char *patternmodes[] = { "random", "incremental", @@ -80,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; @@ -89,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; @@ -142,6 +152,9 @@ static void *hw_get_device_info(int device_index, int device_info_id) case SR_DI_NUM_PROBES: info = GINT_TO_POINTER(NUM_PROBES); break; + case SR_DI_SAMPLERATES: + info = &samplerates; + break; case SR_DI_CUR_SAMPLERATE: info = &cur_samplerate; break; @@ -176,7 +189,11 @@ static int hw_set_configuration(int device_index, int capability, void *value) device_index = device_index; if (capability == SR_HWCAP_PROBECONFIG) { - /* Nothing to do. */ + /* Nothing to do, but must be supported */ + ret = SR_OK; + } else if (capability == SR_HWCAP_SAMPLERATE) { + tmp_u64 = value; + cur_samplerate = *tmp_u64; ret = SR_OK; } else if (capability == SR_HWCAP_LIMIT_SAMPLES) { tmp_u64 = value; @@ -299,7 +316,7 @@ static int receive_data(int fd, int revents, void *user_data) packet.length = z; packet.unitsize = 1; packet.payload = c; - session_bus(user_data, &packet); + sr_session_bus(user_data, &packet); } } while (z > 0); @@ -310,7 +327,7 @@ static int receive_data(int fd, int revents, void *user_data) /* Send last packet. */ packet.type = SR_DF_END; - session_bus(user_data, &packet); + sr_session_bus(user_data, &packet); return FALSE; } @@ -324,9 +341,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; @@ -347,8 +366,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); @@ -360,10 +379,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); @@ -374,9 +398,9 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) header->protocol_id = SR_PROTO_RAW; header->num_logic_probes = NUM_PROBES; header->num_analog_probes = 0; - session_bus(session_device_id, packet); - free(header); - free(packet); + sr_session_bus(session_device_id, packet); + g_free(header); + g_free(packet); return SR_OK; } @@ -392,17 +416,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, + .open = hw_opendev, + .close = 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, };