From 3cd5c710521bb1ab4ea829cc233925d36ac1e3ea Mon Sep 17 00:00:00 2001 From: Alex Lian Date: Fri, 1 Feb 2013 09:24:48 -0500 Subject: [PATCH] Windows: Remove unused header/stub - Likely from before proper libusb reference --- windows/usb/include/usb.h | 408 ------------------------------------ windows/usb/src/usbstub.cpp | 294 -------------------------- 2 files changed, 702 deletions(-) delete mode 100644 windows/usb/include/usb.h delete mode 100644 windows/usb/src/usbstub.cpp diff --git a/windows/usb/include/usb.h b/windows/usb/include/usb.h deleted file mode 100644 index 663749e..0000000 --- a/windows/usb/include/usb.h +++ /dev/null @@ -1,408 +0,0 @@ -/* - * from the libusb-win32 project - * - * Copyright (c) 2000-2003 Johannes Erdfelt - * - * This library is covered by the LGPL, read LICENSE for details. - * - */ - -/* - * $Id: usb.h 1220 2010-05-04 03:14:56Z roger.brown $ - */ - - -#ifndef __USB_H__ -#define __USB_H__ - -#include -#include - -/* - * 'interface' is defined somewhere in the Windows header files. This macro - * is deleted here to avoid conflicts and compile errors. - */ - -#ifdef interface -#undef interface -#endif - -/* - * PATH_MAX from limits.h can't be used on Windows if the dll and - * import libraries are build/used by different compilers - */ - -#define LIBUSB_PATH_MAX 512 - - -/* - * USB spec information - * - * This is all stuff grabbed from various USB specs and is pretty much - * not subject to change - */ - -/* - * Device and/or Interface Class codes - */ -#define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */ -#define USB_CLASS_AUDIO 1 -#define USB_CLASS_COMM 2 -#define USB_CLASS_HID 3 -#define USB_CLASS_PRINTER 7 -#define USB_CLASS_MASS_STORAGE 8 -#define USB_CLASS_HUB 9 -#define USB_CLASS_DATA 10 -#define USB_CLASS_VENDOR_SPEC 0xff - -/* - * Descriptor types - */ -#define USB_DT_DEVICE 0x01 -#define USB_DT_CONFIG 0x02 -#define USB_DT_STRING 0x03 -#define USB_DT_INTERFACE 0x04 -#define USB_DT_ENDPOINT 0x05 - -#define USB_DT_HID 0x21 -#define USB_DT_REPORT 0x22 -#define USB_DT_PHYSICAL 0x23 -#define USB_DT_HUB 0x29 - -/* - * Descriptor sizes per descriptor type - */ -#define USB_DT_DEVICE_SIZE 18 -#define USB_DT_CONFIG_SIZE 9 -#define USB_DT_INTERFACE_SIZE 9 -#define USB_DT_ENDPOINT_SIZE 7 -#define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* Audio extension */ -#define USB_DT_HUB_NONVAR_SIZE 7 - - -/* ensure byte-packed structures */ -#include - - -/* All standard descriptors have these 2 fields in common */ -struct usb_descriptor_header { - unsigned char bLength; - unsigned char bDescriptorType; -}; - -/* String descriptor */ -struct usb_string_descriptor { - unsigned char bLength; - unsigned char bDescriptorType; - unsigned short wData[1]; -}; - -/* HID descriptor */ -struct usb_hid_descriptor { - unsigned char bLength; - unsigned char bDescriptorType; - unsigned short bcdHID; - unsigned char bCountryCode; - unsigned char bNumDescriptors; -}; - -/* Endpoint descriptor */ -#define USB_MAXENDPOINTS 32 -struct usb_endpoint_descriptor { - unsigned char bLength; - unsigned char bDescriptorType; - unsigned char bEndpointAddress; - unsigned char bmAttributes; - unsigned short wMaxPacketSize; - unsigned char bInterval; - unsigned char bRefresh; - unsigned char bSynchAddress; - - unsigned char *extra; /* Extra descriptors */ - int extralen; -}; - -#define USB_ENDPOINT_ADDRESS_MASK 0x0f /* in bEndpointAddress */ -#define USB_ENDPOINT_DIR_MASK 0x80 - -#define USB_ENDPOINT_TYPE_MASK 0x03 /* in bmAttributes */ -#define USB_ENDPOINT_TYPE_CONTROL 0 -#define USB_ENDPOINT_TYPE_ISOCHRONOUS 1 -#define USB_ENDPOINT_TYPE_BULK 2 -#define USB_ENDPOINT_TYPE_INTERRUPT 3 - -/* Interface descriptor */ -#define USB_MAXINTERFACES 32 -struct usb_interface_descriptor { - unsigned char bLength; - unsigned char bDescriptorType; - unsigned char bInterfaceNumber; - unsigned char bAlternateSetting; - unsigned char bNumEndpoints; - unsigned char bInterfaceClass; - unsigned char bInterfaceSubClass; - unsigned char bInterfaceProtocol; - unsigned char iInterface; - - struct usb_endpoint_descriptor *endpoint; - - unsigned char *extra; /* Extra descriptors */ - int extralen; -}; - -#define USB_MAXALTSETTING 128 /* Hard limit */ - -struct usb_interface { - struct usb_interface_descriptor *altsetting; - - int num_altsetting; -}; - -/* Configuration descriptor information.. */ -#define USB_MAXCONFIG 8 -struct usb_config_descriptor { - unsigned char bLength; - unsigned char bDescriptorType; - unsigned short wTotalLength; - unsigned char bNumInterfaces; - unsigned char bConfigurationValue; - unsigned char iConfiguration; - unsigned char bmAttributes; - unsigned char MaxPower; - - struct usb_interface *interface; - - unsigned char *extra; /* Extra descriptors */ - int extralen; -}; - -/* Device descriptor */ -struct usb_device_descriptor { - unsigned char bLength; - unsigned char bDescriptorType; - unsigned short bcdUSB; - unsigned char bDeviceClass; - unsigned char bDeviceSubClass; - unsigned char bDeviceProtocol; - unsigned char bMaxPacketSize0; - unsigned short idVendor; - unsigned short idProduct; - unsigned short bcdDevice; - unsigned char iManufacturer; - unsigned char iProduct; - unsigned char iSerialNumber; - unsigned char bNumConfigurations; -}; - -struct usb_ctrl_setup { - unsigned char bRequestType; - unsigned char bRequest; - unsigned short wValue; - unsigned short wIndex; - unsigned short wLength; -}; - -/* - * Standard requests - */ -#define USB_REQ_GET_STATUS 0x00 -#define USB_REQ_CLEAR_FEATURE 0x01 -/* 0x02 is reserved */ -#define USB_REQ_SET_FEATURE 0x03 -/* 0x04 is reserved */ -#define USB_REQ_SET_ADDRESS 0x05 -#define USB_REQ_GET_DESCRIPTOR 0x06 -#define USB_REQ_SET_DESCRIPTOR 0x07 -#define USB_REQ_GET_CONFIGURATION 0x08 -#define USB_REQ_SET_CONFIGURATION 0x09 -#define USB_REQ_GET_INTERFACE 0x0A -#define USB_REQ_SET_INTERFACE 0x0B -#define USB_REQ_SYNCH_FRAME 0x0C - -#define USB_TYPE_STANDARD (0x00 << 5) -#define USB_TYPE_CLASS (0x01 << 5) -#define USB_TYPE_VENDOR (0x02 << 5) -#define USB_TYPE_RESERVED (0x03 << 5) - -#define USB_RECIP_DEVICE 0x00 -#define USB_RECIP_INTERFACE 0x01 -#define USB_RECIP_ENDPOINT 0x02 -#define USB_RECIP_OTHER 0x03 - -/* - * Various libusb API related stuff - */ - -#define USB_ENDPOINT_IN 0x80 -#define USB_ENDPOINT_OUT 0x00 - -/* Error codes */ -#define USB_ERROR_BEGIN 500000 - -/* - * This is supposed to look weird. This file is generated from autoconf - * and I didn't want to make this too complicated. - */ -#define USB_LE16_TO_CPU(x) - -/* Data types */ -/* struct usb_device; */ -/* struct usb_bus; */ - -struct usb_device { - struct usb_device *next, *prev; - - char filename[LIBUSB_PATH_MAX]; - - struct usb_bus *bus; - - struct usb_device_descriptor descriptor; - struct usb_config_descriptor *config; - - void *dev; /* Darwin support */ - - unsigned char devnum; - - unsigned char num_children; - struct usb_device **children; -}; - -struct usb_bus { - struct usb_bus *next, *prev; - - char dirname[LIBUSB_PATH_MAX]; - - struct usb_device *devices; - unsigned long location; - - struct usb_device *root_dev; -}; - -/* Version information, Windows specific */ -struct usb_version { - struct { - int major; - int minor; - int micro; - int nano; - } dll; - struct { - int major; - int minor; - int micro; - int nano; - } driver; -}; - - -struct usb_dev_handle; -typedef struct usb_dev_handle usb_dev_handle; - -/* Variables */ -#ifndef __USB_C__ -#define usb_busses usb_get_busses() -#endif - - - -#include - - -#ifdef __cplusplus -extern "C" { -#endif - - /* Function prototypes */ - - /* usb.c */ - usb_dev_handle *usb_open(struct usb_device *dev); - int usb_close(usb_dev_handle *dev); - int usb_get_string(usb_dev_handle *dev, int index, int langid, char *buf, - size_t buflen); - int usb_get_string_simple(usb_dev_handle *dev, int index, char *buf, - size_t buflen); - - /* descriptors.c */ - int usb_get_descriptor_by_endpoint(usb_dev_handle *udev, int ep, - unsigned char type, unsigned char index, - void *buf, int size); - int usb_get_descriptor(usb_dev_handle *udev, unsigned char type, - unsigned char index, void *buf, int size); - - /* .c */ - int usb_bulk_write(usb_dev_handle *dev, int ep, char *bytes, int size, - int timeout); - int usb_bulk_read(usb_dev_handle *dev, int ep, char *bytes, int size, - int timeout); - int usb_interrupt_write(usb_dev_handle *dev, int ep, char *bytes, int size, - int timeout); - int usb_interrupt_read(usb_dev_handle *dev, int ep, char *bytes, int size, - int timeout); - int usb_control_msg(usb_dev_handle *dev, int requesttype, int request, - int value, int index, char *bytes, int size, - int timeout); - int usb_set_configuration(usb_dev_handle *dev, int configuration); - int usb_claim_interface(usb_dev_handle *dev, int interface); - int usb_release_interface(usb_dev_handle *dev, int interface); - int usb_set_altinterface(usb_dev_handle *dev, int alternate); - int usb_resetep(usb_dev_handle *dev, unsigned int ep); - int usb_clear_halt(usb_dev_handle *dev, unsigned int ep); - int usb_reset(usb_dev_handle *dev); - - char *usb_strerror(void); - - void usb_init(void); - void usb_set_debug(int level); - int usb_find_busses(void); - int usb_find_devices(void); - struct usb_device *usb_device(usb_dev_handle *dev); - struct usb_bus *usb_get_busses(void); - - - /* Windows specific functions */ - -#define LIBUSB_HAS_INSTALL_SERVICE_NP 1 - int usb_install_service_np(void); - void CALLBACK usb_install_service_np_rundll(HWND wnd, HINSTANCE instance, - LPSTR cmd_line, int cmd_show); - -#define LIBUSB_HAS_UNINSTALL_SERVICE_NP 1 - int usb_uninstall_service_np(void); - void CALLBACK usb_uninstall_service_np_rundll(HWND wnd, HINSTANCE instance, - LPSTR cmd_line, int cmd_show); - -#define LIBUSB_HAS_INSTALL_DRIVER_NP 1 - int usb_install_driver_np(const char *inf_file); - void CALLBACK usb_install_driver_np_rundll(HWND wnd, HINSTANCE instance, - LPSTR cmd_line, int cmd_show); - -#define LIBUSB_HAS_TOUCH_INF_FILE_NP 1 - int usb_touch_inf_file_np(const char *inf_file); - void CALLBACK usb_touch_inf_file_np_rundll(HWND wnd, HINSTANCE instance, - LPSTR cmd_line, int cmd_show); - -#define LIBUSB_HAS_INSTALL_NEEDS_RESTART_NP 1 - int usb_install_needs_restart_np(void); - - const struct usb_version *usb_get_version(void); - - int usb_isochronous_setup_async(usb_dev_handle *dev, void **context, - unsigned char ep, int pktsize); - int usb_bulk_setup_async(usb_dev_handle *dev, void **context, - unsigned char ep); - int usb_interrupt_setup_async(usb_dev_handle *dev, void **context, - unsigned char ep); - - int usb_submit_async(void *context, char *bytes, int size); - int usb_reap_async(void *context, int timeout); - int usb_reap_async_nocancel(void *context, int timeout); - int usb_cancel_async(void *context); - int usb_free_async(void **context); - - -#ifdef __cplusplus -} -#endif - -#endif /* __USB_H__ */ - diff --git a/windows/usb/src/usbstub.cpp b/windows/usb/src/usbstub.cpp deleted file mode 100644 index f39abb7..0000000 --- a/windows/usb/src/usbstub.cpp +++ /dev/null @@ -1,294 +0,0 @@ -/************************************************************************** - * - * Copyright 2010, Roger Brown - * - * This file is part of Roger Brown's Toolkit. - * - * Roger Brown's Toolkit is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Roger Brown's Toolkit is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Roger Brown's Toolkit. If not, see . - * - */ - -/* - * $Id: usbstub.cpp 1220 2010-05-04 03:14:56Z roger.brown $ - */ - -/* - * this is a stub loader for the LIBUSB0.DLL - */ - -#include - -#define LIBUSB_CALLTYPE __cdecl - -extern "C" -{ - typedef void (LIBUSB_CALLTYPE *voidProc)(void); -} - -class CStubLoader -{ - HMODULE hDll; - CRITICAL_SECTION cs; - const char *name; - - void bomb(DWORD dw) - { - RaiseException(dw,EXCEPTION_NONCONTINUABLE,0,0); - } - -public: - ~CStubLoader() - { -/* if (hDll) - { - FreeLibrary(hDll); - }*/ - - DeleteCriticalSection(&cs); - } - - CStubLoader(const char *n) : name(n) - { - InitializeCriticalSection(&cs); - } - - HMODULE get_dll(void) - { - HMODULE h=NULL; - DWORD dw=0; - - EnterCriticalSection(&cs); - - if (!hDll) - { - hDll=LoadLibrary(name); - if (!hDll) dw=GetLastError(); - } - - h=hDll; - - LeaveCriticalSection(&cs); - - if (!h) - { - bomb(dw); - } - - return h; - } - - voidProc GetProc(const char *name) - { - voidProc p=(voidProc)GetProcAddress(get_dll(),name); - - if (!p) - { - bomb(GetLastError()); - } - - return p; - } -}; - - -static CStubLoader libusb0("LIBUSB0"); - -extern "C" -{ -# define MAP_FN(ret,name,args) \ - typedef ret (LIBUSB_CALLTYPE *pfn_##name##_t)args; \ - static ret LIBUSB_CALLTYPE load_##name args; \ - static pfn_##name##_t pfn_##name=load_##name,test_##name=##name; - -# define LOAD_FN(name) int success=1; __try { pfn_##name=(pfn_##name##_t)libusb0.GetProc(#name); } __except(1) { success=0; } - - MAP_FN(int,usb_reset,(usb_dev_handle *dev)) - MAP_FN(int,usb_claim_interface,(usb_dev_handle *dev,int)) - MAP_FN(int,usb_find_busses,(void)) - MAP_FN(int,usb_find_devices,(void)) - MAP_FN(void,usb_init,(void)) - MAP_FN(int,usb_close,(usb_dev_handle *dev)) - MAP_FN(int,usb_bulk_write,(usb_dev_handle *,int,char *,int,int)); - MAP_FN(int,usb_bulk_read,(usb_dev_handle *,int,char *,int,int)); - MAP_FN(usb_dev_handle *,usb_open,(struct usb_device *)); - MAP_FN(int,usb_set_configuration,(usb_dev_handle *,int)); - MAP_FN(usb_bus *,usb_get_busses,(void)); - MAP_FN(int,usb_release_interface,(usb_dev_handle *,int)); - MAP_FN(int,usb_get_string_simple,(usb_dev_handle *dev, int index, char *buf,size_t buflen)); - - static int LIBUSB_CALLTYPE load_usb_reset(usb_dev_handle *dev) - { - LOAD_FN(usb_reset); - - return success ? usb_reset(dev) : -1; - } - - static int LIBUSB_CALLTYPE load_usb_claim_interface(usb_dev_handle *dev,int interface) - { - LOAD_FN(usb_claim_interface) - - return success ? usb_claim_interface(dev,interface) : -1; - } - - static int LIBUSB_CALLTYPE load_usb_release_interface(usb_dev_handle *dev,int interface) - { - LOAD_FN(usb_release_interface) - - return success ? usb_release_interface(dev,interface) : -1; - } - - static int LIBUSB_CALLTYPE load_usb_close(usb_dev_handle *dev) - { - LOAD_FN(usb_close) - - return success ? usb_close(dev) : -1; - } - - static usb_dev_handle * LIBUSB_CALLTYPE load_usb_open(struct usb_device *dev) - { - LOAD_FN(usb_open) - - return success ? usb_open(dev) : NULL; - } - - static int LIBUSB_CALLTYPE load_usb_find_devices(void) - { - LOAD_FN(usb_find_devices) - - return success ? usb_find_devices() : -1; - } - - static int LIBUSB_CALLTYPE load_usb_find_busses(void) - { - LOAD_FN(usb_find_busses) - - return success ? usb_find_busses() : -1; - } - - static int LIBUSB_CALLTYPE load_usb_set_configuration(usb_dev_handle *dev,int configuration) - { - LOAD_FN(usb_set_configuration) - - return success ? usb_set_configuration(dev,configuration) : -1; - } - - static usb_bus * LIBUSB_CALLTYPE load_usb_get_busses(void) - { - LOAD_FN(usb_get_busses) - - return success ? usb_get_busses() : NULL; - } - - static void LIBUSB_CALLTYPE load_usb_init(void) - { - LOAD_FN(usb_init) - - if (success) usb_init(); - } - - static int LIBUSB_CALLTYPE load_usb_bulk_read(usb_dev_handle *dev,int ep,char *bytes,int size,int timeout) - { - LOAD_FN(usb_bulk_read); - - return success ? usb_bulk_read(dev,ep,bytes,size,timeout) : -1; - } - - static int LIBUSB_CALLTYPE load_usb_bulk_write(usb_dev_handle *dev,int ep,char *bytes,int size,int timeout) - { - LOAD_FN(usb_bulk_write); - - return success ? usb_bulk_write(dev,ep,bytes,size,timeout) : -1; - } - - static int LIBUSB_CALLTYPE load_usb_get_string_simple(usb_dev_handle *dev, int index, char *buf, - size_t buflen) - { - LOAD_FN(usb_get_string_simple); - - return success ? usb_get_string_simple(dev,index,buf,buflen) : -1; - } -} - -int LIBUSB_CALLTYPE usb_claim_interface(usb_dev_handle *dev, int interface) -{ - return pfn_usb_claim_interface(dev,interface); -} - -int LIBUSB_CALLTYPE usb_reset(usb_dev_handle *dev) -{ - return pfn_usb_reset(dev); -} - -int LIBUSB_CALLTYPE usb_find_busses(void) -{ - return pfn_usb_find_busses(); -} - -int LIBUSB_CALLTYPE usb_find_devices(void) -{ - return pfn_usb_find_devices(); -} - -void LIBUSB_CALLTYPE usb_init(void) -{ - pfn_usb_init(); -} - -int LIBUSB_CALLTYPE usb_close(usb_dev_handle *dev) -{ - return pfn_usb_close(dev); -} - -usb_dev_handle * LIBUSB_CALLTYPE usb_open(struct usb_device *dev) -{ - return pfn_usb_open(dev); -} - -int LIBUSB_CALLTYPE usb_set_configuration(usb_dev_handle *dev, int configuration) -{ - return pfn_usb_set_configuration(dev,configuration); -} - -struct usb_bus * LIBUSB_CALLTYPE usb_get_busses(void) -{ - return pfn_usb_get_busses(); -} - -int LIBUSB_CALLTYPE usb_release_interface(usb_dev_handle *dev, int interface) -{ - return pfn_usb_release_interface(dev,interface); -} - -int LIBUSB_CALLTYPE usb_bulk_write(usb_dev_handle *dev, int ep, char *bytes, int size, - int timeout) -{ - return pfn_usb_bulk_write(dev,ep,bytes,size,timeout); -} - -int LIBUSB_CALLTYPE usb_bulk_read(usb_dev_handle *dev, int ep, char *bytes, int size, - int timeout) -{ - return pfn_usb_bulk_read(dev,ep,bytes,size,timeout); -} - -int LIBUSB_CALLTYPE usb_get_string_simple(usb_dev_handle *dev, int index, char *buf, - size_t buflen) -{ - return pfn_usb_get_string_simple(dev,index,buf,buflen); -} - - - - -