X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Falsa%2Falsa.c;h=9a93aab80d1868faa504d286bc067b4b486da7bf;hb=e7eb703fff0167897f7e094e2edbf7d5798857ea;hp=94a95723adc4eea6ddd06df3a5c980f70ada848b;hpb=5097b0d0912165429aceddb5febbf68467b623f5;p=libsigrok.git

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index 94a95723..9a93aab8 100644
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -92,7 +92,7 @@ free_alsa:
 	return 0;
 }
 
-static int hw_opendev(int dev_index)
+static int hw_dev_open(int dev_index)
 {
 	struct sr_dev_inst *sdi;
 	struct alsa *alsa;
@@ -127,7 +127,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)
 {
 	struct sr_dev_inst *sdi;
 	struct alsa *alsa;
@@ -196,7 +196,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. */
 	dev_index = dev_index;
@@ -290,7 +290,7 @@ static int receive_data(int fd, int revents, void *user_data)
 	return TRUE;
 }
 
-static int hw_start_acquisition(int dev_index, gpointer session_dev_id)
+static int hw_acquisition_start(int dev_index, gpointer session_dev_id)
 {
 	struct sr_dev_inst *sdi;
 	struct alsa *alsa;
@@ -383,7 +383,7 @@ static int hw_start_acquisition(int dev_index, gpointer session_dev_id)
 	return SR_OK;
 }
 
-static int hw_stop_acquisition(int dev_index, gpointer session_dev_id)
+static int hw_acquisition_stop(int dev_index, gpointer session_dev_id)
 {
 	/* Avoid compiler warnings. */
 	dev_index = dev_index;
@@ -398,12 +398,12 @@ SR_PRIV struct sr_dev_plugin alsa_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,
-	.start_acquisition = hw_start_acquisition,
-	.stop_acquisition = hw_stop_acquisition,
+	.acquisition_start = hw_acquisition_start,
+	.acquisition_stop = hw_acquisition_stop,
 };