X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=ab48aa55cc3440fd775d8703bfdb50252b8f4103;hb=a00ba012288726678e1a270961c8d4f46f3dbd33;hp=639547afb52bba66335d9b279a8e7d22faf23db1;hpb=f50f3f40d9238b0c50be67e52bc132aadfcf2050;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 639547af..ab48aa55 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -72,7 +72,7 @@ static int capabilities[] = {
 	0,
 };
 
-/* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */
+/* List of struct sr_device_instance, maintained by opendev()/closedev(). */
 static GSList *device_instances = NULL;
 
 static libusb_context *usb_context = NULL;
@@ -140,7 +140,7 @@ static unsigned int get_memory_size(int type)
 		return 0;
 }
 
-static int opendev4(struct sigrok_device_instance **sdi, libusb_device *dev,
+static int opendev4(struct sr_device_instance **sdi, libusb_device *dev,
 		    struct libusb_device_descriptor *des)
 {
 	unsigned int i;
@@ -189,14 +189,14 @@ static int opendev4(struct sigrok_device_instance **sdi, libusb_device *dev,
 	return 0;
 }
 
-struct sigrok_device_instance *zp_open_device(int device_index)
+struct sr_device_instance *zp_open_device(int device_index)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	libusb_device **devlist;
 	struct libusb_device_descriptor des;
 	int err, i;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = get_sr_device_instance(device_instances, device_index)))
 		return NULL;
 
 	libusb_get_device_list(usb_context, &devlist);
@@ -219,7 +219,7 @@ struct sigrok_device_instance *zp_open_device(int device_index)
 	return sdi;
 }
 
-static void close_device(struct sigrok_device_instance *sdi)
+static void close_device(struct sr_device_instance *sdi)
 {
 	if (!sdi->usb->devhdl)
 		return;
@@ -275,7 +275,7 @@ static int configure_probes(GSList *probes)
 
 static int hw_init(char *deviceinfo)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	struct libusb_device_descriptor des;
 	libusb_device **devlist;
 	int err, devcnt, i;
@@ -305,7 +305,7 @@ static int hw_init(char *deviceinfo)
 			 * TODO: Any way to detect specific model/version in
 			 * the zeroplus range?
 			 */
-			sdi = sigrok_device_instance_new(devcnt,
+			sdi = sr_device_instance_new(devcnt,
 					ST_INACTIVE, USB_VENDOR_NAME,
 					USB_MODEL_NAME, USB_MODEL_VERSION);
 			if (!sdi)
@@ -325,7 +325,7 @@ static int hw_init(char *deviceinfo)
 
 static int hw_opendev(int device_index)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	int err;
 
 	if (!(sdi = zp_open_device(device_index))) {
@@ -370,9 +370,9 @@ static int hw_opendev(int device_index)
 
 static void hw_closedev(int device_index)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 
-	if ((sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if ((sdi = get_sr_device_instance(device_instances, device_index)))
 		close_device(sdi);
 }
 
@@ -382,7 +382,7 @@ static void hw_cleanup(void)
 
 	/* Properly close all devices... */
 	for (l = device_instances; l; l = l->next)
-		close_device((struct sigrok_device_instance *)l->data);
+		close_device((struct sr_device_instance *)l->data);
 
 	/* ...and free all their memory. */
 	for (l = device_instances; l; l = l->next)
@@ -397,10 +397,10 @@ static void hw_cleanup(void)
 
 static void *hw_get_device_info(int device_index, int device_info_id)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	void *info = NULL;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = get_sr_device_instance(device_instances, device_index)))
 		return NULL;
 
 	switch (device_info_id) {
@@ -426,9 +426,9 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 
 static int hw_get_status(int device_index)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 
-	sdi = get_sigrok_device_instance(device_instances, device_index);
+	sdi = get_sr_device_instance(device_instances, device_index);
 	if (sdi)
 		return sdi->status;
 	else
@@ -458,10 +458,10 @@ static int set_configuration_samplerate(uint64_t samplerate)
 
 static int hw_set_configuration(int device_index, int capability, void *value)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	uint64_t *tmp_u64;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = get_sr_device_instance(device_instances, device_index)))
 		return SR_ERR;
 
 	switch (capability) {
@@ -481,14 +481,14 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 
 static int hw_start_acquisition(int device_index, gpointer session_device_id)
 {
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 	struct datafeed_packet packet;
 	struct datafeed_header header;
 	int res;
 	unsigned int packet_num;
 	unsigned char *buf;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = get_sr_device_instance(device_instances, device_index)))
 		return SR_ERR;
 
 	/* push configured settings to device */
@@ -548,12 +548,12 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 {
 	struct datafeed_packet packet;
-	struct sigrok_device_instance *sdi;
+	struct sr_device_instance *sdi;
 
 	packet.type = DF_END;
 	session_bus(session_device_id, &packet);
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
+	if (!(sdi = get_sr_device_instance(device_instances, device_index)))
 		return; /* TODO: Cry? */
 
 	analyzer_reset(sdi->usb->devhdl);