X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=aa3f57d4a919f8c920aab54864531b0af68c8cca;hb=f9a69557d276ee27d551eb9ef68f2700324613b4;hp=c1b5b5cf0890321fd7626d67dc2417f2c54d9ce3;hpb=8105505d064ca8cc32799c119c5526fb337a5660;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index c1b5b5cf..aa3f57d4 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -125,7 +125,10 @@ static uint8_t pattern_sigrok[] = {
 	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;
@@ -134,7 +137,7 @@ static int default_pattern = PATTERN_SIGROK;
 static GThread *my_thread;
 static int thread_running;
 
-static int hw_acquisition_stop(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)
 {
@@ -154,7 +157,7 @@ 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;
@@ -164,7 +167,7 @@ static int hw_opendev(int 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;
@@ -214,7 +217,7 @@ static void *hw_dev_info_get(int dev_index, int dev_info_id)
 	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;
@@ -227,7 +230,7 @@ static int *hw_hwcap_get_all(void)
 	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;
@@ -405,7 +408,7 @@ static int receive_data(int fd, int revents, void *session_data)
 	return TRUE;
 }
 
-static int hw_acquisition_start(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;
@@ -477,7 +480,7 @@ static int hw_acquisition_start(int dev_index, gpointer session_data)
 	return SR_OK;
 }
 
-static int hw_acquisition_stop(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_data)
 {
 	/* Avoid compiler warnings. */
 	(void)dev_index;
@@ -495,12 +498,12 @@ SR_PRIV struct sr_dev_plugin demo_plugin_info = {
 	.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,
-	.acquisition_start = hw_acquisition_start,
-	.acquisition_stop = hw_acquisition_stop,
+	.dev_config_set = hw_dev_config_set,
+	.dev_acquisition_start = hw_dev_acquisition_start,
+	.dev_acquisition_stop = hw_dev_acquisition_stop,
 };