GENMODE_INC,
};
+/* FIXME: Should not be global. */
GIOChannel *channels[2];
struct databag {
};
static struct sr_samplerates samplerates = {
- 1,
- GHZ(1),
- 1,
+ SR_HZ(1),
+ SR_GHZ(1),
+ SR_HZ(1),
NULL,
};
/* 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;
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->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;
}