X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=aa7a65dc8c64322d280fe49b3373f0803bcc4c69;hb=e7eb703fff0167897f7e094e2edbf7d5798857ea;hp=44065339956d267721b4048e3014c63f13e77474;hpb=bb7ef79377ae617e1275373e0b631beb7f909d73;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 44065339..aa7a65dc 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -63,7 +63,7 @@ static model_t zeroplus_models[] = {
 	{0x7016, "LAP-C(162000)", 16, 2048, 200},
 };
 
-static int capabilities[] = {
+static int hwcaps[] = {
 	SR_HWCAP_LOGIC_ANALYZER,
 	SR_HWCAP_SAMPLERATE,
 	SR_HWCAP_PROBECONFIG,
@@ -110,7 +110,7 @@ static const char *probe_names[] = {
 	NULL,
 };
 
-/* List of struct sr_dev_inst, maintained by opendev()/closedev(). */
+/* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
 static GSList *dev_insts = NULL;
 
 static libusb_context *usb_context = NULL;
@@ -166,7 +166,7 @@ struct zp {
 	struct sr_usb_dev_inst *usb;
 };
 
-static int hw_set_configuration(int dev_index, int capability, void *value);
+static int hw_config_set(int dev_index, int hwcap, void *value);
 
 static unsigned int get_memory_size(int type)
 {
@@ -409,7 +409,7 @@ static int hw_init(const char *devinfo)
 	return devcnt;
 }
 
-static int hw_opendev(int dev_index)
+static int hw_dev_open(int dev_index)
 {
 	struct sr_dev_inst *sdi;
 	struct zp *zp;
@@ -462,7 +462,7 @@ static int hw_opendev(int dev_index)
 
 	if (zp->cur_samplerate == 0) {
 		/* Samplerate hasn't been set. Default to the slowest one. */
-		if (hw_set_configuration(dev_index, SR_HWCAP_SAMPLERATE,
+		if (hw_config_set(dev_index, SR_HWCAP_SAMPLERATE,
 		     &samplerates.list[0]) == SR_ERR)
 			return SR_ERR;
 	}
@@ -470,7 +470,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;
 
@@ -507,7 +507,7 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static void *hw_get_dev_info(int dev_index, int dev_info_id)
+static void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
 	struct sr_dev_inst *sdi;
 	struct zp *zp;
@@ -524,7 +524,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
 	}
 
 	switch (dev_info_id) {
-	case SR_DI_INSTANCE:
+	case SR_DI_INST:
 		info = sdi;
 		break;
 	case SR_DI_NUM_PROBES:
@@ -552,7 +552,7 @@ static void *hw_get_dev_info(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)
 {
 	struct sr_dev_inst *sdi;
 
@@ -563,13 +563,12 @@ static int hw_get_status(int dev_index)
 		return SR_ST_NOT_FOUND;
 }
 
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
 {
-	return capabilities;
+	return hwcaps;
 }
 
-static int set_configuration_samplerate(struct sr_dev_inst *sdi,
-					uint64_t samplerate)
+static int config_set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
 {
 	struct zp *zp;
 
@@ -597,7 +596,7 @@ static int set_configuration_samplerate(struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int hw_set_configuration(int dev_index, int capability, void *value)
+static int hw_config_set(int dev_index, int hwcap, void *value)
 {
 	struct sr_dev_inst *sdi;
 	uint64_t *tmp_u64;
@@ -613,10 +612,10 @@ static int hw_set_configuration(int dev_index, int capability, void *value)
 		return SR_ERR_ARG;
 	}
 
-	switch (capability) {
+	switch (hwcap) {
 	case SR_HWCAP_SAMPLERATE:
 		tmp_u64 = value;
-		return set_configuration_samplerate(sdi, *tmp_u64);
+		return config_set_samplerate(sdi, *tmp_u64);
 	case SR_HWCAP_PROBECONFIG:
 		return configure_probes(sdi, (GSList *)value);
 	case SR_HWCAP_LIMIT_SAMPLES:
@@ -628,7 +627,7 @@ static int hw_set_configuration(int dev_index, int capability, void *value)
 	}
 }
 
-static int hw_start_acquisition(int dev_index, gpointer session_data)
+static int hw_acquisition_start(int dev_index, gpointer session_data)
 {
 	struct sr_dev_inst *sdi;
 	struct sr_datafeed_packet packet;
@@ -704,7 +703,7 @@ static int hw_start_acquisition(int dev_index, gpointer session_data)
 }
 
 /* This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_stop_acquisition(int dev_index, gpointer session_dev_id)
+static int hw_acquisition_stop(int dev_index, gpointer session_dev_id)
 {
 	struct sr_datafeed_packet packet;
 	struct sr_dev_inst *sdi;
@@ -735,12 +734,12 @@ SR_PRIV struct sr_dev_plugin zeroplus_logic_cube_plugin_info = {
 	.api_version = 1,
 	.init = hw_init,
 	.cleanup = hw_cleanup,
-	.opendev = hw_opendev,
-	.closedev = hw_closedev,
-	.get_dev_info = hw_get_dev_info,
-	.get_status = hw_get_status,
-	.get_capabilities = hw_get_capabilities,
-	.set_configuration = hw_set_configuration,
-	.start_acquisition = hw_start_acquisition,
-	.stop_acquisition = hw_stop_acquisition,
+	.dev_open = hw_dev_open,
+	.dev_close = hw_dev_close,
+	.dev_info_get = hw_dev_info_get,
+	.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,
 };