140-avoid-libusb-name-conflicts.patch (7577B)
1 --- a/lib/Device/USB.pm 2 +++ b/lib/Device/USB.pm 3 @@ -15,6 +15,7 @@ use Inline ( 4 ($ENV{LIBUSB_INCDIR} ? ( INC => "-I\"$ENV{LIBUSB_INCDIR}\"" ) : () ), 5 NAME => 'Device::USB', 6 VERSION => '0.36', 7 + PREFIX => 'deviceusb_', 8 ); 9 10 Inline->init(); 11 @@ -540,74 +541,74 @@ unsigned DeviceUSBDebugLevel() 12 return debugLevel; 13 } 14 15 -void libusb_init() 16 +void deviceusb_libusb_init() 17 { 18 usb_init(); 19 } 20 21 -int libusb_find_busses() 22 +int deviceusb_libusb_find_busses() 23 { 24 return usb_find_busses(); 25 } 26 27 -int libusb_find_devices() 28 +int deviceusb_libusb_find_devices() 29 { 30 return usb_find_devices(); 31 } 32 33 -void *libusb_get_busses() 34 +void *deviceusb_libusb_get_busses() 35 { 36 return usb_get_busses(); 37 } 38 39 -void *libusb_open(void *dev) 40 +void *deviceusb_libusb_open(void *dev) 41 { 42 return usb_open( (struct usb_device*)dev ); 43 } 44 45 -int libusb_close(void *dev) 46 +int deviceusb_libusb_close(void *dev) 47 { 48 return usb_close((usb_dev_handle *)dev); 49 } 50 51 -int libusb_set_configuration(void *dev, int configuration) 52 +int deviceusb_libusb_set_configuration(void *dev, int configuration) 53 { 54 if(DeviceUSBDebugLevel()) 55 { 56 - printf( "libusb_set_configuration( %d )\n", configuration ); 57 + printf( "deviceusb_libusb_set_configuration( %d )\n", configuration ); 58 } 59 return usb_set_configuration((usb_dev_handle *)dev, configuration); 60 } 61 62 -int libusb_set_altinterface(void *dev, int alternate) 63 +int deviceusb_libusb_set_altinterface(void *dev, int alternate) 64 { 65 if(DeviceUSBDebugLevel()) 66 { 67 - printf( "libusb_set_altinterface( %d )\n", alternate ); 68 + printf( "deviceusb_libusb_set_altinterface( %d )\n", alternate ); 69 } 70 return usb_set_altinterface((usb_dev_handle *)dev, alternate); 71 } 72 73 -int libusb_clear_halt(void *dev, unsigned int ep) 74 +int deviceusb_libusb_clear_halt(void *dev, unsigned int ep) 75 { 76 if(DeviceUSBDebugLevel()) 77 { 78 - printf( "libusb_clear_halt( %d )\n", ep ); 79 + printf( "deviceusb_libusb_clear_halt( %d )\n", ep ); 80 } 81 return usb_clear_halt((usb_dev_handle *)dev, ep); 82 } 83 84 -int libusb_reset(void *dev) 85 +int deviceusb_libusb_reset(void *dev) 86 { 87 return usb_reset((usb_dev_handle *)dev); 88 } 89 90 -int libusb_get_driver_np(void *dev, int interface, char *name, unsigned int namelen) 91 +int deviceusb_libusb_get_driver_np(void *dev, int interface, char *name, unsigned int namelen) 92 { 93 int ret = 0; 94 if(DeviceUSBDebugLevel()) 95 { 96 - printf( "libusb_get_driver_np( %d )\n", interface ); 97 + printf( "deviceusb_libusb_get_driver_np( %d )\n", interface ); 98 } 99 #if LIBUSB_HAS_GET_DRIVER_NP 100 ret = usb_get_driver_np((usb_dev_handle *)dev, interface, name, namelen); 101 @@ -618,11 +619,11 @@ int libusb_get_driver_np(void *dev, int 102 #endif 103 } 104 105 -int libusb_detach_kernel_driver_np(void *dev, int interface) 106 +int deviceusb_libusb_detach_kernel_driver_np(void *dev, int interface) 107 { 108 if(DeviceUSBDebugLevel()) 109 { 110 - printf( "libusb_detach_kernel_driver_np( %d )\n", interface ); 111 + printf( "deviceusb_libusb_detach_kernel_driver_np( %d )\n", interface ); 112 } 113 #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP 114 return usb_detach_kernel_driver_np((usb_dev_handle *)dev, interface); 115 @@ -631,25 +632,25 @@ int libusb_detach_kernel_driver_np(void 116 #endif 117 } 118 119 -int libusb_claim_interface(void *dev, int interface) 120 +int deviceusb_libusb_claim_interface(void *dev, int interface) 121 { 122 if(DeviceUSBDebugLevel()) 123 { 124 - printf( "libusb_claim_interface( %d )\n", interface ); 125 + printf( "deviceusb_libusb_claim_interface( %d )\n", interface ); 126 } 127 return usb_claim_interface((usb_dev_handle *)dev, interface); 128 } 129 130 -int libusb_release_interface(void *dev, int interface) 131 +int deviceusb_libusb_release_interface(void *dev, int interface) 132 { 133 if(DeviceUSBDebugLevel()) 134 { 135 - printf( "libusb_release_interface( %d )\n", interface ); 136 + printf( "deviceusb_libusb_release_interface( %d )\n", interface ); 137 } 138 return usb_release_interface((usb_dev_handle *)dev, interface); 139 } 140 141 -void libusb_control_msg(void *dev, int requesttype, int request, int value, int index, char *bytes, int size, int timeout) 142 +void deviceusb_libusb_control_msg(void *dev, int requesttype, int request, int value, int index, char *bytes, int size, int timeout) 143 { 144 int i = 0; 145 int retval = 0; 146 @@ -658,7 +659,7 @@ void libusb_control_msg(void *dev, int r 147 148 if(DeviceUSBDebugLevel()) 149 { 150 - printf( "libusb_control_msg( %#04x, %#04x, %#04x, %#04x, %p, %d, %d )\n", 151 + printf( "deviceusb_libusb_control_msg( %#04x, %#04x, %#04x, %#04x, %p, %d, %d )\n", 152 requesttype, request, value, index, bytes, size, timeout 153 ); 154 /* maybe need to add support for printing the bytes string. */ 155 @@ -691,54 +692,54 @@ void libusb_control_msg(void *dev, int r 156 Inline_Stack_Done; 157 } 158 159 -int libusb_get_string(void *dev, int index, int langid, char *buf, size_t buflen) 160 +int deviceusb_libusb_get_string(void *dev, int index, int langid, char *buf, size_t buflen) 161 { 162 if(DeviceUSBDebugLevel()) 163 { 164 - printf( "libusb_get_string( %d, %d, %p, %lu )\n", 165 + printf( "deviceusb_libusb_get_string( %d, %d, %p, %lu )\n", 166 index, langid, buf, (unsigned long)buflen 167 ); 168 } 169 return usb_get_string((usb_dev_handle *)dev, index, langid, buf, buflen); 170 } 171 172 -int libusb_get_string_simple(void *dev, int index, char *buf, size_t buflen) 173 +int deviceusb_libusb_get_string_simple(void *dev, int index, char *buf, size_t buflen) 174 { 175 if(DeviceUSBDebugLevel()) 176 { 177 - printf( "libusb_get_string_simple( %d, %p, %lu )\n", 178 + printf( "deviceusb_libusb_get_string_simple( %d, %p, %lu )\n", 179 index, buf, (unsigned long)buflen 180 ); 181 } 182 return usb_get_string_simple((usb_dev_handle *)dev, index, buf, buflen); 183 } 184 185 -int libusb_get_descriptor(void *dev, unsigned char type, unsigned char index, char *buf, int size) 186 +int deviceusb_libusb_get_descriptor(void *dev, unsigned char type, unsigned char index, char *buf, int size) 187 { 188 return usb_get_descriptor((usb_dev_handle *)dev, type, index, buf, size); 189 } 190 191 -int libusb_get_descriptor_by_endpoint(void *dev, int ep, unsigned char type, unsigned char index, char *buf, int size) 192 +int deviceusb_libusb_get_descriptor_by_endpoint(void *dev, int ep, unsigned char type, unsigned char index, char *buf, int size) 193 { 194 return usb_get_descriptor_by_endpoint((usb_dev_handle *)dev, ep, type, index, buf, size); 195 } 196 197 -int libusb_bulk_write(void *dev, int ep, char *bytes, int size, int timeout) 198 +int deviceusb_libusb_bulk_write(void *dev, int ep, char *bytes, int size, int timeout) 199 { 200 return usb_bulk_write((usb_dev_handle *)dev, ep, bytes, size, timeout); 201 } 202 203 -int libusb_bulk_read(void *dev, int ep, char *bytes, int size, int timeout) 204 +int deviceusb_libusb_bulk_read(void *dev, int ep, char *bytes, int size, int timeout) 205 { 206 return usb_bulk_read((usb_dev_handle *)dev, ep, bytes, size, timeout); 207 } 208 209 -int libusb_interrupt_write(void *dev, int ep, char *bytes, int size, int timeout) 210 +int deviceusb_libusb_interrupt_write(void *dev, int ep, char *bytes, int size, int timeout) 211 { 212 return usb_interrupt_write((usb_dev_handle *)dev, ep, bytes, size, timeout); 213 } 214 215 -int libusb_interrupt_read(void *dev, int ep, char *bytes, int size, int timeout) 216 +int deviceusb_libusb_interrupt_read(void *dev, int ep, char *bytes, int size, int timeout) 217 { 218 return usb_interrupt_read((usb_dev_handle *)dev, ep, bytes, size, timeout); 219 }