replace a magic value by its name

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 2eece1e76344b45ed0ce229c71f97ba7563bc93d..264da44c0eaec66203ddda05a4c5c474dd07e79b 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -21,7 +21,7 @@
 #include <usb.h>
 #include <signal.h>
 #include <pthread.h>
 #include <usb.h>
 #include <signal.h>
 #include <pthread.h>

-#include "xilinx.h"
+#include "usb-driver.h"

 
 static int (*ioctl_func) (int, int, void *) = NULL;
 static int windrvrfd = 0;
 
 static int (*ioctl_func) (int, int, void *) = NULL;
 static int windrvrfd = 0;


@@ -37,6 +37,7 @@ static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 #define NO_WINDRVR 1
 #undef DEBUG
 
 #define NO_WINDRVR 1
 #undef DEBUG
 

+#ifdef DEBUG

 void hexdump(unsigned char *buf, int len) {
        int i;
 
 void hexdump(unsigned char *buf, int len) {
        int i;
 


@@ -46,6 +47,7 @@ void hexdump(unsigned char *buf, int len) {
                        fprintf(stderr,"\n");
        }
 }
                        fprintf(stderr,"\n");
        }
 }

+#endif

 
 int usb_deviceinfo(unsigned char *buf) {
        int i,j,k,l;
 
 int usb_deviceinfo(unsigned char *buf) {
        int i,j,k,l;


@@ -75,7 +77,7 @@ int usb_deviceinfo(unsigned char *buf) {
                udi->Pipe0.dwNumber = 0x00;
                udi->Pipe0.dwMaximumPacketSize = usbdevice->descriptor.bMaxPacketSize0;
                udi->Pipe0.type = 0;
                udi->Pipe0.dwNumber = 0x00;
                udi->Pipe0.dwMaximumPacketSize = usbdevice->descriptor.bMaxPacketSize0;
                udi->Pipe0.type = 0;

-               udi->Pipe0.direction = 3;
+               udi->Pipe0.direction = WDU_DIR_IN_OUT;

                udi->Pipe0.dwInterval = 0;
 
                pConfigs = &(udi->pConfigs);
                udi->Pipe0.dwInterval = 0;
 
                pConfigs = &(udi->pConfigs);


@@ -512,9 +514,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                                it->dwCounter = 1;
                                        } else {
                                                pthread_mutex_lock(&int_wait);
                                                it->dwCounter = 1;
                                        } else {
                                                pthread_mutex_lock(&int_wait);

+                                               pthread_mutex_unlock(&int_wait);

                                        }
                                } else {
                                        pthread_mutex_lock(&int_wait);
                                        }
                                } else {
                                        pthread_mutex_lock(&int_wait);

+                                       pthread_mutex_unlock(&int_wait);

                                }
 #endif
 
                                }
 #endif
 


@@ -585,8 +589,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
        return ret;
 }
 
        return ret;
 }
 

-int ioctl(int fd, int request, ...)
-{
+int ioctl(int fd, int request, ...) {

        va_list args;
        void *argp;
        int ret;
        va_list args;
        void *argp;
        int ret;


@@ -606,17 +609,14 @@ int ioctl(int fd, int request, ...)
        return ret;
 }
 
        return ret;
 }
 

-typedef int (*open_funcptr_t) (const char *, int, mode_t);
-
-int open (const char *pathname, int flags, ...)
-{
-       static open_funcptr_t func = NULL;
+int open (const char *pathname, int flags, ...) {
+       static int (*func) (const char *, int, mode_t) = NULL;

        mode_t mode = 0;
        va_list args;
        int fd;
 
        if (!func)
        mode_t mode = 0;
        va_list args;
        int fd;
 
        if (!func)

-               func = (open_funcptr_t) dlsym (REAL_LIBC, "open");
+               func = (int (*) (const char *, int, mode_t)) dlsym (REAL_LIBC, "open");

 
        if (flags & O_CREAT) {
                va_start(args, flags);
 
        if (flags & O_CREAT) {
                va_start(args, flags);