uint8_t thread_running;
uint64_t samples_counter;
int device_index;
- int loop_sleep;
gpointer session_device_id;
+ GTimer *timer;
};
-static GThread *my_thread;
-static int thread_running;
-
static int capabilities[] = {
HWCAP_LOGIC_ANALYZER,
HWCAP_PATTERN_MODE,
HWCAP_LIMIT_SAMPLES,
+ HWCAP_LIMIT_MSEC,
HWCAP_CONTINUOUS
};
0xbe, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-/* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */
+/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
static GSList *device_instances = NULL;
-static uint64_t cur_samplerate = 0;
-static uint64_t limit_samples = -1;
+static uint64_t cur_samplerate = KHZ(200);
+static uint64_t limit_samples = 0;
+static uint64_t limit_msec = 0;
static int default_genmode = GENMODE_DEFAULT;
+static GThread *my_thread;
+static int thread_running;
static void hw_stop_acquisition(int device_index, gpointer session_device_id);
static int hw_init(char *deviceinfo)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
/* Avoid compiler warnings. */
deviceinfo = deviceinfo;
- sdi = sigrok_device_instance_new(0, ST_ACTIVE, DEMONAME, NULL, NULL);
+ sdi = sr_device_instance_new(0, ST_ACTIVE, DEMONAME, NULL, NULL);
if (!sdi)
return 0;
device_index = device_index;
/* Nothing needed so far. */
- return SIGROK_OK;
+ return SR_OK;
}
static void hw_closedev(int device_index)
static void *hw_get_device_info(int device_index, int device_info_id)
{
- struct sigrok_device_instance *sdi;
+ struct sr_device_instance *sdi;
void *info = NULL;
- if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+ if (!(sdi = get_sr_device_instance(device_instances, device_index)))
return NULL;
switch (device_info_id) {
if (capability == HWCAP_PROBECONFIG) {
/* Nothing to do. */
- ret = SIGROK_OK;
+ ret = SR_OK;
} else if (capability == HWCAP_LIMIT_SAMPLES) {
tmp_u64 = value;
limit_samples = *tmp_u64;
- ret = SIGROK_OK;
+ ret = SR_OK;
+ } else if (capability == HWCAP_LIMIT_MSEC) {
+ tmp_u64 = value;
+ limit_msec = *tmp_u64;
+ ret = SR_OK;
} else if (capability == HWCAP_PATTERN_MODE) {
stropt = value;
if (!strcmp(stropt, "random")) {
default_genmode = GENMODE_RANDOM;
- ret = SIGROK_OK;
+ ret = SR_OK;
} else if (!strcmp(stropt, "incremental")) {
default_genmode = GENMODE_INC;
- ret = SIGROK_OK;
+ ret = SR_OK;
} else {
- ret = SIGROK_ERR;
+ ret = SR_ERR;
}
} else {
- ret = SIGROK_ERR;
+ ret = SR_ERR;
}
return ret;
uint64_t nb_to_send = 0;
int bytes_written;
+ double time_cur, time_last, time_diff;
+
+ time_last = g_timer_elapsed(mydata->timer, NULL);
+
while (thread_running) {
+ /* Rate control */
+ time_cur = g_timer_elapsed(mydata->timer, NULL);
+
+ time_diff = time_cur - time_last;
+ time_last = time_cur;
+
+ nb_to_send = cur_samplerate * time_diff;
+
if (limit_samples)
- nb_to_send = limit_samples - mydata->samples_counter;
- else
- nb_to_send = BUFSIZE; /* Continuous mode */
+ nb_to_send = MIN(nb_to_send,
+ limit_samples - mydata->samples_counter);
+
+ /* Make sure we don't overflow. */
+ nb_to_send = MIN(nb_to_send, BUFSIZE);
- if (nb_to_send == 0) {
+ if (nb_to_send) {
+ samples_generator(buf, nb_to_send, data);
+ mydata->samples_counter += nb_to_send;
+
+ g_io_channel_write_chars(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))
+ {
close(mydata->pipe_fds[1]);
thread_running = 0;
- hw_stop_acquisition(mydata->device_index,
- mydata->session_device_id);
- } else if (nb_to_send > BUFSIZE) {
- nb_to_send = BUFSIZE;
}
- samples_generator(buf, nb_to_send, data);
- mydata->samples_counter += nb_to_send;
-
- g_io_channel_write_chars(channels[1], (gchar *)&buf,
- nb_to_send, (gsize *)&bytes_written, NULL);
-
- g_usleep(mydata->loop_sleep);
+ g_usleep(10);
}
}
{
struct datafeed_packet packet;
char c[BUFSIZE];
- uint64_t z;
+ gsize z;
/* Avoid compiler warnings. */
fd = fd;
revents = revents;
- g_io_channel_read_chars(channels[0], (gchar *)&c, BUFSIZE, &z, NULL);
+ do {
+ g_io_channel_read_chars(channels[0],
+ (gchar *)&c, BUFSIZE, &z, NULL);
+
+ if (z > 0) {
+ packet.type = DF_LOGIC;
+ packet.length = z;
+ packet.unitsize = 1;
+ packet.payload = c;
+ session_bus(user_data, &packet);
+ }
+ } while (z > 0);
+
+ if (!thread_running && z <= 0)
+ {
+ /* Make sure we don't receive more packets */
+ g_io_channel_close(channels[0]);
- if (z > 0) {
- packet.type = DF_LOGIC;
- packet.length = z;
- packet.unitsize = 1;
- packet.payload = c;
+ /* Send last packet. */
+ packet.type = DF_END;
session_bus(user_data, &packet);
+
+ return FALSE;
}
+
return TRUE;
}
mydata = malloc(sizeof(struct databag));
if (!mydata)
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
mydata->sample_generator = default_genmode;
mydata->session_device_id = session_device_id;
mydata->device_index = device_index;
mydata->samples_counter = 0;
- mydata->loop_sleep = 100000;
if (pipe(mydata->pipe_fds))
- return SIGROK_ERR;
+ 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]);
/* Run the demo thread. */
g_thread_init(NULL);
+ mydata->timer = g_timer_new();
thread_running = 1;
my_thread =
g_thread_create((GThreadFunc)thread_func, mydata, TRUE, NULL);
if (!my_thread)
- return SIGROK_ERR;
+ return SR_ERR;
packet = malloc(sizeof(struct datafeed_packet));
header = malloc(sizeof(struct datafeed_header));
if (!packet || !header)
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
packet->type = DF_HEADER;
packet->length = sizeof(struct datafeed_header);
free(header);
free(packet);
- return SIGROK_OK;
+ return SR_OK;
}
static void hw_stop_acquisition(int device_index, gpointer session_device_id)
{
- struct datafeed_packet packet;
-
/* Avoid compiler warnings. */
device_index = device_index;
+ session_device_id = session_device_id;
- /* Send last packet. */
- packet.type = DF_END;
- session_bus(session_device_id, &packet);
+ /* Stop generate thread. */
+ thread_running = 0;
}
struct device_plugin demo_plugin_info = {
projects / libsigrok.git / blobdiff