From a93be80d91180b46abce14498d7e591d4a2f44d3 Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Thu, 19 Jun 2014 23:38:26 +0200 Subject: cleanup --- pc-client.c | 159 -------------------- usbdrv/usbconfig.2.h | 384 ------------------------------------------------- usbdrv/usbconfig.2_.h | 235 ------------------------------ usbdrv/usbconfig.2__.h | 49 ------- usbdrv/usbconfig_.h | 280 ------------------------------------ usbdrv/usbconfig__.h | 105 -------------- 6 files changed, 1212 deletions(-) delete mode 100644 pc-client.c delete mode 100644 usbdrv/usbconfig.2.h delete mode 100644 usbdrv/usbconfig.2_.h delete mode 100644 usbdrv/usbconfig.2__.h delete mode 100644 usbdrv/usbconfig_.h delete mode 100644 usbdrv/usbconfig__.h diff --git a/pc-client.c b/pc-client.c deleted file mode 100644 index 1b6cb21..0000000 --- a/pc-client.c +++ /dev/null @@ -1,159 +0,0 @@ -#include -#include -#include -#include - - -#define USB_LED_OFF 0 -#define USB_LED_ON 1 - - -/* Used to get descriptor strings for device identification */ -static int usbGetDescriptorString(usb_dev_handle *dev, int index, int langid, - char *buf, int buflen) { - char buffer[256]; - int rval, i; - - // make standard request GET_DESCRIPTOR, type string and given index - // (e.g. dev->iProduct) - rval = usb_control_msg(dev, - USB_TYPE_STANDARD | USB_RECIP_DEVICE | USB_ENDPOINT_IN, - USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) + index, langid, - buffer, sizeof(buffer), 1000); - - if(rval < 0) // error - return rval; - - // rval should be bytes read, but buffer[0] contains the actual response size - if((unsigned char)buffer[0] < rval) - rval = (unsigned char)buffer[0]; // string is shorter than bytes read - - if(buffer[1] != USB_DT_STRING) // second byte is the data type - return 0; // invalid return type - - // we're dealing with UTF-16LE here so actual chars is half of rval, - // and index 0 doesn't count - rval /= 2; - - /* lossy conversion to ISO Latin1 */ - for(i = 1; i < rval && i < buflen; i++) { - if(buffer[2 * i + 1] == 0) - buf[i-1] = buffer[2 * i]; - else - buf[i-1] = '?'; /* outside of ISO Latin1 range */ - } - buf[i-1] = 0; - - return i-1; -} - -static usb_dev_handle * usbOpenDevice(int vendor, char *vendorName, - int product, char *productName) { - struct usb_bus *bus; - struct usb_device *dev; - char devVendor[256], devProduct[256]; - - usb_dev_handle * handle = NULL; - - usb_init(); - usb_find_busses(); - usb_find_devices(); - - for(bus=usb_get_busses(); bus; bus=bus->next) { - for(dev=bus->devices; dev; dev=dev->next) { - if(dev->descriptor.idVendor != vendor || - dev->descriptor.idProduct != product) - continue; - - /* we need to open the device in order to query strings */ - if(!(handle = usb_open(dev))) { - fprintf(stderr, "Warning: cannot open USB device: %s\n", - usb_strerror()); - continue; - } - - /* get vendor name */ - if(usbGetDescriptorString(handle, dev->descriptor.iManufacturer, - 0x0409, devVendor, sizeof(devVendor)) < 0) { - fprintf(stderr, - "Warning: cannot query manufacturer for device: %s\n", - usb_strerror()); - usb_close(handle); - continue; - } - - /* get product name */ - if(usbGetDescriptorString(handle, dev->descriptor.iProduct, - 0x0409, devProduct, sizeof(devVendor)) < 0) { - fprintf(stderr, - "Warning: cannot query product for device: %s\n", - usb_strerror()); - usb_close(handle); - continue; - } - - if(strcmp(devVendor, vendorName) == 0 && - strcmp(devProduct, productName) == 0) - return handle; - else - usb_close(handle); - } - } - - return NULL; -} - -int main(int argc, char **argv) { - usb_dev_handle *handle = NULL; - int nBytes = 0; - char buffer[256]; - - if(argc < 2) { - printf("Usage:\n"); - printf("usbtext.exe on\n"); - printf("usbtext.exe off\n"); - exit(1); - } - - handle = usbOpenDevice(0x16C0, "windfisch.org", 0x05DC, "Flo Test"); - - if(handle == NULL) { - fprintf(stderr, "Could not find USB device!\n"); - exit(1); - } - - if(strcmp(argv[1], "on") == 0) { - nBytes = usb_control_msg(handle, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, - USB_LED_ON, 0, 0, (char *)buffer, sizeof(buffer), 5000); - } else if(strcmp(argv[1], "off") == 0) { - nBytes = usb_control_msg(handle, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, - USB_LED_OFF, 0, 0, (char *)buffer, sizeof(buffer), 5000); - } else if (strcmp(argv[1], "read") == 0) { - char buffer[1024]; - nBytes = usb_control_msg(handle, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, - 2, 0, 0, buffer, sizeof(buffer), 5000); - printf("received %i bytes: %s\n", nBytes, buffer); - } else if (strcmp(argv[1], "change") == 0) { - nBytes = usb_control_msg(handle, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, - 3, 32, 4, buffer, sizeof(buffer), 5000); - buffer[nBytes]=0; - printf("received %i bytes: %s\n", nBytes, buffer); - } else if (strcmp(argv[1], "write") == 0) { - nBytes = usb_control_msg(handle, - USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, - 4, 0, 0, argv[2], strlen(argv[2])+1, 5000); - buffer[nBytes]=0; - printf("received %i bytes: %s\n", nBytes, buffer); - } - - if(nBytes < 0) - fprintf(stderr, "USB error: %s\n", usb_strerror()); - - usb_close(handle); - - return 0; -} diff --git a/usbdrv/usbconfig.2.h b/usbdrv/usbconfig.2.h deleted file mode 100644 index 48d4a93..0000000 --- a/usbdrv/usbconfig.2.h +++ /dev/null @@ -1,384 +0,0 @@ -/* Name: usbconfig.h - * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers - * Author: Christian Starkjohann - * Creation Date: 2005-04-01 - * Tabsize: 4 - * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) - */ - -#ifndef __usbconfig_h_included__ -#define __usbconfig_h_included__ - -/* -General Description: -This file is an example configuration (with inline documentation) for the USB -driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is -also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may -wire the lines to any other port, as long as D+ is also wired to INT0 (or any -other hardware interrupt, as long as it is the highest level interrupt, see -section at the end of this file). -+ To create your own usbconfig.h file, copy this file to your project's -+ firmware source directory) and rename it to "usbconfig.h". -+ Then edit it accordingly. -*/ - -/* ---------------------------- Hardware Config ---------------------------- */ - -#define USB_CFG_IOPORTNAME D -/* This is the port where the USB bus is connected. When you configure it to - * "B", the registers PORTB, PINB and DDRB will be used. - */ -#define USB_CFG_DMINUS_BIT 3 -/* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected. - * This may be any bit in the port. - */ -#define USB_CFG_DPLUS_BIT 2 -/* This is the bit number in USB_CFG_IOPORT where the USB D+ line is connected. - * This may be any bit in the port. Please note that D+ must also be connected - * to interrupt pin INT0! [You can also use other interrupts, see section - * "Optional MCU Description" below, or you can connect D- to the interrupt, as - * it is required if you use the USB_COUNT_SOF feature. If you use D- for the - * interrupt, the USB interrupt will also be triggered at Start-Of-Frame - * markers every millisecond.] - */ -#define USB_CFG_CLOCK_KHZ (F_CPU/1000) -/* Clock rate of the AVR in kHz. Legal values are 12000, 12800, 15000, 16000, - * 16500, 18000 and 20000. The 12.8 MHz and 16.5 MHz versions of the code - * require no crystal, they tolerate +/- 1% deviation from the nominal - * frequency. All other rates require a precision of 2000 ppm and thus a - * crystal! - * Since F_CPU should be defined to your actual clock rate anyway, you should - * not need to modify this setting. - */ -#define USB_CFG_CHECK_CRC 0 -/* Define this to 1 if you want that the driver checks integrity of incoming - * data packets (CRC checks). CRC checks cost quite a bit of code size and are - * currently only available for 18 MHz crystal clock. You must choose - * USB_CFG_CLOCK_KHZ = 18000 if you enable this option. - */ - -/* ----------------------- Optional Hardware Config ------------------------ */ - -/* #define USB_CFG_PULLUP_IOPORTNAME D */ -/* If you connect the 1.5k pullup resistor from D- to a port pin instead of - * V+, you can connect and disconnect the device from firmware by calling - * the macros usbDeviceConnect() and usbDeviceDisconnect() (see usbdrv.h). - * This constant defines the port on which the pullup resistor is connected. - */ -/* #define USB_CFG_PULLUP_BIT 4 */ -/* This constant defines the bit number in USB_CFG_PULLUP_IOPORT (defined - * above) where the 1.5k pullup resistor is connected. See description - * above for details. - */ - -/* --------------------------- Functional Range ---------------------------- */ - -#define USB_CFG_HAVE_INTRIN_ENDPOINT 0 -/* Define this to 1 if you want to compile a version with two endpoints: The - * default control endpoint 0 and an interrupt-in endpoint (any other endpoint - * number). - */ -#define USB_CFG_HAVE_INTRIN_ENDPOINT3 0 -/* Define this to 1 if you want to compile a version with three endpoints: The - * default control endpoint 0, an interrupt-in endpoint 3 (or the number - * configured below) and a catch-all default interrupt-in endpoint as above. - * You must also define USB_CFG_HAVE_INTRIN_ENDPOINT to 1 for this feature. - */ -#define USB_CFG_EP3_NUMBER 3 -/* If the so-called endpoint 3 is used, it can now be configured to any other - * endpoint number (except 0) with this macro. Default if undefined is 3. - */ -/* #define USB_INITIAL_DATATOKEN USBPID_DATA1 */ -/* The above macro defines the startup condition for data toggling on the - * interrupt/bulk endpoints 1 and 3. Defaults to USBPID_DATA1. - * Since the token is toggled BEFORE sending any data, the first packet is - * sent with the oposite value of this configuration! - */ -#define USB_CFG_IMPLEMENT_HALT 0 -/* Define this to 1 if you also want to implement the ENDPOINT_HALT feature - * for endpoint 1 (interrupt endpoint). Although you may not need this feature, - * it is required by the standard. We have made it a config option because it - * bloats the code considerably. - */ -#define USB_CFG_SUPPRESS_INTR_CODE 0 -/* Define this to 1 if you want to declare interrupt-in endpoints, but don't - * want to send any data over them. If this macro is defined to 1, functions - * usbSetInterrupt() and usbSetInterrupt3() are omitted. This is useful if - * you need the interrupt-in endpoints in order to comply to an interface - * (e.g. HID), but never want to send any data. This option saves a couple - * of bytes in flash memory and the transmit buffers in RAM. - */ -#define USB_CFG_INTR_POLL_INTERVAL 10 -/* If you compile a version with endpoint 1 (interrupt-in), this is the poll - * interval. The value is in milliseconds and must not be less than 10 ms for - * low speed devices. - */ -#define USB_CFG_IS_SELF_POWERED 0 -/* Define this to 1 if the device has its own power supply. Set it to 0 if the - * device is powered from the USB bus. - */ -#define USB_CFG_MAX_BUS_POWER 50 -/* Set this variable to the maximum USB bus power consumption of your device. - * The value is in milliamperes. [It will be divided by two since USB - * communicates power requirements in units of 2 mA.] - */ -#define USB_CFG_IMPLEMENT_FN_WRITE 1 -/* Set this to 1 if you want usbFunctionWrite() to be called for control-out - * transfers. Set it to 0 if you don't need it and want to save a couple of - * bytes. - */ -#define USB_CFG_IMPLEMENT_FN_READ 0 -/* Set this to 1 if you need to send control replies which are generated - * "on the fly" when usbFunctionRead() is called. If you only want to send - * data from a static buffer, set it to 0 and return the data from - * usbFunctionSetup(). This saves a couple of bytes. - */ -#define USB_CFG_IMPLEMENT_FN_WRITEOUT 0 -/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoints. - * You must implement the function usbFunctionWriteOut() which receives all - * interrupt/bulk data sent to any endpoint other than 0. The endpoint number - * can be found in 'usbRxToken'. - */ -#define USB_CFG_HAVE_FLOWCONTROL 0 -/* Define this to 1 if you want flowcontrol over USB data. See the definition - * of the macros usbDisableAllRequests() and usbEnableAllRequests() in - * usbdrv.h. - */ -#define USB_CFG_DRIVER_FLASH_PAGE 0 -/* If the device has more than 64 kBytes of flash, define this to the 64 k page - * where the driver's constants (descriptors) are located. Or in other words: - * Define this to 1 for boot loaders on the ATMega128. - */ -#define USB_CFG_LONG_TRANSFERS 0 -/* Define this to 1 if you want to send/receive blocks of more than 254 bytes - * in a single control-in or control-out transfer. Note that the capability - * for long transfers increases the driver size. - */ -/* #define USB_RX_USER_HOOK(data, len) if(usbRxToken == (uchar)USBPID_SETUP) blinkLED(); */ -/* This macro is a hook if you want to do unconventional things. If it is - * defined, it's inserted at the beginning of received message processing. - * If you eat the received message and don't want default processing to - * proceed, do a return after doing your things. One possible application - * (besides debugging) is to flash a status LED on each packet. - */ -/* #define USB_RESET_HOOK(resetStarts) if(!resetStarts){hadUsbReset();} */ -/* This macro is a hook if you need to know when an USB RESET occurs. It has - * one parameter which distinguishes between the start of RESET state and its - * end. - */ -/* #define USB_SET_ADDRESS_HOOK() hadAddressAssigned(); */ -/* This macro (if defined) is executed when a USB SET_ADDRESS request was - * received. - */ -#define USB_COUNT_SOF 0 -/* define this macro to 1 if you need the global variable "usbSofCount" which - * counts SOF packets. This feature requires that the hardware interrupt is - * connected to D- instead of D+. - */ -/* #ifdef __ASSEMBLER__ - * macro myAssemblerMacro - * in YL, TCNT0 - * sts timer0Snapshot, YL - * endm - * #endif - * #define USB_SOF_HOOK myAssemblerMacro - * This macro (if defined) is executed in the assembler module when a - * Start Of Frame condition is detected. It is recommended to define it to - * the name of an assembler macro which is defined here as well so that more - * than one assembler instruction can be used. The macro may use the register - * YL and modify SREG. If it lasts longer than a couple of cycles, USB messages - * immediately after an SOF pulse may be lost and must be retried by the host. - * What can you do with this hook? Since the SOF signal occurs exactly every - * 1 ms (unless the host is in sleep mode), you can use it to tune OSCCAL in - * designs running on the internal RC oscillator. - * Please note that Start Of Frame detection works only if D- is wired to the - * interrupt, not D+. THIS IS DIFFERENT THAN MOST EXAMPLES! - */ -#define USB_CFG_CHECK_DATA_TOGGLING 0 -/* define this macro to 1 if you want to filter out duplicate data packets - * sent by the host. Duplicates occur only as a consequence of communication - * errors, when the host does not receive an ACK. Please note that you need to - * implement the filtering yourself in usbFunctionWriteOut() and - * usbFunctionWrite(). Use the global usbCurrentDataToken and a static variable - * for each control- and out-endpoint to check for duplicate packets. - */ -#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH 0 -/* define this macro to 1 if you want the function usbMeasureFrameLength() - * compiled in. This function can be used to calibrate the AVR's RC oscillator. - */ -#define USB_USE_FAST_CRC 0 -/* The assembler module has two implementations for the CRC algorithm. One is - * faster, the other is smaller. This CRC routine is only used for transmitted - * messages where timing is not critical. The faster routine needs 31 cycles - * per byte while the smaller one needs 61 to 69 cycles. The faster routine - * may be worth the 32 bytes bigger code size if you transmit lots of data and - * run the AVR close to its limit. - */ - -/* -------------------------- Device Description --------------------------- */ - -#define USB_CFG_VENDOR_ID 0xc0, 0x16 /* = 0x16c0 = 5824 = voti.nl */ -/* USB vendor ID for the device, low byte first. If you have registered your - * own Vendor ID, define it here. Otherwise you may use one of obdev's free - * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! - * *** IMPORTANT NOTE *** - * This template uses obdev's shared VID/PID pair for Vendor Class devices - * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand - * the implications! - */ -#define USB_CFG_DEVICE_ID 0xdc, 0x05 /* = 0x05dc = 1500 */ -/* This is the ID of the product, low byte first. It is interpreted in the - * scope of the vendor ID. If you have registered your own VID with usb.org - * or if you have licensed a PID from somebody else, define it here. Otherwise - * you may use one of obdev's free shared VID/PID pairs. See the file - * USB-IDs-for-free.txt for details! - * *** IMPORTANT NOTE *** - * This template uses obdev's shared VID/PID pair for Vendor Class devices - * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand - * the implications! - */ -#define USB_CFG_DEVICE_VERSION 0x00, 0x01 -/* Version number of the device: Minor number first, then major number. - */ -#define USB_CFG_VENDOR_NAME 'w','i','n','d','f','i','s','c','h','.','o','r','g' -#define USB_CFG_VENDOR_NAME_LEN 13 -/* These two values define the vendor name returned by the USB device. The name - * must be given as a list of characters under single quotes. The characters - * are interpreted as Unicode (UTF-16) entities. - * If you don't want a vendor name string, undefine these macros. - * ALWAYS define a vendor name containing your Internet domain name if you use - * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for - * details. - */ -#define USB_CFG_DEVICE_NAME 'F','l','o',' ','T','e','s','t' -#define USB_CFG_DEVICE_NAME_LEN 8 -/* Same as above for the device name. If you don't want a device name, undefine - * the macros. See the file USB-IDs-for-free.txt before you assign a name if - * you use a shared VID/PID. - */ -/*#define USB_CFG_SERIAL_NUMBER 'N', 'o', 'n', 'e' */ -/*#define USB_CFG_SERIAL_NUMBER_LEN 0 */ -/* Same as above for the serial number. If you don't want a serial number, - * undefine the macros. - * It may be useful to provide the serial number through other means than at - * compile time. See the section about descriptor properties below for how - * to fine tune control over USB descriptors such as the string descriptor - * for the serial number. - */ -#define USB_CFG_DEVICE_CLASS 0xff /* set to 0 if deferred to interface */ -#define USB_CFG_DEVICE_SUBCLASS 0 -/* See USB specification if you want to conform to an existing device class. - * Class 0xff is "vendor specific". - */ -#define USB_CFG_INTERFACE_CLASS 0 /* define class here if not at device level */ -#define USB_CFG_INTERFACE_SUBCLASS 0 -#define USB_CFG_INTERFACE_PROTOCOL 0 -/* See USB specification if you want to conform to an existing device class or - * protocol. The following classes must be set at interface level: - * HID class is 3, no subclass and protocol required (but may be useful!) - * CDC class is 2, use subclass 2 and protocol 1 for ACM - */ -/* #define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH 42 */ -/* Define this to the length of the HID report descriptor, if you implement - * an HID device. Otherwise don't define it or define it to 0. - * If you use this define, you must add a PROGMEM character array named - * "usbHidReportDescriptor" to your code which contains the report descriptor. - * Don't forget to keep the array and this define in sync! - */ - -/* #define USB_PUBLIC static */ -/* Use the define above if you #include usbdrv.c instead of linking against it. - * This technique saves a couple of bytes in flash memory. - */ - -/* ------------------- Fine Control over USB Descriptors ------------------- */ -/* If you don't want to use the driver's default USB descriptors, you can - * provide our own. These can be provided as (1) fixed length static data in - * flash memory, (2) fixed length static data in RAM or (3) dynamically at - * runtime in the function usbFunctionDescriptor(). See usbdrv.h for more - * information about this function. - * Descriptor handling is configured through the descriptor's properties. If - * no properties are defined or if they are 0, the default descriptor is used. - * Possible properties are: - * + USB_PROP_IS_DYNAMIC: The data for the descriptor should be fetched - * at runtime via usbFunctionDescriptor(). If the usbMsgPtr mechanism is - * used, the data is in FLASH by default. Add property USB_PROP_IS_RAM if - * you want RAM pointers. - * + USB_PROP_IS_RAM: The data returned by usbFunctionDescriptor() or found - * in static memory is in RAM, not in flash memory. - * + USB_PROP_LENGTH(len): If the data is in static memory (RAM or flash), - * the driver must know the descriptor's length. The descriptor itself is - * found at the address of a well known identifier (see below). - * List of static descriptor names (must be declared PROGMEM if in flash): - * char usbDescriptorDevice[]; - * char usbDescriptorConfiguration[]; - * char usbDescriptorHidReport[]; - * char usbDescriptorString0[]; - * int usbDescriptorStringVendor[]; - * int usbDescriptorStringDevice[]; - * int usbDescriptorStringSerialNumber[]; - * Other descriptors can't be provided statically, they must be provided - * dynamically at runtime. - * - * Descriptor properties are or-ed or added together, e.g.: - * #define USB_CFG_DESCR_PROPS_DEVICE (USB_PROP_IS_RAM | USB_PROP_LENGTH(18)) - * - * The following descriptors are defined: - * USB_CFG_DESCR_PROPS_DEVICE - * USB_CFG_DESCR_PROPS_CONFIGURATION - * USB_CFG_DESCR_PROPS_STRINGS - * USB_CFG_DESCR_PROPS_STRING_0 - * USB_CFG_DESCR_PROPS_STRING_VENDOR - * USB_CFG_DESCR_PROPS_STRING_PRODUCT - * USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER - * USB_CFG_DESCR_PROPS_HID - * USB_CFG_DESCR_PROPS_HID_REPORT - * USB_CFG_DESCR_PROPS_UNKNOWN (for all descriptors not handled by the driver) - * - * Note about string descriptors: String descriptors are not just strings, they - * are Unicode strings prefixed with a 2 byte header. Example: - * int serialNumberDescriptor[] = { - * USB_STRING_DESCRIPTOR_HEADER(6), - * 'S', 'e', 'r', 'i', 'a', 'l' - * }; - */ - -#define USB_CFG_DESCR_PROPS_DEVICE 0 -#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 -#define USB_CFG_DESCR_PROPS_STRINGS 0 -#define USB_CFG_DESCR_PROPS_STRING_0 0 -#define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 -#define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 -#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 -#define USB_CFG_DESCR_PROPS_HID 0 -#define USB_CFG_DESCR_PROPS_HID_REPORT 0 -#define USB_CFG_DESCR_PROPS_UNKNOWN 0 - - -#define usbMsgPtr_t unsigned short -/* If usbMsgPtr_t is not defined, it defaults to 'uchar *'. We define it to - * a scalar type here because gcc generates slightly shorter code for scalar - * arithmetics than for pointer arithmetics. Remove this define for backward - * type compatibility or define it to an 8 bit type if you use data in RAM only - * and all RAM is below 256 bytes (tiny memory model in IAR CC). - */ - -/* ----------------------- Optional MCU Description ------------------------ */ - -/* The following configurations have working defaults in usbdrv.h. You - * usually don't need to set them explicitly. Only if you want to run - * the driver on a device which is not yet supported or with a compiler - * which is not fully supported (such as IAR C) or if you use a differnt - * interrupt than INT0, you may have to define some of these. - */ -/* #define USB_INTR_CFG MCUCR */ -/* #define USB_INTR_CFG_SET ((1 << ISC00) | (1 << ISC01)) */ -/* #define USB_INTR_CFG_CLR 0 */ -/* #define USB_INTR_ENABLE GIMSK */ -/* #define USB_INTR_ENABLE_BIT INT0 */ -/* #define USB_INTR_PENDING GIFR */ -/* #define USB_INTR_PENDING_BIT INTF0 */ -/* #define USB_INTR_VECTOR INT0_vect */ - -#endif /* __usbconfig_h_included__ */ diff --git a/usbdrv/usbconfig.2_.h b/usbdrv/usbconfig.2_.h deleted file mode 100644 index ec38999..0000000 --- a/usbdrv/usbconfig.2_.h +++ /dev/null @@ -1,235 +0,0 @@ -#ifndef __usbconfig_h_included__ -#define __usbconfig_h_included__ -#define USB_CFG_IOPORTNAME D -#define USB_CFG_DMINUS_BIT 3 -#define USB_CFG_DPLUS_BIT 2 -#define USB_CFG_CLOCK_KHZ (F_CPU/1000) -#define USB_CFG_CHECK_CRC 0 -#define USB_CFG_HAVE_INTRIN_ENDPOINT 0 -#define USB_CFG_HAVE_INTRIN_ENDPOINT3 0 -#define USB_CFG_EP3_NUMBER 3 -#define USB_CFG_IMPLEMENT_HALT 0 -#define USB_CFG_SUPPRESS_INTR_CODE 0 -#define USB_CFG_INTR_POLL_INTERVAL 10 -#define USB_CFG_IS_SELF_POWERED 0 -#define USB_CFG_MAX_BUS_POWER 50 -/* Set this variable to the maximum USB bus power consumption of your device. - * The value is in milliamperes. [It will be divided by two since USB - * communicates power requirements in units of 2 mA.] - */ -#define USB_CFG_IMPLEMENT_FN_WRITE 1 -/* Set this to 1 if you want usbFunctionWrite() to be called for control-out - * transfers. Set it to 0 if you don't need it and want to save a couple of - * bytes. - */ -#define USB_CFG_IMPLEMENT_FN_READ 0 -/* Set this to 1 if you need to send control replies which are generated - * "on the fly" when usbFunctionRead() is called. If you only want to send - * data from a static buffer, set it to 0 and return the data from - * usbFunctionSetup(). This saves a couple of bytes. - */ -#define USB_CFG_IMPLEMENT_FN_WRITEOUT 0 -/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoints. - * You must implement the function usbFunctionWriteOut() which receives all - * interrupt/bulk data sent to any endpoint other than 0. The endpoint number - * can be found in 'usbRxToken'. - */ -#define USB_CFG_HAVE_FLOWCONTROL 0 -/* Define this to 1 if you want flowcontrol over USB data. See the definition - * of the macros usbDisableAllRequests() and usbEnableAllRequests() in - * usbdrv.h. - */ -#define USB_CFG_DRIVER_FLASH_PAGE 0 -/* If the device has more than 64 kBytes of flash, define this to the 64 k page - * where the driver's constants (descriptors) are located. Or in other words: - * Define this to 1 for boot loaders on the ATMega128. - */ -#define USB_CFG_LONG_TRANSFERS 0 -#define USB_COUNT_SOF 0 -#define USB_CFG_CHECK_DATA_TOGGLING 0 -/* define this macro to 1 if you want to filter out duplicate data packets - * sent by the host. Duplicates occur only as a consequence of communication - * errors, when the host does not receive an ACK. Please note that you need to - * implement the filtering yourself in usbFunctionWriteOut() and - * usbFunctionWrite(). Use the global usbCurrentDataToken and a static variable - * for each control- and out-endpoint to check for duplicate packets. - */ -#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH 0 -/* define this macro to 1 if you want the function usbMeasureFrameLength() - * compiled in. This function can be used to calibrate the AVR's RC oscillator. - */ -#define USB_USE_FAST_CRC 0 -/* The assembler module has two implementations for the CRC algorithm. One is - * faster, the other is smaller. This CRC routine is only used for transmitted - * messages where timing is not critical. The faster routine needs 31 cycles - * per byte while the smaller one needs 61 to 69 cycles. The faster routine - * may be worth the 32 bytes bigger code size if you transmit lots of data and - * run the AVR close to its limit. - */ - -/* -------------------------- Device Description --------------------------- */ - -#define USB_CFG_VENDOR_ID 0xc0, 0x16 /* = 0x16c0 = 5824 = voti.nl */ -/* USB vendor ID for the device, low byte first. If you have registered your - * own Vendor ID, define it here. Otherwise you may use one of obdev's free - * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! - * *** IMPORTANT NOTE *** - * This template uses obdev's shared VID/PID pair for Vendor Class devices - * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand - * the implications! - */ -#define USB_CFG_DEVICE_ID 0xdc, 0x05 /* = 0x05dc = 1500 */ -/* This is the ID of the product, low byte first. It is interpreted in the - * scope of the vendor ID. If you have registered your own VID with usb.org - * or if you have licensed a PID from somebody else, define it here. Otherwise - * you may use one of obdev's free shared VID/PID pairs. See the file - * USB-IDs-for-free.txt for details! - * *** IMPORTANT NOTE *** - * This template uses obdev's shared VID/PID pair for Vendor Class devices - * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand - * the implications! - */ -#define USB_CFG_DEVICE_VERSION 0x00, 0x01 -/* Version number of the device: Minor number first, then major number. - */ -#define USB_CFG_VENDOR_NAME 'w','i','n','d','f','i','s','c','h','.','o','r','g' -#define USB_CFG_VENDOR_NAME_LEN 13 -/* These two values define the vendor name returned by the USB device. The name - * must be given as a list of characters under single quotes. The characters - * are interpreted as Unicode (UTF-16) entities. - * If you don't want a vendor name string, undefine these macros. - * ALWAYS define a vendor name containing your Internet domain name if you use - * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for - * details. - */ -#define USB_CFG_DEVICE_NAME 'F','l','o',' ','T','e','s','t' -#define USB_CFG_DEVICE_NAME_LEN 8 -/* Same as above for the device name. If you don't want a device name, undefine - * the macros. See the file USB-IDs-for-free.txt before you assign a name if - * you use a shared VID/PID. - */ -/*#define USB_CFG_SERIAL_NUMBER 'N', 'o', 'n', 'e' */ -/*#define USB_CFG_SERIAL_NUMBER_LEN 0 */ -/* Same as above for the serial number. If you don't want a serial number, - * undefine the macros. - * It may be useful to provide the serial number through other means than at - * compile time. See the section about descriptor properties below for how - * to fine tune control over USB descriptors such as the string descriptor - * for the serial number. - */ -#define USB_CFG_DEVICE_CLASS 0xff /* set to 0 if deferred to interface */ -#define USB_CFG_DEVICE_SUBCLASS 0 -/* See USB specification if you want to conform to an existing device class. - * Class 0xff is "vendor specific". - */ -#define USB_CFG_INTERFACE_CLASS 0 /* define class here if not at device level */ -#define USB_CFG_INTERFACE_SUBCLASS 0 -#define USB_CFG_INTERFACE_PROTOCOL 0 -/* See USB specification if you want to conform to an existing device class or - * protocol. The following classes must be set at interface level: - * HID class is 3, no subclass and protocol required (but may be useful!) - * CDC class is 2, use subclass 2 and protocol 1 for ACM - */ -/* #define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH 42 */ -/* Define this to the length of the HID report descriptor, if you implement - * an HID device. Otherwise don't define it or define it to 0. - * If you use this define, you must add a PROGMEM character array named - * "usbHidReportDescriptor" to your code which contains the report descriptor. - * Don't forget to keep the array and this define in sync! - */ - -/* #define USB_PUBLIC static */ -/* Use the define above if you #include usbdrv.c instead of linking against it. - * This technique saves a couple of bytes in flash memory. - */ - -/* ------------------- Fine Control over USB Descriptors ------------------- */ -/* If you don't want to use the driver's default USB descriptors, you can - * provide our own. These can be provided as (1) fixed length static data in - * flash memory, (2) fixed length static data in RAM or (3) dynamically at - * runtime in the function usbFunctionDescriptor(). See usbdrv.h for more - * information about this function. - * Descriptor handling is configured through the descriptor's properties. If - * no properties are defined or if they are 0, the default descriptor is used. - * Possible properties are: - * + USB_PROP_IS_DYNAMIC: The data for the descriptor should be fetched - * at runtime via usbFunctionDescriptor(). If the usbMsgPtr mechanism is - * used, the data is in FLASH by default. Add property USB_PROP_IS_RAM if - * you want RAM pointers. - * + USB_PROP_IS_RAM: The data returned by usbFunctionDescriptor() or found - * in static memory is in RAM, not in flash memory. - * + USB_PROP_LENGTH(len): If the data is in static memory (RAM or flash), - * the driver must know the descriptor's length. The descriptor itself is - * found at the address of a well known identifier (see below). - * List of static descriptor names (must be declared PROGMEM if in flash): - * char usbDescriptorDevice[]; - * char usbDescriptorConfiguration[]; - * char usbDescriptorHidReport[]; - * char usbDescriptorString0[]; - * int usbDescriptorStringVendor[]; - * int usbDescriptorStringDevice[]; - * int usbDescriptorStringSerialNumber[]; - * Other descriptors can't be provided statically, they must be provided - * dynamically at runtime. - * - * Descriptor properties are or-ed or added together, e.g.: - * #define USB_CFG_DESCR_PROPS_DEVICE (USB_PROP_IS_RAM | USB_PROP_LENGTH(18)) - * - * The following descriptors are defined: - * USB_CFG_DESCR_PROPS_DEVICE - * USB_CFG_DESCR_PROPS_CONFIGURATION - * USB_CFG_DESCR_PROPS_STRINGS - * USB_CFG_DESCR_PROPS_STRING_0 - * USB_CFG_DESCR_PROPS_STRING_VENDOR - * USB_CFG_DESCR_PROPS_STRING_PRODUCT - * USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER - * USB_CFG_DESCR_PROPS_HID - * USB_CFG_DESCR_PROPS_HID_REPORT - * USB_CFG_DESCR_PROPS_UNKNOWN (for all descriptors not handled by the driver) - * - * Note about string descriptors: String descriptors are not just strings, they - * are Unicode strings prefixed with a 2 byte header. Example: - * int serialNumberDescriptor[] = { - * USB_STRING_DESCRIPTOR_HEADER(6), - * 'S', 'e', 'r', 'i', 'a', 'l' - * }; - */ - -#define USB_CFG_DESCR_PROPS_DEVICE 0 -#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 -#define USB_CFG_DESCR_PROPS_STRINGS 0 -#define USB_CFG_DESCR_PROPS_STRING_0 0 -#define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 -#define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 -#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 -#define USB_CFG_DESCR_PROPS_HID 0 -#define USB_CFG_DESCR_PROPS_HID_REPORT 0 -#define USB_CFG_DESCR_PROPS_UNKNOWN 0 - - -#define usbMsgPtr_t unsigned short -/* If usbMsgPtr_t is not defined, it defaults to 'uchar *'. We define it to - * a scalar type here because gcc generates slightly shorter code for scalar - * arithmetics than for pointer arithmetics. Remove this define for backward - * type compatibility or define it to an 8 bit type if you use data in RAM only - * and all RAM is below 256 bytes (tiny memory model in IAR CC). - */ - -/* ----------------------- Optional MCU Description ------------------------ */ - -/* The following configurations have working defaults in usbdrv.h. You - * usually don't need to set them explicitly. Only if you want to run - * the driver on a device which is not yet supported or with a compiler - * which is not fully supported (such as IAR C) or if you use a differnt - * interrupt than INT0, you may have to define some of these. - */ -/* #define USB_INTR_CFG MCUCR */ -/* #define USB_INTR_CFG_SET ((1 << ISC00) | (1 << ISC01)) */ -/* #define USB_INTR_CFG_CLR 0 */ -/* #define USB_INTR_ENABLE GIMSK */ -/* #define USB_INTR_ENABLE_BIT INT0 */ -/* #define USB_INTR_PENDING GIFR */ -/* #define USB_INTR_PENDING_BIT INTF0 */ -/* #define USB_INTR_VECTOR INT0_vect */ - -#endif /* __usbconfig_h_included__ */ diff --git a/usbdrv/usbconfig.2__.h b/usbdrv/usbconfig.2__.h deleted file mode 100644 index 458ca8d..0000000 --- a/usbdrv/usbconfig.2__.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef __usbconfig_h_included__ -#define __usbconfig_h_included__ -#define USB_CFG_IOPORTNAME D -#define USB_CFG_DMINUS_BIT 3 -#define USB_CFG_DPLUS_BIT 2 -#define USB_CFG_CLOCK_KHZ (F_CPU/1000) -#define USB_CFG_CHECK_CRC 0 -#define USB_CFG_HAVE_INTRIN_ENDPOINT 0 -#define USB_CFG_HAVE_INTRIN_ENDPOINT3 0 -#define USB_CFG_EP3_NUMBER 3 -#define USB_CFG_IMPLEMENT_HALT 0 -#define USB_CFG_SUPPRESS_INTR_CODE 0 -#define USB_CFG_INTR_POLL_INTERVAL 10 -#define USB_CFG_IS_SELF_POWERED 0 -#define USB_CFG_MAX_BUS_POWER 50 -#define USB_CFG_IMPLEMENT_FN_WRITE 1 -#define USB_CFG_IMPLEMENT_FN_READ 0 -#define USB_CFG_IMPLEMENT_FN_WRITEOUT 0 -#define USB_CFG_HAVE_FLOWCONTROL 0 -#define USB_CFG_DRIVER_FLASH_PAGE 0 -#define USB_CFG_LONG_TRANSFERS 0 -#define USB_COUNT_SOF 0 -#define USB_CFG_CHECK_DATA_TOGGLING 0 -#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH 0 -#define USB_USE_FAST_CRC 0 -#define USB_CFG_VENDOR_ID 0xc0, 0x16 /* = 0x16c0 = 5824 = voti.nl */ -#define USB_CFG_DEVICE_ID 0xdc, 0x05 /* = 0x05dc = 1500 */ -#define USB_CFG_DEVICE_VERSION 0x00, 0x01 -#define USB_CFG_VENDOR_NAME 'w','i','n','d','f','i','s','c','h','.','o','r','g' -#define USB_CFG_VENDOR_NAME_LEN 13 -#define USB_CFG_DEVICE_NAME 'F','l','o',' ','T','e','s','t' -#define USB_CFG_DEVICE_NAME_LEN 8 -#define USB_CFG_DEVICE_CLASS 0xff /* set to 0 if deferred to interface */ -#define USB_CFG_DEVICE_SUBCLASS 0 -#define USB_CFG_INTERFACE_CLASS 0 /* define class here if not at device level */ -#define USB_CFG_INTERFACE_SUBCLASS 0 -#define USB_CFG_INTERFACE_PROTOCOL 0 -#define USB_CFG_DESCR_PROPS_DEVICE 0 -#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 -#define USB_CFG_DESCR_PROPS_STRINGS 0 -#define USB_CFG_DESCR_PROPS_STRING_0 0 -#define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 -#define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 -#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 -#define USB_CFG_DESCR_PROPS_HID 0 -#define USB_CFG_DESCR_PROPS_HID_REPORT 0 -#define USB_CFG_DESCR_PROPS_UNKNOWN 0 -#define usbMsgPtr_t unsigned short -#endif /* __usbconfig_h_included__ */ diff --git a/usbdrv/usbconfig_.h b/usbdrv/usbconfig_.h deleted file mode 100644 index a4288ce..0000000 --- a/usbdrv/usbconfig_.h +++ /dev/null @@ -1,280 +0,0 @@ -/* Name: usbconfig.h - * Project: AVR USB driver - * Author: Christian Starkjohann - * Creation Date: 2005-04-01 - * Tabsize: 4 - * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH - * License: Proprietary, free under certain conditions. See Documentation. - * This Revision: $Id: usbconfig-prototype.h 206 2006-06-23 19:02:30Z cs $ - */ - -#ifndef __usbconfig_h_included__ -#define __usbconfig_h_included__ - -/* -General Description: -This file is an example configuration (with inline documentation) for the USB -driver. It configures AVR-USB for an ATMega8 with USB D+ connected to Port D -bit 2 (which is also hardware interrupt 0) and USB D- to Port D bit 0. You may -wire the lines to any other port, as long as D- is on bit 0 and D+ is also -wired to INT0. -To create your own usbconfig.h file, copy this file to the directory -containing "usbdrv" (that is your project firmware source directory) and -rename it to "usbconfig.h". Then edit it accordingly. -*/ - -/* ---------------------------- Hardware Config ---------------------------- */ - -#if defined(CCCB_COMPATIBLE) - - #define USB_CFG_IOPORTNAME D - #define USB_CFG_DMINUS_BIT 1 - #define USB_CFG_DPLUS_BIT 2 - -#else - - #define USB_CFG_IOPORTNAME B - #define USB_CFG_DMINUS_BIT 0 - #define USB_CFG_DPLUS_BIT 1 - -#endif - -/* ----------------------- Optional Hardware Config ------------------------ */ - -/* #define USB_CFG_PULLUP_IOPORTNAME D */ -/* If you connect the 1.5k pullup resistor from D- to a port pin instead of - * V+, you can connect and disconnect the device from firmware by calling - * the macros usbDeviceConnect() and usbDeviceDisconnect() (see usbdrv.h). - * This constant defines the port on which the pullup resistor is connected. - */ -/* #define USB_CFG_PULLUP_BIT 4 */ -/* This constant defines the bit number in USB_CFG_PULLUP_IOPORT (defined - * above) where the 1.5k pullup resistor is connected. See description - * above for details. - */ -/* #define USB_BUFFER_SECTION ".bss" */ -/* The USB receive buffer (variable "usbRxBuf") with a length of 22 bytes - * MUST NOT cross a 256 byte boundary. We have introduced this configuration - * option to allow you to change the data segment where this buffer is - * allocated. If you have problems with the default segment (start of .bss), - * you may change this setting. See the comment in usbdrv.h for details. - * On IAR C, the default is the TINY_Z segment (first 256 bytes). You must - * change this default for devices which don't have RAM below 0x100. - */ - -/* --------------------------- Functional Range ---------------------------- */ - -#ifndef BOOTLOADER - #ifndef USB_HID - #define USB_CFG_HAVE_INTRIN_ENDPOINT 1 -/* Define this to 1 if you want to compile a version with two endpoints: The - * default control endpoint 0 and an interrupt-in endpoint 1. - */ - #define USB_CFG_HAVE_INTRIN_ENDPOINT3 1 -/* Define this and USB_CFG_HAVE_INTRIN_ENDPOINT to 1 if you want to compile a - * version with three endpoints: The default control endpoint 0, an - * interrupt-in endpoint 1 and an interrupt-in endpoint 3. - */ - #else - #define USB_CFG_HAVE_INTRIN_ENDPOINT 0 - #define USB_CFG_HAVE_INTRIN_ENDPOINT3 0 - #endif -#else - #define USB_CFG_HAVE_INTRIN_ENDPOINT 0 - #define USB_CFG_HAVE_INTRIN_ENDPOINT3 0 -#endif -#define USB_CFG_IMPLEMENT_HALT 0 -/* Define this to 1 if you also want to implement the ENDPOINT_HALT feature - * for endpoint 1 (interrupt endpoint). Although you may not need this feature, - * it is required by the standard. We have made it a config option because it - * bloats the code considerably. - */ -#define USB_CFG_INTR_POLL_INTERVAL 10 -/* If you compile a version with endpoint 1 (interrupt-in), this is the poll - * interval. The value is in milliseconds and must not be less than 10 ms for - * low speed devices. - */ -#define USB_CFG_IS_SELF_POWERED 0 -/* Define this to 1 if the device has its own power supply. Set it to 0 if the - * device is powered from the USB bus. - */ -#define USB_CFG_MAX_BUS_POWER 120 -/* Set this variable to the maximum USB bus power consumption of your device. - * The value is in milliamperes. [It will be divided by two since USB - * communicates power requirements in units of 2 mA.] - */ -#define USB_CFG_SAMPLE_EXACT 1 -/* This variable affects Sampling Jitter for USB receiving. When it is 0, the - * driver guarantees a sampling window of 1/2 bit. The USB spec requires - * that the receiver has at most 1/4 bit sampling window. The 1/2 bit window - * should still work reliably enough because we work at low speed. If you want - * to meet the spec, set this value to 1. This will unroll a loop which - * results in bigger code size. - * If you have problems with long cables, try setting this value to 1. - */ -#define USB_CFG_IMPLEMENT_FN_WRITE 1 -/* Set this to 1 if you want usbFunctionWrite() to be called for control-out - * transfers. Set it to 0 if you don't need it and want to save a couple of - * bytes. - */ -#ifndef BOOTLOADER - #define USB_CFG_IMPLEMENT_FN_READ 1 -/* Set this to 1 if you need to send control replies which are generated - * "on the fly" when usbFunctionRead() is called. If you only want to send - * data from a static buffer, set it to 0 and return the data from - * usbFunctionSetup(). This saves a couple of bytes. - */ - - #ifndef USB_HID - #define USB_CFG_IMPLEMENT_FN_WRITEOUT 1 - #else - #define USB_CFG_IMPLEMENT_FN_WRITEOUT 0 - #endif -/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoint 1. - * You must implement the function usbFunctionWriteOut() which receives all - * interrupt/bulk data sent to endpoint 1. - */ - #define USB_CFG_HAVE_FLOWCONTROL 1 -/* Define this to 1 if you want flowcontrol over USB data. See the definition - * of the macros usbDisableAllRequests() and usbEnableAllRequests() in - * usbdrv.h. - */ -#else - #define USB_CFG_IMPLEMENT_FN_READ 0 -#endif -/* Define this to the size of your configuration descriptor if you provide - * your own configuration descriptor at the global program memory address - * 'usbDescrConfig'. - */ - -/* -------------------------- Device Description --------------------------- */ - -#ifndef BOOTLOADER - #ifndef ISAVRISPMKII - #define USB_CFG_VENDOR_ID 0xc0, 0x16 -/* USB vendor ID for the device, low byte first. If you have registered your - * own Vendor ID, define it here. Otherwise you use obdev's free shared - * VID/PID pair. Be sure to read USBID-License.txt for rules! - * This template uses obdev's shared VID/PID pair for HIDs: 0x16c0/0x5df. - * Use this VID/PID pair ONLY if you understand the implications! - */ - #ifndef USB_HID - #define USB_CFG_DEVICE_ID 0xe1, 0x05 - #else - #define USB_CFG_DEVICE_ID 0xdc, 0x05 - #endif -/* This is the ID of the product, low byte first. It is interpreted in the - * scope of the vendor ID. If you have registered your own VID with usb.org - * or if you have licensed a PID from somebody else, define it here. Otherwise - * you use obdev's free shared VID/PID pair. Be sure to read the rules in - * USBID-License.txt! - * This template uses obdev's shared VID/PID pair for HIDs: 0x16c0/0x5df. - * Use this VID/PID pair ONLY if you understand the implications! - */ - #else - #define USB_CFG_VENDOR_ID 0x03, 0xeb - #define USB_CFG_DEVICE_ID 0x21, 0x04 - #endif -#endif -#ifndef ISAVRISPMKII - #define USB_CFG_DEVICE_VERSION 0x00, 0x01 -#else - #define USB_CFG_DEVICE_VERSION 0x02, 0x00 -#endif -/* Version number of the device: Minor number first, then major number. - */ -#ifndef ISUSBASP - #define USB_CFG_VENDOR_NAME 'w', 'i', 'n', 'd', 'f', 'i', 's', 'c', 'h', '.', 'o', 'r', 'g' - #define USB_CFG_VENDOR_NAME_LEN 13 - #define USB_CFG_DEVICE_NAME 's', 'c', 'h', 'e', 'i', 'b', 'e' - #define USB_CFG_DEVICE_NAME_LEN 7 -#else - #define USB_CFG_VENDOR_NAME 'w', 'w', 'w', '.', 'f', 'i', 's', 'c', 'h', 'l', '.', 'd', 'e' - #define USB_CFG_VENDOR_NAME_LEN 13 - #define USB_CFG_DEVICE_NAME 'U', 'S', 'B', 'a', 's', 'p' - #define USB_CFG_DEVICE_NAME_LEN 6 -#endif - -/* Same as above for the device name. If you don't want a device name, undefine - * the macros. See the file USBID-License.txt before you assign a name if you - * use a shared VID/PID. - */ -#define USB_CFG_SERIAL_NUMBER_LENGTH 0 -/* Set this define to the number of charcters in the serial number if your - * device should have a serial number to uniquely identify each hardware - * instance. You must supply the serial number in a string descriptor with the - * name "usbCfgSerialNumberStringDescriptor", e.g.: - * #define USB_CFG_SERIAL_NUMBER_LENGTH 5 - * int usbCfgSerialNumberStringDescriptor[] PROGMEM = { - * USB_STRING_DESCRIPTOR_HEADER(USB_CFG_SERIAL_NUMBER_LENGTH), - * '1', '2', '3', '4', '5' - * }; - * See usbdrv.h for more information about the USB_STRING_DESCRIPTOR_HEADER() - * macro or usbdrv.c for example string descriptors. - * You may want to put "usbCfgSerialNumberStringDescriptor" at a constant - * flash memory address (with magic linker commands) so that you don't need - * to recompile if you change it. - */ -#if defined(BOOTLOADER) || defined(USB_HID) - #define USB_CFG_DEVICE_CLASS 0xff - #define USB_CFG_DEVICE_SUBCLASS 0 - - #define USB_CFG_INTERFACE_CLASS 0 - #define USB_CFG_INTERFACE_SUBCLASS 0 - #define USB_CFG_INTERFACE_PROTOCOL 0 -#else - #define USB_CFG_DEVICE_CLASS 2 - #define USB_CFG_DEVICE_SUBCLASS 0 -/* See USB specification if you want to conform to an existing device class. - */ - #ifndef ISAVRISPMKII - #define USB_CFG_INTERFACE_CLASS 0x02 /* CDC class */ - #define USB_CFG_INTERFACE_SUBCLASS 2 /* Abstract (Modem) */ - #define USB_CFG_INTERFACE_PROTOCOL 1 /* AT-Commands */ - #else - #define USB_CFG_INTERFACE_CLASS 0xff /* Vendor specific */ - #define USB_CFG_INTERFACE_SUBCLASS 0 /* none */ - #define USB_CFG_INTERFACE_PROTOCOL 0 /* none */ - #endif -#endif -#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH 0 /* total length of report descriptor */ -/* Define this to the length of the HID report descriptor, if you implement - * an HID device. Otherwise don't define it or define it to 0. - * Since this template defines a HID device, it must also specify a HID - * report descriptor length. You must add a PROGMEM character array named - * "usbHidReportDescriptor" to your code which contains the report descriptor. - * Don't forget to keep the array and this define in sync! - */ - -/* ----------------------- Optional MCU Description ------------------------ */ - -/* The following configurations have working defaults in usbdrv.h. You - * usually don't need to set them explicitly. Only if you want to run - * the driver on a device which is not yet supported or with a compiler - * which is not fully supported (such as IAR C) or if you use a differnt - * interrupt than INT0, you may have to define some of these. - */ -/* #define USB_INTR_CFG MCUCR */ -/* #define USB_INTR_CFG_SET ((1 << ISC00) | (1 << ISC01)) */ -/* #define USB_INTR_CFG_CLR 0 */ -/* #define USB_INTR_ENABLE GIMSK */ -/* #define USB_INTR_ENABLE_BIT INT0 */ -/* #define USB_INTR_PENDING GIFR */ -/* #define USB_INTR_PENDING_BIT INTF0 */ - -#ifndef BOOTLOADER - #ifndef USB_HID - #define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC - #define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC - #define USB_CFG_DESCR_PROPS_STRINGS 0 - #define USB_CFG_DESCR_PROPS_STRING_0 0 - #define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 - #define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 - #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 - #define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC - #define USB_CFG_DESCR_PROPS_HID_REPORT 0 - #define USB_CFG_DESCR_PROPS_UNKNOWN 0 - #endif -#endif - -#endif /* __usbconfig_h_included__ */ diff --git a/usbdrv/usbconfig__.h b/usbdrv/usbconfig__.h deleted file mode 100644 index 019b0b9..0000000 --- a/usbdrv/usbconfig__.h +++ /dev/null @@ -1,105 +0,0 @@ -#ifndef __usbconfig_h_included__ -#define __usbconfig_h_included__ -#if defined(CCCB_COMPATIBLE) -#define USB_CFG_IOPORTNAME D -#define USB_CFG_DMINUS_BIT 1 -#define USB_CFG_DPLUS_BIT 2 -#else -#define USB_CFG_IOPORTNAME B -#define USB_CFG_DMINUS_BIT 0 -#define USB_CFG_DPLUS_BIT 1 -#endif -#ifndef BOOTLOADER -#ifndef USB_HID -#define USB_CFG_HAVE_INTRIN_ENDPOINT 1 -#define USB_CFG_HAVE_INTRIN_ENDPOINT3 1 -#else -#define USB_CFG_HAVE_INTRIN_ENDPOINT 0 -#define USB_CFG_HAVE_INTRIN_ENDPOINT3 0 -#endif -#else -#define USB_CFG_HAVE_INTRIN_ENDPOINT 0 -#define USB_CFG_HAVE_INTRIN_ENDPOINT3 0 -#endif -#define USB_CFG_IMPLEMENT_HALT 0 -#define USB_CFG_INTR_POLL_INTERVAL 10 -#define USB_CFG_IS_SELF_POWERED 0 -#define USB_CFG_MAX_BUS_POWER 120 -#define USB_CFG_SAMPLE_EXACT 1 -#define USB_CFG_IMPLEMENT_FN_WRITE 1 -#ifndef BOOTLOADER -#define USB_CFG_IMPLEMENT_FN_READ 1 -#ifndef USB_HID -#define USB_CFG_IMPLEMENT_FN_WRITEOUT 1 -#else -#define USB_CFG_IMPLEMENT_FN_WRITEOUT 0 -#endif -#define USB_CFG_HAVE_FLOWCONTROL 1 -#else -#define USB_CFG_IMPLEMENT_FN_READ 0 -#endif -#ifndef BOOTLOADER -#ifndef ISAVRISPMKII -#define USB_CFG_VENDOR_ID 0xc0, 0x16 -#ifndef USB_HID -#define USB_CFG_DEVICE_ID 0xe1, 0x05 -#else -#define USB_CFG_DEVICE_ID 0xdc, 0x05 -#endif -#else -#define USB_CFG_VENDOR_ID 0x03, 0xeb -#define USB_CFG_DEVICE_ID 0x21, 0x04 -#endif -#endif -#ifndef ISAVRISPMKII -#define USB_CFG_DEVICE_VERSION 0x00, 0x01 -#else -#define USB_CFG_DEVICE_VERSION 0x02, 0x00 -#endif -#ifndef ISUSBASP -#define USB_CFG_VENDOR_NAME 'w', 'i', 'n', 'd', 'f', 'i', 's', 'c', 'h', '.', 'o', 'r', 'g' -#define USB_CFG_VENDOR_NAME_LEN 13 -#define USB_CFG_DEVICE_NAME 's', 'c', 'h', 'e', 'i', 'b', 'e' -#define USB_CFG_DEVICE_NAME_LEN 7 -#else -#define USB_CFG_VENDOR_NAME 'w', 'w', 'w', '.', 'f', 'i', 's', 'c', 'h', 'l', '.', 'd', 'e' -#define USB_CFG_VENDOR_NAME_LEN 13 -#define USB_CFG_DEVICE_NAME 'U', 'S', 'B', 'a', 's', 'p' -#define USB_CFG_DEVICE_NAME_LEN 6 -#endif -#define USB_CFG_SERIAL_NUMBER_LENGTH 0 -#if defined(BOOTLOADER) || defined(USB_HID) -#define USB_CFG_DEVICE_CLASS 0xff -#define USB_CFG_DEVICE_SUBCLASS 0 -#define USB_CFG_INTERFACE_CLASS 0 -#define USB_CFG_INTERFACE_SUBCLASS 0 -#define USB_CFG_INTERFACE_PROTOCOL 0 -#else -#define USB_CFG_DEVICE_CLASS 2 -#define USB_CFG_DEVICE_SUBCLASS 0 -#ifndef ISAVRISPMKII -#define USB_CFG_INTERFACE_CLASS 0x02 /* CDC class */ -#define USB_CFG_INTERFACE_SUBCLASS 2 /* Abstract (Modem) */ -#define USB_CFG_INTERFACE_PROTOCOL 1 /* AT-Commands */ -#else -#define USB_CFG_INTERFACE_CLASS 0xff /* Vendor specific */ -#define USB_CFG_INTERFACE_SUBCLASS 0 /* none */ -#define USB_CFG_INTERFACE_PROTOCOL 0 /* none */ -#endif -#endif -#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH 0 /* total length of report descriptor */ -#ifndef BOOTLOADER -#ifndef USB_HID -#define USB_CFG_DESCR_PROPS_DEVICE USB_PROP_IS_DYNAMIC -#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC -#define USB_CFG_DESCR_PROPS_STRINGS 0 -#define USB_CFG_DESCR_PROPS_STRING_0 0 -#define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 -#define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 -#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 -#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC -#define USB_CFG_DESCR_PROPS_HID_REPORT 0 -#define USB_CFG_DESCR_PROPS_UNKNOWN 0 -#endif -#endif -#endif /* __usbconfig_h_included__ */ -- cgit v1.2.1