NULL,
};
+/* We name the probes 0-7 on our demo driver. */
static const char *probe_names[NUM_PROBES + 1] = {
"0",
"1",
0xbe, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
-/* List of struct sr_dev_inst, maintained by opendev()/closedev(). */
+/* Private, per-device-instance driver context. */
+/* TODO: struct context as with the other drivers. */
+
+/* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
static GSList *dev_insts = NULL;
static uint64_t cur_samplerate = SR_KHZ(200);
static uint64_t limit_samples = 0;
static GThread *my_thread;
static int thread_running;
-static int hw_stop_acquisition(int dev_index, gpointer session_data);
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_data);
static int hw_init(const char *devinfo)
{
return 1;
}
-static int hw_opendev(int dev_index)
+static int hw_dev_open(int dev_index)
{
/* Avoid compiler warnings. */
(void)dev_index;
return SR_OK;
}
-static int hw_closedev(int dev_index)
+static int hw_dev_close(int dev_index)
{
/* Avoid compiler warnings. */
(void)dev_index;
return info;
}
-static int hw_get_status(int dev_index)
+static int hw_dev_status_get(int dev_index)
{
/* Avoid compiler warnings. */
(void)dev_index;
return hwcaps;
}
-static int hw_config_set(int dev_index, int hwcap, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, void *value)
{
int ret;
char *stropt;
return TRUE;
}
-static int hw_start_acquisition(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
{
struct sr_datafeed_packet *packet;
struct sr_datafeed_header *header;
return SR_OK;
}
-static int hw_stop_acquisition(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_data)
{
/* Avoid compiler warnings. */
(void)dev_index;
return SR_OK;
}
-SR_PRIV struct sr_dev_plugin demo_plugin_info = {
+SR_PRIV struct sr_dev_driver demo_driver_info = {
.name = "demo",
.longname = "Demo driver and pattern generator",
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
- .opendev = hw_opendev,
- .closedev = hw_closedev,
+ .dev_open = hw_dev_open,
+ .dev_close = hw_dev_close,
.dev_info_get = hw_dev_info_get,
- .get_status = hw_get_status,
+ .dev_status_get = hw_dev_status_get,
.hwcap_get_all = hw_hwcap_get_all,
- .config_set = hw_config_set,
- .start_acquisition = hw_start_acquisition,
- .stop_acquisition = hw_stop_acquisition,
+ .dev_config_set = hw_dev_config_set,
+ .dev_acquisition_start = hw_dev_acquisition_start,
+ .dev_acquisition_stop = hw_dev_acquisition_stop,
};