#include <unistd.h>
#include <string.h>
#include <sigrok.h>
+#include <sigrok-internal.h>
#ifdef _WIN32
#include <io.h>
#include <fcntl.h>
GENMODE_INC,
};
+/* FIXME: Should not be global. */
GIOChannel *channels[2];
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",
/* 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;
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;
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;
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;
packet.length = z;
packet.unitsize = 1;
packet.payload = c;
- session_bus(user_data, &packet);
+ sr_session_bus(user_data, &packet);
}
} while (z > 0);
/* Send last packet. */
packet.type = SR_DF_END;
- session_bus(user_data, &packet);
+ sr_session_bus(user_data, &packet);
return FALSE;
}
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;
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);
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);
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;
}
}
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,
};