X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fgl_usb.h;h=c3a33fb34fb35d867fc14bdddb180472fe826d17;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hp=2bc1d93863ff7cb40519257b530250ac1b258cbe;hpb=185ae2c5c9ada0353b43e3736e838bbc8e370cb4;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/gl_usb.h b/hardware/zeroplus-logic-cube/gl_usb.h
index 2bc1d938..c3a33fb3 100644
--- a/hardware/zeroplus-logic-cube/gl_usb.h
+++ b/hardware/zeroplus-logic-cube/gl_usb.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010 Sven Peter <sven@fail0verflow.com>
  * Copyright (C) 2010 Haxx Enterprises <bushing@gmail.com>
@@ -29,23 +29,17 @@
  *  THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SIGROK_ZEROPLUS_GL_H
-#define SIGROK_ZEROPLUS_GL_H
+#ifndef LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_GL_USB_H
+#define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_GL_USB_H
 
 #include <libusb.h>
+#include "libsigrok.h"
 
-#define GL_OK		 0
-#define GL_ELIBUSB	-1
-#define GL_EOPEN	-2
-#define GL_ESETCONFIG	-3
-#define GL_ECLAIM	-4
-
-int gl_write_address(libusb_device_handle *devh, unsigned int address);
-int gl_write_data(libusb_device_handle *devh, unsigned int val);
-int gl_read_data(libusb_device_handle *devh);
-int gl_read_bulk(libusb_device_handle *devh, void *buffer, unsigned int size);
-int gl_reg_write(libusb_device_handle *devh, unsigned int reg,
-		 unsigned int val);
-int gl_reg_read(libusb_device_handle *devh, unsigned int reg);
-
+SR_PRIV int gl_read_bulk(libusb_device_handle *devh, void *buffer,
+			 unsigned int size);
+SR_PRIV int gl_reg_write(libusb_device_handle *devh, unsigned int reg,
+			 unsigned int val);
+SR_PRIV int gl_reg_read(libusb_device_handle *devh, unsigned int reg);
+SR_PRIV int gl_reg_read_buf(libusb_device_handle *devh, unsigned int reg,
+			unsigned char *buf, unsigned int len);
 #endif