bool USB_RemoteWakeupEnabled;\r
bool USB_CurrentlySelfPowered;\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
\r
- while (!(Endpoint_IsINReady()));\r
+ while (!(Endpoint_IsINReady()))\r
+ {\r
+ if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+ return;\r
+ }\r
\r
- UDADDR = ((1 << ADDEN) | ((uint8_t)USB_ControlRequest.wValue & 0x7F));\r
+ UDADDR = ((1 << ADDEN) | DeviceAddress);\r
+\r
+ if (DeviceAddress)\r
+ USB_DeviceState = DEVICE_STATE_Addressed;\r
\r
return;\r
}\r
\r
static void USB_Device_SetConfiguration(void)\r
{\r
- bool AlreadyConfigured = (USB_ConfigurationNumber != 0);\r
-\r
-#if defined(USE_SINGLE_DEVICE_CONFIGURATION)\r
- if ((uint8_t)USB_ControlRequest.wValue > 1)\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
+ uint8_t MemoryAddressSpace;\r
+ #endif\r
+ \r
USB_Descriptor_Device_t* DevDescriptorPtr;\r
\r
- if ((CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr) == NO_DESCRIPTOR) ||\r
+ if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr\r
+ #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+ , &MemoryAddressSpace\r
+ #endif\r
+ ) == NO_DESCRIPTOR)\r
+ {\r
+ return;\r
+ }\r
+ \r
#if defined(USE_RAM_DESCRIPTORS)\r
- ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations))\r
+ if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)\r
+ return;\r
#elif defined (USE_EEPROM_DESCRIPTORS)\r
- ((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
+ if ((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations))\r
+ return;\r
+ #elif defined (USE_FLASH_DESCRIPTORS)\r
+ if ((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations))\r
+ return;\r
#else\r
- ((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
- #endif\r
-#endif\r
+ if (MemoryAddressSpace == MEMSPACE_FLASH)\r
{\r
- return;\r
+ if (((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
+ return;\r
}\r
+ else if (MemoryAddressSpace == MEMSPACE_EEPROM)\r
+ {\r
+ if (((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
+ return;\r
+ }\r
+ else\r
+ {\r
+ if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)\r
+ return;\r
+ }\r
+ #endif\r
+#endif\r
\r
Endpoint_ClearSETUP();\r
\r
\r
Endpoint_ClearIN();\r
\r
- if (!(AlreadyConfigured) && USB_ConfigurationNumber)\r
- EVENT_USB_DeviceEnumerationComplete();\r
+ if (USB_ConfigurationNumber)\r
+ USB_DeviceState = DEVICE_STATE_Configured;\r
+ else\r
+ USB_DeviceState = DEVICE_STATE_Addressed;\r
\r
- EVENT_USB_ConfigurationChanged();\r
+ EVENT_USB_Device_ConfigurationChanged();\r
}\r
\r
void USB_Device_GetConfiguration(void)\r
\r
Endpoint_ClearIN();\r
\r
- while (!(Endpoint_IsOUTReceived()));\r
+ while (!(Endpoint_IsOUTReceived()))\r
+ {\r
+ if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+ return; \r
+ }\r
+\r
Endpoint_ClearOUT();\r
}\r
\r
-static void USB_Device_GetDescriptor(void)\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
- void* DescriptorPointer;\r
- uint16_t DescriptorSize;\r
- \r
- #if defined(USE_INTERNAL_SERIAL)\r
- if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))\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
- uint8_t SignatureDescriptor[2 + (sizeof(int16_t) * 20)];\r
+ USB_Descriptor_Header_t Header;\r
+ int16_t UnicodeString[20];\r
+ } SignatureDescriptor;\r
\r
- SignatureDescriptor[0] = sizeof(SignatureDescriptor);\r
- SignatureDescriptor[1] = DTYPE_String;\r
- \r
- uint16_t* SigUnicodeChars = (uint16_t*)&SignatureDescriptor[2];\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
\r
- for (uint8_t SerialByteNum = 0; SerialByteNum < 10; SerialByteNum++)\r
- {\r
- char ConvSigString[3];\r
+ uint8_t SigReadAddress = 0x0E;\r
\r
- itoa(boot_signature_byte_get(0x0E + SerialByteNum), ConvSigString, 16);\r
- \r
- SigUnicodeChars[0] = toupper(ConvSigString[0]);\r
- SigUnicodeChars[1] = toupper(ConvSigString[1]);\r
- \r
- SigUnicodeChars += 2;\r
+ for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)\r
+ {\r
+ uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);\r
+ \r
+ if (SerialCharNum & 0x01)\r
+ {\r
+ SerialByte >>= 4;\r
+ SigReadAddress++;\r
}\r
\r
- Endpoint_ClearSETUP();\r
- Endpoint_Write_Control_Stream_LE(SignatureDescriptor, sizeof(SignatureDescriptor));\r
- Endpoint_ClearOUT();\r
+ SignatureDescriptor.UnicodeString[SerialCharNum] = USB_Device_NibbleToASCII(SerialByte);\r
+ }\r
+ \r
+ Endpoint_ClearSETUP();\r
+ Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));\r
+ Endpoint_ClearOUT();\r
+}\r
+#endif\r
\r
+static void USB_Device_GetDescriptor(void)\r
+{\r
+ void* DescriptorPointer;\r
+ uint16_t DescriptorSize;\r
+ \r
+ #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+ uint8_t DescriptorAddressSpace;\r
+ #endif\r
+ \r
+ #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
+ if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))\r
+ {\r
+ USB_Device_GetInternalSerialDescriptor();\r
return;\r
}\r
#endif\r
\r
if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,\r
- &DescriptorPointer)) == NO_DESCRIPTOR)\r
+ &DescriptorPointer\r
+ #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+ , &DescriptorAddressSpace\r
+ #endif\r
+ )) == NO_DESCRIPTOR)\r
{\r
return;\r
}\r
\r
#if defined(USE_RAM_DESCRIPTORS)\r
Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);\r
+ #elif defined(USE_EEPROM_DESCRIPTORS)\r
+ Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);\r
+ #elif defined(USE_FLASH_DESCRIPTORS)\r
+ Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize); \r
#else\r
- bool SendZLP;\r
- \r
- if (USB_ControlRequest.wLength > DescriptorSize)\r
- USB_ControlRequest.wLength = DescriptorSize;\r
- \r
- while (USB_ControlRequest.wLength)\r
- {\r
- while (!(Endpoint_IsINReady()))\r
- {\r
- if (Endpoint_IsOUTReceived())\r
- {\r
- Endpoint_ClearOUT();\r
- return;\r
- } \r
- }\r
- \r
- while (USB_ControlRequest.wLength && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
- {\r
- #if defined (USE_EEPROM_DESCRIPTORS)\r
- Endpoint_Write_Byte(eeprom_read_byte(DescriptorPointer++)); \r
- #else\r
- Endpoint_Write_Byte(pgm_read_byte(DescriptorPointer++));\r
- #endif\r
- \r
- USB_ControlRequest.wLength--;\r
- }\r
- \r
- SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
- Endpoint_ClearIN();\r
- }\r
- \r
- if (SendZLP)\r
- {\r
- while (!(Endpoint_IsINReady()));\r
- Endpoint_ClearIN();\r
- }\r
-\r
- while (!(Endpoint_IsOUTReceived()));\r
+ if (DescriptorAddressSpace == MEMSPACE_FLASH)\r
+ Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize); \r
+ else if (DescriptorAddressSpace == MEMSPACE_EEPROM)\r
+ Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);\r
+ else\r
+ Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize); \r
#endif\r
- \r
+\r
Endpoint_ClearOUT();\r
}\r
\r
\r
break;\r
#endif\r
+ default:\r
+ return;\r
}\r
\r
Endpoint_ClearSETUP();\r
\r
Endpoint_ClearIN();\r
\r
- while (!(Endpoint_IsOUTReceived()));\r
+ while (!(Endpoint_IsOUTReceived()))\r
+ {\r
+ if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+ return; \r
+ }\r
+ \r
Endpoint_ClearOUT();\r
}\r
\r
projects / pub / USBasp.git / blobdiff