X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fanalyzer.c;h=e9476237dcd6c62969f27b676366e9e2b57b67c1;hb=4101f961e8a414ae17b16c0feb1e10fd07d08d52;hp=283820b2dbc1e15306757ddbe52c8179b5a40ec9;hpb=38ba2522516b481fa3619bdec56d1e2a4b7a5f45;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/analyzer.c b/hardware/zeroplus-logic-cube/analyzer.c
index 283820b2..e9476237 100644
--- a/hardware/zeroplus-logic-cube/analyzer.c
+++ b/hardware/zeroplus-logic-cube/analyzer.c
@@ -37,11 +37,11 @@ enum {
 	HARD_DATA_CHECK_SUM		= 0x00,
 	PASS_WORD,
 
-	DEVICE_ID0			= 0x10,
-	DEVICE_ID1,
+	DEV_ID0				= 0x10,
+	DEV_ID1,
 
 	START_STATUS			= 0x20,
-	DEVICE_STATUS			= 0x21,
+	DEV_STATUS			= 0x21,
 	FREQUENCY_REG0			= 0x30,
 	FREQUENCY_REG1,
 	FREQUENCY_REG2,
@@ -302,30 +302,30 @@ static void analyzer_set_filter(libusb_device_handle *devh)
 		gl_reg_write(devh, FILTER_STATUS + i, g_filter_status[i]);
 }
 
-void analyzer_reset(libusb_device_handle *devh)
+SR_PRIV void analyzer_reset(libusb_device_handle *devh)
 {
 	analyzer_write_status(devh, 3, STATUS_FLAG_NONE);	// reset device
 	analyzer_write_status(devh, 3, STATUS_FLAG_RESET);	// reset device
 }
 
-void analyzer_initialize(libusb_device_handle *devh)
+SR_PRIV void analyzer_initialize(libusb_device_handle *devh)
 {
 	analyzer_write_status(devh, 1, STATUS_FLAG_NONE);
 	analyzer_write_status(devh, 1, STATUS_FLAG_INIT);
 	analyzer_write_status(devh, 1, STATUS_FLAG_NONE);
 }
 
-void analyzer_wait(libusb_device_handle *devh, int set, int unset)
+SR_PRIV void analyzer_wait(libusb_device_handle *devh, int set, int unset)
 {
 	int status;
 	while (1) {
-		status = gl_reg_read(devh, DEVICE_STATUS);
+		status = gl_reg_read(devh, DEV_STATUS);
 		if ((status & set) && ((status & unset) == 0))
 			return;
 	}
 }
 
-void analyzer_read_start(libusb_device_handle *devh)
+SR_PRIV void analyzer_read_start(libusb_device_handle *devh)
 {
 	int i;
 
@@ -335,19 +335,19 @@ void analyzer_read_start(libusb_device_handle *devh)
 		(void)gl_reg_read(devh, READ_RAM_STATUS);
 }
 
-int analyzer_read_data(libusb_device_handle *devh, void *buffer,
+SR_PRIV int analyzer_read_data(libusb_device_handle *devh, void *buffer,
 		       unsigned int size)
 {
 	return gl_read_bulk(devh, buffer, size);
 }
 
-void analyzer_read_stop(libusb_device_handle *devh)
+SR_PRIV void analyzer_read_stop(libusb_device_handle *devh)
 {
 	analyzer_write_status(devh, 3, STATUS_FLAG_20);
 	analyzer_write_status(devh, 3, STATUS_FLAG_NONE);
 }
 
-void analyzer_start(libusb_device_handle *devh)
+SR_PRIV void analyzer_start(libusb_device_handle *devh)
 {
 	analyzer_write_status(devh, 1, STATUS_FLAG_NONE);
 	analyzer_write_status(devh, 1, STATUS_FLAG_INIT);
@@ -355,7 +355,7 @@ void analyzer_start(libusb_device_handle *devh)
 	analyzer_write_status(devh, 1, STATUS_FLAG_GO);
 }
 
-void analyzer_configure(libusb_device_handle *devh)
+SR_PRIV void analyzer_configure(libusb_device_handle *devh)
 {
 	int i;
 
@@ -405,7 +405,7 @@ void analyzer_configure(libusb_device_handle *devh)
 	__analyzer_set_compression(devh, g_compression);
 }
 
-void analyzer_add_trigger(int channel, int type)
+SR_PRIV void analyzer_add_trigger(int channel, int type)
 {
 	int i;
 
@@ -448,7 +448,7 @@ void analyzer_add_trigger(int channel, int type)
 	}
 }
 
-void analyzer_add_filter(int channel, int type)
+SR_PRIV void analyzer_add_filter(int channel, int type)
 {
 	int i;
 
@@ -479,73 +479,72 @@ void analyzer_add_filter(int channel, int type)
 	g_filter_enable = 1;
 }
 
-void analyzer_set_trigger_count(int count)
+SR_PRIV void analyzer_set_trigger_count(int count)
 {
 	g_trigger_count = count;
 }
 
-void analyzer_set_freq(int freq, int scale)
+SR_PRIV void analyzer_set_freq(int freq, int scale)
 {
 	g_freq_value = freq;
 	g_freq_scale = scale;
 }
 
-void analyzer_set_memory_size(unsigned int size)
+SR_PRIV void analyzer_set_memory_size(unsigned int size)
 {
 	g_memory_size = size;
 }
 
-void analyzer_set_ramsize_trigger_address(unsigned int address)
+SR_PRIV void analyzer_set_ramsize_trigger_address(unsigned int address)
 {
 	g_ramsize_triggerbar_addr = address;
 }
 
-void analyzer_set_triggerbar_address(unsigned int address)
+SR_PRIV void analyzer_set_triggerbar_address(unsigned int address)
 {
 	g_triggerbar_addr = address;
 }
 
-unsigned int analyzer_read_id(libusb_device_handle *devh)
+SR_PRIV unsigned int analyzer_read_id(libusb_device_handle *devh)
 {
-	return gl_reg_read(devh, DEVICE_ID1) << 8 | gl_reg_read(devh,
-								DEVICE_ID0);
+	return gl_reg_read(devh, DEV_ID1) << 8 | gl_reg_read(devh, DEV_ID0);
 }
 
-unsigned int analyzer_get_stop_address(libusb_device_handle *devh)
+SR_PRIV unsigned int analyzer_get_stop_address(libusb_device_handle *devh)
 {
 	return gl_reg_read(devh, STOP_ADDRESS2) << 16 | gl_reg_read(devh,
 			STOP_ADDRESS1) << 8 | gl_reg_read(devh, STOP_ADDRESS0);
 }
 
-unsigned int analyzer_get_now_address(libusb_device_handle *devh)
+SR_PRIV unsigned int analyzer_get_now_address(libusb_device_handle *devh)
 {
 	return gl_reg_read(devh, NOW_ADDRESS2) << 16 | gl_reg_read(devh,
 			NOW_ADDRESS1) << 8 | gl_reg_read(devh, NOW_ADDRESS0);
 }
 
-unsigned int analyzer_get_trigger_address(libusb_device_handle *devh)
+SR_PRIV unsigned int analyzer_get_trigger_address(libusb_device_handle *devh)
 {
 	return gl_reg_read(devh, TRIGGER_ADDRESS2) << 16 | gl_reg_read(devh,
 		TRIGGER_ADDRESS1) << 8 | gl_reg_read(devh, TRIGGER_ADDRESS0);
 }
 
-void analyzer_set_compression(unsigned int type)
+SR_PRIV void analyzer_set_compression(unsigned int type)
 {
 	g_compression = type;
 }
 
-void analyzer_wait_button(libusb_device_handle *devh)
+SR_PRIV void analyzer_wait_button(libusb_device_handle *devh)
 {
 	analyzer_wait(devh, STATUS_BUTTON_PRESSED, 0);
 }
 
-void analyzer_wait_data(libusb_device_handle *devh)
+SR_PRIV void analyzer_wait_data(libusb_device_handle *devh)
 {
 	analyzer_wait(devh, STATUS_READY | 8, STATUS_BUSY);
 }
 
-int analyzer_decompress(void *input, unsigned int input_len, void *output,
-			unsigned int output_len)
+SR_PRIV int analyzer_decompress(void *input, unsigned int input_len,
+				void *output, unsigned int output_len)
 {
 	unsigned char *in = input;
 	unsigned char *out = output;