projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the same as...
[pub/USBasp.git]
/
Projects
/
AVRISP-MKII
/
AVRISPDescriptors.c
diff --git
a/Projects/AVRISP-MKII/AVRISPDescriptors.c
b/Projects/AVRISP-MKII/AVRISPDescriptors.c
index
205aff0
..
c185cb9
100644
(file)
--- a/
Projects/AVRISP-MKII/AVRISPDescriptors.c
+++ b/
Projects/AVRISP-MKII/AVRISPDescriptors.c
@@
-1,13
+1,13
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
2
.
+ Copyright (C) Dean Camera, 201
3
.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
- Copyright 201
2
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
3
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
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
@@
-43,7
+43,7
@@
/** Current AVRISP data IN endpoint address. */
uint8_t AVRISP_CurrDataINEndpointAddress;
/** Current AVRISP data IN endpoint address. */
uint8_t AVRISP_CurrDataINEndpointAddress;
-
+
/** Saved AVRISP data IN endpoint address in EEPROM. */
uint8_t AVRISP_CurrDataINEndpointAddress_EEPROM EEMEM;
#endif
/** Saved AVRISP data IN endpoint address in EEPROM. */
uint8_t AVRISP_CurrDataINEndpointAddress_EEPROM EEMEM;
#endif
@@
-68,9
+68,9
@@
const USB_Descriptor_Device_t PROGMEM AVRISP_DeviceDescriptor =
.ProductID = 0x2104,
.ReleaseNumber = VERSION_BCD(02.00),
.ProductID = 0x2104,
.ReleaseNumber = VERSION_BCD(02.00),
- .ManufacturerStrIndex =
0x01
,
- .ProductStrIndex =
0x02
,
- .SerialNumStrIndex =
0x03
,
+ .ManufacturerStrIndex =
AVRISP_STRING_ID_Manufacturer
,
+ .ProductStrIndex =
AVRISP_STRING_ID_Product
,
+ .SerialNumStrIndex =
AVRISP_STRING_ID_Serial
,
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
};
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
};
@@
-101,7
+101,7
@@
AVRISP_USB_Descriptor_Configuration_t AVRISP_ConfigurationDescriptor =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
- .InterfaceNumber =
0
,
+ .InterfaceNumber =
INTERFACE_ID_AVRISP
,
.AlternateSetting = 0,
.TotalEndpoints = 2,
.AlternateSetting = 0,
.TotalEndpoints = 2,
@@
-177,7
+177,7
@@
const USB_Descriptor_String_t PROGMEM AVRISP_ProductString =
USB_Descriptor_String_t AVRISP_SerialString =
{
.Header = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},
USB_Descriptor_String_t AVRISP_SerialString =
{
.Header = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},
-
+
.UnicodeString = L"000200012345\0" // Note: Real AVRISP-MKII has the embedded NUL byte, bug in firmware?
};
.UnicodeString = L"000200012345\0" // Note: Real AVRISP-MKII has the embedded NUL byte, bug in firmware?
};
@@
-199,7
+199,7
@@
uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
uint16_t Size = NO_DESCRIPTOR;
*DescriptorMemorySpace = MEMSPACE_FLASH;
uint16_t Size = NO_DESCRIPTOR;
*DescriptorMemorySpace = MEMSPACE_FLASH;
-
+
switch (DescriptorType)
{
case DTYPE_Device:
switch (DescriptorType)
{
case DTYPE_Device:
@@
-219,25
+219,25
@@
uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
case DTYPE_String:
switch (DescriptorNumber)
{
case DTYPE_String:
switch (DescriptorNumber)
{
- case
0x00
:
+ case
AVRISP_STRING_ID_Language
:
Address = &AVRISP_LanguageString;
Size = pgm_read_byte(&AVRISP_LanguageString.Header.Size);
break;
Address = &AVRISP_LanguageString;
Size = pgm_read_byte(&AVRISP_LanguageString.Header.Size);
break;
- case
0x01
:
+ case
AVRISP_STRING_ID_Manufacturer
:
Address = &AVRISP_ManufacturerString;
Size = pgm_read_byte(&AVRISP_ManufacturerString.Header.Size);
break;
Address = &AVRISP_ManufacturerString;
Size = pgm_read_byte(&AVRISP_ManufacturerString.Header.Size);
break;
- case
0x02
:
+ case
AVRISP_STRING_ID_Product
:
Address = &AVRISP_ProductString;
Size = pgm_read_byte(&AVRISP_ProductString.Header.Size);
break;
Address = &AVRISP_ProductString;
Size = pgm_read_byte(&AVRISP_ProductString.Header.Size);
break;
- case
0x03
:
+ case
AVRISP_STRING_ID_Serial
:
Address = &AVRISP_SerialString;
Size = AVRISP_SerialString.Header.Size;
Address = &AVRISP_SerialString;
Size = AVRISP_SerialString.Header.Size;
-
+
/* Update serial number to have a different serial based on the current endpoint address */
((uint16_t*)&AVRISP_SerialString.UnicodeString)[6] = cpu_to_le16('0' + (AVRISP_DATA_IN_EPADDR & ENDPOINT_EPNUM_MASK));
/* Update serial number to have a different serial based on the current endpoint address */
((uint16_t*)&AVRISP_SerialString.UnicodeString)[6] = cpu_to_le16('0' + (AVRISP_DATA_IN_EPADDR & ENDPOINT_EPNUM_MASK));
-
+
*DescriptorMemorySpace = MEMSPACE_RAM;
break;
}
*DescriptorMemorySpace = MEMSPACE_RAM;
break;
}
@@
-259,7
+259,7
@@
uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
* change.
*/
void CheckExternalReset(void)
* change.
*/
void CheckExternalReset(void)
-{
+{
/* If an external reset occurred, we need to change compatibility mode */
AVRISP_NeedCompatibilitySwitch = (MCUSR == (1 << EXTRF));
/* If an external reset occurred, we need to change compatibility mode */
AVRISP_NeedCompatibilitySwitch = (MCUSR == (1 << EXTRF));
@@
-277,7
+277,7
@@
void UpdateCurrentCompatibilityMode(void)
{
/* Load the current IN endpoint address stored in EEPROM */
AVRISP_CurrDataINEndpointAddress = eeprom_read_byte(&AVRISP_CurrDataINEndpointAddress_EEPROM);
{
/* Load the current IN endpoint address stored in EEPROM */
AVRISP_CurrDataINEndpointAddress = eeprom_read_byte(&AVRISP_CurrDataINEndpointAddress_EEPROM);
-
+
/* Check if we need to switch compatibility modes */
if (AVRISP_NeedCompatibilitySwitch)
{
/* Check if we need to switch compatibility modes */
if (AVRISP_NeedCompatibilitySwitch)
{
@@
-303,7
+303,7
@@
void UpdateCurrentCompatibilityMode(void)
{
LEDs_ToggleLEDs(LEDS_ALL_LEDS);
Delay_MS(100);
{
LEDs_ToggleLEDs(LEDS_ALL_LEDS);
Delay_MS(100);
- }
+ }
break;
case AVRISP_DATA_IN_EPADDR_LIBUSB:
/* Five flashes for libUSB compatibility mode */
break;
case AVRISP_DATA_IN_EPADDR_LIBUSB:
/* Five flashes for libUSB compatibility mode */
@@
-314,7
+314,7
@@
void UpdateCurrentCompatibilityMode(void)
}
break;
}
}
break;
}
-
+
Delay_MS(500);
}
#endif
Delay_MS(500);
}
#endif
projects / pub / USBasp.git / blobdiff