Consistently use _exit prefix for functions.

[libsigrok.git] / hardware / common / misc.c

diff --git a/hardware/common/misc.c b/hardware/common/misc.c
index 6635083f5574156ae843c6371169ef276d0c32ec..03fe2689c6f308d5717d05d1925f7e791a5103fb 100644 (file)
--- a/hardware/common/misc.c
+++ b/hardware/common/misc.c
@@ -22,7 +22,7 @@
 #include <libusb.h>
 #include <sigrok.h>
 
-int opendev2(int device_index, struct sigrok_device_instance **sdi,
+int opendev2(int device_index, struct sr_device_instance **sdi,
             libusb_device *dev, struct libusb_device_descriptor *des,
             int *skip, uint16_t vid, uint16_t pid, int interface)
 {
@@ -48,7 +48,7 @@ int opendev2(int device_index, struct sigrok_device_instance **sdi,
         */
        if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
                (*sdi)->usb->address = libusb_get_device_address(dev);
-               (*sdi)->status = ST_ACTIVE;
+               (*sdi)->status = SR_ST_ACTIVE;
                g_message("opened device %d on %d.%d interface %d",
                          (*sdi)->index, (*sdi)->usb->bus,
                          (*sdi)->usb->address, interface);
@@ -60,7 +60,7 @@ int opendev2(int device_index, struct sigrok_device_instance **sdi,
        return 0;
 }
 
-int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
+int opendev3(struct sr_device_instance **sdi, libusb_device *dev,
             struct libusb_device_descriptor *des,
             uint16_t vid, uint16_t pid, int interface)
 {
@@ -78,7 +78,7 @@ int opendev3(struct sigrok_device_instance **sdi, libusb_device *dev,
            && libusb_get_device_address(dev) == (*sdi)->usb->address) {
                /* Found it. */
                if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
-                       (*sdi)->status = ST_ACTIVE;
+                       (*sdi)->status = SR_ST_ACTIVE;
                        g_message("opened device %d on %d.%d interface %d",
                                  (*sdi)->index, (*sdi)->usb->bus,
                                  (*sdi)->usb->address, interface);