/*\r
LUFA Library\r
- Copyright (C) Dean Camera, 2009.\r
+ Copyright (C) Dean Camera, 2010.\r
\r
dean [at] fourwalledcubicle [dot] com\r
www.fourwalledcubicle.com\r
*/\r
\r
/*\r
- Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
- Permission to use, copy, modify, and distribute this software\r
- and its documentation for any purpose and without fee is hereby\r
- granted, provided that the above copyright notice appear in all\r
- copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting\r
- documentation, and that the name of the author not be used in\r
- advertising or publicity pertaining to distribution of the\r
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+ Permission to use, copy, modify, distribute, and sell this \r
+ software and its documentation for any purpose is hereby granted\r
+ without fee, provided that the above copyright notice appear in \r
+ all copies and that both that the copyright notice and this\r
+ permission notice and warranty disclaimer appear in supporting \r
+ documentation, and that the name of the author not be used in \r
+ advertising or publicity pertaining to distribution of the \r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
this software.\r
*/\r
\r
+#define __INCLUDE_FROM_USB_DRIVER\r
#include "../HighLevel/USBMode.h"\r
\r
#if defined(USB_CAN_BE_DEVICE)\r
\r
-#define INCLUDE_FROM_DEVCHAPTER9_C\r
+#define __INCLUDE_FROM_DEVCHAPTER9_C\r
#include "DevChapter9.h"\r
\r
uint8_t USB_ConfigurationNumber;\r
-bool USB_RemoteWakeupEnabled;\r
+\r
+#if !defined(NO_DEVICE_SELF_POWER)\r
bool USB_CurrentlySelfPowered;\r
+#endif\r
+\r
+#if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
+bool USB_RemoteWakeupEnabled;\r
+#endif\r
\r
-void USB_Device_ProcessControlPacket(void)\r
+void USB_Device_ProcessControlRequest(void)\r
{\r
bool RequestHandled = false;\r
uint8_t* RequestHeader = (uint8_t*)&USB_ControlRequest;\r
}\r
\r
if (!(RequestHandled))\r
- EVENT_USB_UnhandledControlPacket();\r
+ EVENT_USB_Device_UnhandledControlRequest();\r
\r
if (Endpoint_IsSETUPReceived())\r
{\r
\r
static void USB_Device_SetAddress(void)\r
{\r
+ uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);\r
+\r
Endpoint_ClearSETUP();\r
\r
- Endpoint_ClearIN();\r
+ Endpoint_ClearStatusStage();\r
\r
- while (!(Endpoint_IsINReady()));\r
+ while (!(Endpoint_IsINReady()))\r
+ {\r
+ if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+ return;\r
+ }\r
+\r
+ if (DeviceAddress)\r
+ USB_DeviceState = DEVICE_STATE_Addressed;\r
\r
- UDADDR = ((1 << ADDEN) | ((uint8_t)USB_ControlRequest.wValue & 0x7F));\r
+ UDADDR = ((1 << ADDEN) | DeviceAddress);\r
\r
return;\r
}\r
\r
static void USB_Device_SetConfiguration(void)\r
{\r
- bool AlreadyConfigured = (USB_ConfigurationNumber != 0);\r
-\r
-#if defined(TOTAL_NUM_CONFIGURATIONS)\r
- if ((uint8_t)USB_ControlRequest.wValue > TOTAL_NUM_CONFIGURATIONS)\r
+#if defined(FIXED_NUM_CONFIGURATIONS)\r
+ if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)\r
return;\r
#else\r
#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
\r
USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;\r
\r
- Endpoint_ClearIN();\r
+ Endpoint_ClearStatusStage();\r
\r
- if (!(AlreadyConfigured) && USB_ConfigurationNumber)\r
- EVENT_USB_DeviceEnumerationComplete();\r
+ USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;\r
\r
- EVENT_USB_ConfigurationChanged();\r
+ EVENT_USB_Device_ConfigurationChanged();\r
}\r
\r
void USB_Device_GetConfiguration(void)\r
Endpoint_ClearSETUP();\r
\r
Endpoint_Write_Byte(USB_ConfigurationNumber);\r
- \r
Endpoint_ClearIN();\r
\r
- while (!(Endpoint_IsOUTReceived()));\r
- Endpoint_ClearOUT();\r
+ Endpoint_ClearStatusStage();\r
}\r
\r
#if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
+static char USB_Device_NibbleToASCII(uint8_t Nibble)\r
+{\r
+ Nibble = ((Nibble & 0x0F) + '0');\r
+ return (Nibble > '9') ? (Nibble + ('A' - '9' - 1)) : Nibble;\r
+}\r
+\r
static void USB_Device_GetInternalSerialDescriptor(void)\r
{\r
struct\r
{\r
USB_Descriptor_Header_t Header;\r
- int16_t UnicodeString[12];\r
+ int16_t UnicodeString[20];\r
} SignatureDescriptor;\r
- \r
- uint8_t SigReadAddress = 0x0E; \r
- bool OddNibbleRead = false;\r
\r
- #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\r
- SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);\r
- SignatureDescriptor.Header.Type = DTYPE_String;\r
- #else\r
- SignatureDescriptor.Header.bLength = sizeof(SignatureDescriptor);\r
- SignatureDescriptor.Header.bDescriptorType = DTYPE_String;\r
- #endif\r
+ SignatureDescriptor.Header.Type = DTYPE_String;\r
+ SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);\r
+ \r
+ uint8_t SigReadAddress = 0x0E;\r
\r
- for (uint8_t SerialCharNum = 0; SerialCharNum < 12; SerialCharNum++)\r
+ for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)\r
{\r
uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);\r
\r
- if (OddNibbleRead)\r
+ if (SerialCharNum & 0x01)\r
{\r
SerialByte >>= 4;\r
SigReadAddress++;\r
}\r
- else\r
- {\r
- SerialByte &= 0x0F;\r
- }\r
\r
- OddNibbleRead = !(OddNibbleRead);\r
-\r
- if (SerialByte < 0x0A)\r
- SerialByte += '0';\r
- else\r
- SerialByte += ('A' - 0x0A);\r
-\r
- SignatureDescriptor.UnicodeString[SerialCharNum] = SerialByte;\r
+ SignatureDescriptor.UnicodeString[SerialCharNum] = USB_Device_NibbleToASCII(SerialByte);\r
}\r
\r
Endpoint_ClearSETUP();\r
+\r
Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));\r
+\r
Endpoint_ClearOUT();\r
}\r
#endif\r
\r
switch (USB_ControlRequest.bmRequestType)\r
{\r
+#if !defined(NO_DEVICE_SELF_POWER) || !defined(NO_DEVICE_REMOTE_WAKEUP) \r
case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):\r
+ #if !defined(NO_DEVICE_SELF_POWER)\r
if (USB_CurrentlySelfPowered)\r
CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;\r
- \r
+ #endif\r
+\r
+ #if !defined(NO_DEVICE_REMOTE_WAKEUP) \r
if (USB_RemoteWakeupEnabled)\r
CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;\r
- \r
+ #endif\r
break;\r
+#endif\r
#if !defined(CONTROL_ONLY_DEVICE)\r
case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):\r
- Endpoint_SelectEndpoint((uint8_t)USB_ControlRequest.wIndex);\r
+ Endpoint_SelectEndpoint(USB_ControlRequest.wIndex & 0xFF);\r
\r
CurrentStatus = Endpoint_IsStalled();\r
\r
\r
break;\r
#endif\r
+ default:\r
+ return;\r
}\r
\r
Endpoint_ClearSETUP();\r
\r
Endpoint_Write_Word_LE(CurrentStatus);\r
-\r
Endpoint_ClearIN();\r
\r
- while (!(Endpoint_IsOUTReceived()));\r
- Endpoint_ClearOUT();\r
+ Endpoint_ClearStatusStage();\r
}\r
\r
static void USB_Device_ClearSetFeature(void)\r
{ \r
switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)\r
{\r
+#if !defined(NO_DEVICE_REMOTE_WAKEUP) \r
case REQREC_DEVICE:\r
if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)\r
USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);\r
return;\r
\r
break; \r
+#endif\r
#if !defined(CONTROL_ONLY_DEVICE)\r
case REQREC_ENDPOINT:\r
if ((uint8_t)USB_ControlRequest.wValue == FEATURE_ENDPOINT_HALT)\r
\r
if (Endpoint_IsEnabled())\r
{ \r
- if (USB_ControlRequest.bRequest == REQ_ClearFeature)\r
+ if (USB_ControlRequest.bRequest == REQ_SetFeature)\r
{\r
- Endpoint_ClearStall();\r
- Endpoint_ResetFIFO(EndpointIndex);\r
- Endpoint_ResetDataToggle();\r
+ Endpoint_StallTransaction();\r
}\r
else\r
{\r
- Endpoint_StallTransaction();\r
- }\r
+ Endpoint_ClearStall();\r
+ Endpoint_ResetFIFO(EndpointIndex);\r
+ Endpoint_ResetDataToggle();\r
+ } \r
}\r
}\r
\r
break;\r
#endif\r
+ default:\r
+ return;\r
}\r
\r
Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
\r
Endpoint_ClearSETUP();\r
\r
- Endpoint_ClearIN();\r
+ Endpoint_ClearStatusStage();\r
}\r
\r
#endif\r
projects / pub / USBasp.git / blobdiff