#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
#ifdef _WIN32
#include <io.h>
#include <fcntl.h>
#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
#endif
-#include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
/* TODO: Number of probes should be configurable. */
#define NUM_PROBES 8
};
/* FIXME: Should not be global. */
-GIOChannel *channels[2];
+static GIOChannel *channels[2];
struct databag {
int pipe_fds[2];
uint8_t thread_running;
uint64_t samples_counter;
int device_index;
- gpointer session_device_id;
+ gpointer session_data;
GTimer *timer;
};
static int capabilities[] = {
SR_HWCAP_LOGIC_ANALYZER,
+ SR_HWCAP_DEMO_DEVICE,
SR_HWCAP_SAMPLERATE,
SR_HWCAP_PATTERN_MODE,
SR_HWCAP_LIMIT_SAMPLES,
NULL,
};
+static const char *probe_names[NUM_PROBES + 1] = {
+ "0",
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ NULL,
+};
+
static uint8_t pattern_sigrok[] = {
0x4c, 0x92, 0x92, 0x92, 0x64, 0x00, 0x00, 0x00,
0x82, 0xfe, 0xfe, 0x82, 0x00, 0x00, 0x00, 0x00,
static GThread *my_thread;
static int thread_running;
-static void hw_stop_acquisition(int device_index, gpointer session_device_id);
+static void hw_stop_acquisition(int device_index, gpointer session_data);
static int hw_init(const char *deviceinfo)
{
struct sr_device_instance *sdi;
/* Avoid compiler warnings. */
- deviceinfo = deviceinfo;
+ (void)deviceinfo;
sdi = sr_device_instance_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
if (!sdi) {
static int hw_opendev(int device_index)
{
/* Avoid compiler warnings. */
- device_index = device_index;
+ (void)device_index;
/* Nothing needed so far. */
static int hw_closedev(int device_index)
{
/* Avoid compiler warnings. */
- device_index = device_index;
+ (void)device_index;
/* Nothing needed so far. */
case SR_DI_NUM_PROBES:
info = GINT_TO_POINTER(NUM_PROBES);
break;
+ case SR_DI_PROBE_NAMES:
+ info = probe_names;
+ break;
case SR_DI_SAMPLERATES:
info = &samplerates;
break;
static int hw_get_status(int device_index)
{
/* Avoid compiler warnings. */
- device_index = device_index;
+ (void)device_index;
return SR_ST_ACTIVE;
}
char *stropt;
/* Avoid compiler warnings. */
- device_index = device_index;
+ (void)device_index;
if (capability == SR_HWCAP_PROBECONFIG) {
/* Nothing to do, but must be supported */
*(buf + i) = i;
break;
case PATTERN_ALL_LOW: /* All probes are low */
- for (i = 0; i < size; i++)
- *(buf + i) = 0x00;
+ memset(buf, 0x00, size);
break;
case PATTERN_ALL_HIGH: /* All probes are high */
- for (i = 0; i < size; i++)
- *(buf + i) = 0xff;
+ memset(buf, 0xff, size);
break;
default:
/* TODO: Error handling. */
}
/* Callback handling data */
-static int receive_data(int fd, int revents, void *user_data)
+static int receive_data(int fd, int revents, void *session_data)
{
struct sr_datafeed_packet packet;
- char c[BUFSIZE];
+ struct sr_datafeed_logic logic;
+ static uint64_t samples_received = 0;
+ unsigned char c[BUFSIZE];
gsize z;
/* Avoid compiler warnings. */
- fd = fd;
- revents = revents;
+ (void)fd;
+ (void)revents;
do {
g_io_channel_read_chars(channels[0],
if (z > 0) {
packet.type = SR_DF_LOGIC;
- packet.length = z;
- packet.unitsize = 1;
- packet.payload = c;
- sr_session_bus(user_data, &packet);
+ packet.payload = &logic;
+ logic.length = z;
+ logic.unitsize = 1;
+ logic.data = c;
+ sr_session_bus(session_data, &packet);
+ samples_received += z;
}
} while (z > 0);
/* Send last packet. */
packet.type = SR_DF_END;
- sr_session_bus(user_data, &packet);
+ sr_session_bus(session_data, &packet);
return FALSE;
}
return TRUE;
}
-static int hw_start_acquisition(int device_index, gpointer session_device_id)
+static int hw_start_acquisition(int device_index, gpointer session_data)
{
struct sr_datafeed_packet *packet;
struct sr_datafeed_header *header;
}
mydata->sample_generator = default_pattern;
- mydata->session_device_id = session_device_id;
+ mydata->session_data = session_data;
mydata->device_index = device_index;
mydata->samples_counter = 0;
g_io_channel_set_buffered(channels[1], FALSE);
sr_source_add(mydata->pipe_fds[0], G_IO_IN | G_IO_ERR, 40,
- receive_data, session_device_id);
+ receive_data, session_data);
/* Run the demo thread. */
g_thread_init(NULL);
}
packet->type = SR_DF_HEADER;
- packet->length = sizeof(struct sr_datafeed_header);
- packet->payload = (unsigned char *)header;
+ packet->payload = header;
header->feed_version = 1;
gettimeofday(&header->starttime, NULL);
header->samplerate = cur_samplerate;
- header->protocol_id = SR_PROTO_RAW;
header->num_logic_probes = NUM_PROBES;
header->num_analog_probes = 0;
- sr_session_bus(session_device_id, packet);
+ sr_session_bus(session_data, packet);
g_free(header);
g_free(packet);
return SR_OK;
}
-static void hw_stop_acquisition(int device_index, gpointer session_device_id)
+static void hw_stop_acquisition(int device_index, gpointer session_data)
{
/* Avoid compiler warnings. */
- device_index = device_index;
- session_device_id = session_device_id;
+ (void)device_index;
+ (void)session_data;
/* Stop generate thread. */
thread_running = 0;
}
-struct sr_device_plugin demo_plugin_info = {
+SR_PRIV struct sr_device_plugin demo_plugin_info = {
.name = "demo",
.longname = "Demo driver and pattern generator",
.api_version = 1,