X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/37f8a84f35dadf27a6f8997b675238269f854b45..03ee87b35abdb8b92e8b55ec040fa943f9a6786c:/LUFA/Drivers/USB/LowLevel/DevChapter9.c diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c index deaa9c038..3118302cf 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c @@ -1,21 +1,21 @@ /* LUFA Library - Copyright (C) Dean Camera, 2009. + Copyright (C) Dean Camera, 2010. dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ /* - Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - Permission to use, copy, modify, and distribute this software - and its documentation for any purpose and without fee is hereby - granted, provided that the above copyright notice appear in all - copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the + Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the software without specific, written prior permission. The author disclaim all warranties with regard to this @@ -36,10 +36,16 @@ #include "DevChapter9.h" uint8_t USB_ConfigurationNumber; -bool USB_RemoteWakeupEnabled; + +#if !defined(NO_DEVICE_SELF_POWER) bool USB_CurrentlySelfPowered; +#endif + +#if !defined(NO_DEVICE_REMOTE_WAKEUP) +bool USB_RemoteWakeupEnabled; +#endif -void USB_Device_ProcessControlPacket(void) +void USB_Device_ProcessControlRequest(void) { bool RequestHandled = false; uint8_t* RequestHeader = (uint8_t*)&USB_ControlRequest; @@ -106,7 +112,7 @@ void USB_Device_ProcessControlPacket(void) } if (!(RequestHandled)) - EVENT_USB_UnhandledControlPacket(); + EVENT_USB_Device_UnhandledControlRequest(); if (Endpoint_IsSETUPReceived()) { @@ -117,23 +123,30 @@ void USB_Device_ProcessControlPacket(void) static void USB_Device_SetAddress(void) { + uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F); + Endpoint_ClearSETUP(); - Endpoint_ClearIN(); + Endpoint_ClearStatusStage(); - while (!(Endpoint_IsINReady())); + while (!(Endpoint_IsINReady())) + { + if (USB_DeviceState == DEVICE_STATE_Unattached) + return; + } + + if (DeviceAddress) + USB_DeviceState = DEVICE_STATE_Addressed; - UDADDR = ((1 << ADDEN) | ((uint8_t)USB_ControlRequest.wValue & 0x7F)); + UDADDR = ((1 << ADDEN) | DeviceAddress); return; } static void USB_Device_SetConfiguration(void) { - bool AlreadyConfigured = (USB_ConfigurationNumber != 0); - -#if defined(TOTAL_NUM_CONFIGURATIONS) - if ((uint8_t)USB_ControlRequest.wValue > TOTAL_NUM_CONFIGURATIONS) +#if defined(FIXED_NUM_CONFIGURATIONS) + if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS) return; #else #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS) @@ -144,8 +157,9 @@ static void USB_Device_SetConfiguration(void) if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS) - , &MemoryAddressSpace) == NO_DESCRIPTOR) + , &MemoryAddressSpace #endif + ) == NO_DESCRIPTOR) { return; } @@ -182,12 +196,11 @@ static void USB_Device_SetConfiguration(void) USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue; - Endpoint_ClearIN(); + Endpoint_ClearStatusStage(); - if (!(AlreadyConfigured) && USB_ConfigurationNumber) - EVENT_USB_DeviceEnumerationComplete(); + USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed; - EVENT_USB_ConfigurationChanged(); + EVENT_USB_Device_ConfigurationChanged(); } void USB_Device_GetConfiguration(void) @@ -195,59 +208,48 @@ void USB_Device_GetConfiguration(void) Endpoint_ClearSETUP(); Endpoint_Write_Byte(USB_ConfigurationNumber); - Endpoint_ClearIN(); - while (!(Endpoint_IsOUTReceived())); - Endpoint_ClearOUT(); + Endpoint_ClearStatusStage(); } #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)) +static char USB_Device_NibbleToASCII(uint8_t Nibble) +{ + Nibble = ((Nibble & 0x0F) + '0'); + return (Nibble > '9') ? (Nibble + ('A' - '9' - 1)) : Nibble; +} + static void USB_Device_GetInternalSerialDescriptor(void) { struct { USB_Descriptor_Header_t Header; - int16_t UnicodeString[12]; + int16_t UnicodeString[20]; } SignatureDescriptor; - - uint8_t SigReadAddress = 0x0E; - bool OddNibbleRead = false; - #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES) - SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor); - SignatureDescriptor.Header.Type = DTYPE_String; - #else - SignatureDescriptor.Header.bLength = sizeof(SignatureDescriptor); - SignatureDescriptor.Header.bDescriptorType = DTYPE_String; - #endif + SignatureDescriptor.Header.Type = DTYPE_String; + SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor); + + uint8_t SigReadAddress = 0x0E; - for (uint8_t SerialCharNum = 0; SerialCharNum < 12; SerialCharNum++) + for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++) { uint8_t SerialByte = boot_signature_byte_get(SigReadAddress); - if (OddNibbleRead) + if (SerialCharNum & 0x01) { SerialByte >>= 4; SigReadAddress++; } - else - { - SerialByte &= 0x0F; - } - OddNibbleRead = !(OddNibbleRead); - - if (SerialByte < 0x0A) - SerialByte += '0'; - else - SerialByte += ('A' - 0x0A); - - SignatureDescriptor.UnicodeString[SerialCharNum] = SerialByte; + SignatureDescriptor.UnicodeString[SerialCharNum] = USB_Device_NibbleToASCII(SerialByte); } Endpoint_ClearSETUP(); + Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor)); + Endpoint_ClearOUT(); } #endif @@ -305,17 +307,22 @@ static void USB_Device_GetStatus(void) switch (USB_ControlRequest.bmRequestType) { +#if !defined(NO_DEVICE_SELF_POWER) || !defined(NO_DEVICE_REMOTE_WAKEUP) case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE): + #if !defined(NO_DEVICE_SELF_POWER) if (USB_CurrentlySelfPowered) CurrentStatus |= FEATURE_SELFPOWERED_ENABLED; - + #endif + + #if !defined(NO_DEVICE_REMOTE_WAKEUP) if (USB_RemoteWakeupEnabled) CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED; - + #endif break; +#endif #if !defined(CONTROL_ONLY_DEVICE) case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT): - Endpoint_SelectEndpoint((uint8_t)USB_ControlRequest.wIndex); + Endpoint_SelectEndpoint(USB_ControlRequest.wIndex & 0xFF); CurrentStatus = Endpoint_IsStalled(); @@ -323,22 +330,23 @@ static void USB_Device_GetStatus(void) break; #endif + default: + return; } Endpoint_ClearSETUP(); Endpoint_Write_Word_LE(CurrentStatus); - Endpoint_ClearIN(); - while (!(Endpoint_IsOUTReceived())); - Endpoint_ClearOUT(); + Endpoint_ClearStatusStage(); } static void USB_Device_ClearSetFeature(void) { switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) { +#if !defined(NO_DEVICE_REMOTE_WAKEUP) case REQREC_DEVICE: if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP) USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature); @@ -346,6 +354,7 @@ static void USB_Device_ClearSetFeature(void) return; break; +#endif #if !defined(CONTROL_ONLY_DEVICE) case REQREC_ENDPOINT: if ((uint8_t)USB_ControlRequest.wValue == FEATURE_ENDPOINT_HALT) @@ -359,28 +368,30 @@ static void USB_Device_ClearSetFeature(void) if (Endpoint_IsEnabled()) { - if (USB_ControlRequest.bRequest == REQ_ClearFeature) + if (USB_ControlRequest.bRequest == REQ_SetFeature) { - Endpoint_ClearStall(); - Endpoint_ResetFIFO(EndpointIndex); - Endpoint_ResetDataToggle(); + Endpoint_StallTransaction(); } else { - Endpoint_StallTransaction(); - } + Endpoint_ClearStall(); + Endpoint_ResetFIFO(EndpointIndex); + Endpoint_ResetDataToggle(); + } } } break; #endif + default: + return; } Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP); Endpoint_ClearSETUP(); - Endpoint_ClearIN(); + Endpoint_ClearStatusStage(); } #endif