Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
5f709e28
Commit
5f709e28
authored
May 20, 2012
by
Dean Camera
Browse files
Merge in latest trunk.
parents
28967ef2
5833b27f
Changes
18
Expand all
Show whitespace changes
Inline
Side-by-side
LUFA.pnproj
View file @
5f709e28
This diff is collapsed.
Click to expand it.
Projects/AVRISP-MKII/AVRISP-MKII.c
View file @
5f709e28
...
...
@@ -131,3 +131,24 @@ void AVRISP_Task(void)
}
}
/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
* documentation) by the application code so that the address and size of a requested descriptor can be given
* to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
* USB host.
*
* \param[in] wValue Descriptor type and index to retrieve
* \param[in] wIndex Sub-index to retrieve (such as a localized string language)
* \param[out] DescriptorAddress Address of the retrieved descriptor
* \param[out] DescriptorMemorySpace Memory space that the descriptor is stored in
*
* \return Length of the retrieved descriptor in bytes, or NO_DESCRIPTOR if the descriptor was not found
*/
uint16_t
CALLBACK_USB_GetDescriptor
(
const
uint16_t
wValue
,
const
uint8_t
wIndex
,
const
void
**
const
DescriptorAddress
,
uint8_t
*
DescriptorMemorySpace
)
{
return
AVRISP_GetDescriptor
(
wValue
,
wIndex
,
DescriptorAddress
,
DescriptorMemorySpace
);
}
Projects/AVRISP-MKII/AVRISP-MKII.h
View file @
5f709e28
...
...
@@ -49,7 +49,7 @@
#include
<LUFA/Drivers/Peripheral/ADC.h>
#endif
#include
"Descriptors.h"
#include
"
AVRISP
Descriptors.h"
#include
"Lib/V2Protocol.h"
#include
"Config/AppConfig.h"
...
...
@@ -80,5 +80,11 @@
void
EVENT_USB_Device_Disconnect
(
void
);
void
EVENT_USB_Device_ConfigurationChanged
(
void
);
uint16_t
CALLBACK_USB_GetDescriptor
(
const
uint16_t
wValue
,
const
uint8_t
wIndex
,
const
void
**
const
DescriptorAddress
,
uint8_t
*
const
DescriptorMemorySpace
)
ATTR_WARN_UNUSED_RESULT
ATTR_NON_NULL_PTR_ARG
(
3
)
ATTR_NON_NULL_PTR_ARG
(
4
);
#endif
Projects/AVRISP-MKII/AVRISP-MKII.txt
View file @
5f709e28
...
...
@@ -304,6 +304,9 @@
* reset externally via the reset pin, the compatibility mode will be toggled. The compatibility mode is preserved between
* power cycles and is not toggled via other forms of reset such as Watchdog or Brown Out.
*
* When this option is enabled, all board LEDs will flash twice on startup for Jungo compatibility mode, and five times for
* libUSB compatibility mode.
*
* \note This option is incompatible with \c LIBUSB_DRIVER_COMPAT.</td>
* </tr>
* <tr>
...
...
Projects/
XPLAINBridge
/AVRISPDescriptors.c
→
Projects/
AVRISP-MKII
/AVRISPDescriptors.c
View file @
5f709e28
...
...
@@ -37,6 +37,16 @@
#include
"AVRISPDescriptors.h"
#if defined(RESET_TOGGLES_LIBUSB_COMPAT) || defined(__DOXYGEN__)
static
bool
AVRISP_NeedCompatibilitySwitch
ATTR_NO_INIT
;
/** 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
/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
* device characteristics, including the supported USB version, control endpoint size and the
* number of device configurations. The descriptor is read out by the USB host when the enumeration
...
...
@@ -69,7 +79,7 @@ const USB_Descriptor_Device_t PROGMEM AVRISP_DeviceDescriptor =
* and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
* a configuration so that the host may correctly communicate with the USB device.
*/
const
AVRISP_USB_Descriptor_Configuration_t
PROGMEM
AVRISP_ConfigurationDescriptor
=
AVRISP_USB_Descriptor_Configuration_t
AVRISP_ConfigurationDescriptor
=
{
.
Config
=
{
...
...
@@ -106,7 +116,11 @@ const AVRISP_USB_Descriptor_Configuration_t PROGMEM AVRISP_ConfigurationDescript
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_Endpoint_t
),
.
Type
=
DTYPE_Endpoint
},
#if defined(RESET_TOGGLES_LIBUSB_COMPAT)
.
EndpointAddress
=
0
,
#else
.
EndpointAddress
=
AVRISP_DATA_IN_EPADDR
,
#endif
.
Attributes
=
(
EP_TYPE_BULK
|
ENDPOINT_ATTR_NO_SYNC
|
ENDPOINT_USAGE_DATA
),
.
EndpointSize
=
AVRISP_DATA_EPSIZE
,
.
PollingIntervalMS
=
0x0A
...
...
@@ -163,7 +177,7 @@ const USB_Descriptor_String_t PROGMEM AVRISP_SerialString =
{
.
Header
=
{.
Size
=
USB_STRING_LEN
(
13
),
.
Type
=
DTYPE_String
},
.
UnicodeString
=
L"0002000
53650
\0
"
.
UnicodeString
=
L"0002000
12345
\0
"
// Note: Real AVRISP-MKII has the embedded NUL byte, bug in firmware?
};
/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
...
...
@@ -174,7 +188,8 @@ const USB_Descriptor_String_t PROGMEM AVRISP_SerialString =
*/
uint16_t
AVRISP_GetDescriptor
(
const
uint16_t
wValue
,
const
uint8_t
wIndex
,
const
void
**
const
DescriptorAddress
)
const
void
**
const
DescriptorAddress
,
uint8_t
*
DescriptorMemorySpace
)
{
const
uint8_t
DescriptorType
=
(
wValue
>>
8
);
const
uint8_t
DescriptorNumber
=
(
wValue
&
0xFF
);
...
...
@@ -182,6 +197,8 @@ uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
const
void
*
Address
=
NULL
;
uint16_t
Size
=
NO_DESCRIPTOR
;
*
DescriptorMemorySpace
=
MEMSPACE_FLASH
;
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
...
...
@@ -189,6 +206,11 @@ uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
*
DescriptorMemorySpace
=
MEMSPACE_RAM
;
#if defined(RESET_TOGGLES_LIBUSB_COMPAT)
AVRISP_ConfigurationDescriptor
.
AVRISP_DataInEndpoint
.
EndpointAddress
=
AVRISP_CurrDataINEndpointAddress
;
#endif
Address
=
&
AVRISP_ConfigurationDescriptor
;
Size
=
sizeof
(
AVRISP_USB_Descriptor_Configuration_t
);
break
;
...
...
@@ -219,3 +241,71 @@ uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
*
DescriptorAddress
=
Address
;
return
Size
;
}
#if defined(RESET_TOGGLES_LIBUSB_COMPAT) || defined(__DOXYGEN__)
/** Checks the state of the system status register MCUSR and indicates via a flag if
* the current AVRISP driver compatibility mode needs to be reset.
*
* When the \c RESET_TOGGLES_LIBUSB_COMPAT compile time option is enabled, pulling
* the reset line of the AVR low will toggle between Jungo and libUSB compatibility
* modes. Other forms of reset (such as power on or watchdog) will not force a mode
* change.
*/
void
CheckExternalReset
(
void
)
{
/* If an external reset occured, we need to change compatibility mode */
AVRISP_NeedCompatibilitySwitch
=
(
MCUSR
==
(
1
<<
EXTRF
));
MCUSR
=
0
;
}
/** Updates the device descriptors so that the correct compatibility mode is used
* when the \c RESET_TOGGLES_LIBUSB_COMPAT compile time option is enabled. This
* configures the programmer for either Jungo or libUSB driver compatibility. Each
* time the AVR is reset via pulling the reset line low the compatibility mode will
* be toggled. The current mode is stored in EEPROM and preserved through power
* cycles of the AVR.
*/
void
UpdateCurrentCompatibilityMode
(
void
)
{
/* 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
)
{
/* Toggle between compatibility modes */
AVRISP_CurrDataINEndpointAddress
=
(
AVRISP_CurrDataINEndpointAddress
==
AVRISP_DATA_IN_EPADDR_LIBUSB
)
?
AVRISP_DATA_IN_EPADDR_JUNGO
:
AVRISP_DATA_IN_EPADDR_LIBUSB
;
/* Save the new mode into EEPROM */
eeprom_update_byte
(
&
AVRISP_CurrDataINEndpointAddress_EEPROM
,
AVRISP_CurrDataINEndpointAddress
);
}
LEDs_SetAllLEDs
(
LEDS_NO_LEDS
);
/* Validate IN endpoint address and indicate current mode via LED flashes */
switch
(
AVRISP_CurrDataINEndpointAddress
)
{
default:
/* Default to Jungo compatibility mode if saved EEPROM is invalid */
AVRISP_CurrDataINEndpointAddress
=
AVRISP_DATA_IN_EPADDR_JUNGO
;
case
AVRISP_DATA_IN_EPADDR_JUNGO
:
/* Two flashes for Jungo compatibility mode */
for
(
uint8_t
i
=
0
;
i
<
4
;
i
++
)
{
LEDs_ToggleLEDs
(
LEDS_ALL_LEDS
);
Delay_MS
(
100
);
}
break
;
case
AVRISP_DATA_IN_EPADDR_LIBUSB
:
/* Five flashes for libUSB compatibility mode */
for
(
uint8_t
i
=
0
;
i
<
10
;
i
++
)
{
LEDs_ToggleLEDs
(
LEDS_ALL_LEDS
);
Delay_MS
(
100
);
}
break
;
}
}
#endif
Projects/AVRISP-MKII/Descriptors.h
→
Projects/AVRISP-MKII/
AVRISP
Descriptors.h
View file @
5f709e28
...
...
@@ -42,8 +42,6 @@
#include
<LUFA/Drivers/USB/USB.h>
#include
<LUFA/Drivers/Board/LEDs.h>
#include
"Config/AppConfig.h"
/* Preprocessor Checks: */
#if defined(LIBUSB_DRIVER_COMPAT) && defined(RESET_TOGGLES_LIBUSB_COMPAT)
#error LIBUSB_DRIVER_COMPAT and RESET_TOGGLES_LIBUSB_COMPAT are mutually exclusive.
...
...
@@ -84,7 +82,7 @@
USB_Descriptor_Interface_t
AVRISP_Interface
;
USB_Descriptor_Endpoint_t
AVRISP_DataInEndpoint
;
USB_Descriptor_Endpoint_t
AVRISP_DataOutEndpoint
;
}
USB_Descriptor_Configuration_t
;
}
AVRISP_
USB_Descriptor_Configuration_t
;
/* External Variables: */
#if defined(RESET_TOGGLES_LIBUSB_COMPAT)
...
...
@@ -92,7 +90,7 @@
#endif
/* Function Prototypes: */
uint16_t
CALLBACK_USB
_GetDescriptor
(
const
uint16_t
wValue
,
uint16_t
AVRISP
_GetDescriptor
(
const
uint16_t
wValue
,
const
uint8_t
wIndex
,
const
void
**
const
DescriptorAddress
,
uint8_t
*
const
DescriptorMemorySpace
)
...
...
Projects/AVRISP-MKII/Descriptors.c
deleted
100644 → 0
View file @
28967ef2
/*
LUFA Library
Copyright (C) Dean Camera, 2012.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
Copyright 2012 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
software, including all implied warranties of merchantability
and fitness. In no event shall the author be liable for any
special, indirect or consequential damages or any damages
whatsoever resulting from loss of use, data or profits, whether
in an action of contract, negligence or other tortious action,
arising out of or in connection with the use or performance of
this software.
*/
/** \file
*
* USB Device Descriptors, for library use when in USB device mode. Descriptors are special
* computer-readable structures which the host requests upon device enumeration, to determine
* the device's capabilities and functions.
*/
#include
"Descriptors.h"
#if defined(RESET_TOGGLES_LIBUSB_COMPAT) || defined(__DOXYGEN__)
static
bool
AVRISP_NeedCompatibilitySwitch
ATTR_NO_INIT
;
/** 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
/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
* device characteristics, including the supported USB version, control endpoint size and the
* number of device configurations. The descriptor is read out by the USB host when the enumeration
* process begins.
*/
const
USB_Descriptor_Device_t
PROGMEM
DeviceDescriptor
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_Device_t
),
.
Type
=
DTYPE_Device
},
.
USBSpecification
=
VERSION_BCD
(
01
.
10
),
.
Class
=
USB_CSCP_VendorSpecificClass
,
.
SubClass
=
USB_CSCP_NoDeviceSubclass
,
.
Protocol
=
USB_CSCP_NoDeviceProtocol
,
.
Endpoint0Size
=
FIXED_CONTROL_ENDPOINT_SIZE
,
.
VendorID
=
0x03EB
,
.
ProductID
=
0x2104
,
.
ReleaseNumber
=
VERSION_BCD
(
02
.
00
),
.
ManufacturerStrIndex
=
0x01
,
.
ProductStrIndex
=
0x02
,
.
SerialNumStrIndex
=
0x03
,
.
NumberOfConfigurations
=
FIXED_NUM_CONFIGURATIONS
};
/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
* of the device in one of its supported configurations, including information about any device interfaces
* and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
* a configuration so that the host may correctly communicate with the USB device.
*/
USB_Descriptor_Configuration_t
ConfigurationDescriptor
=
{
.
Config
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_Configuration_Header_t
),
.
Type
=
DTYPE_Configuration
},
.
TotalConfigurationSize
=
sizeof
(
USB_Descriptor_Configuration_t
),
.
TotalInterfaces
=
1
,
.
ConfigurationNumber
=
1
,
.
ConfigurationStrIndex
=
NO_DESCRIPTOR
,
.
ConfigAttributes
=
(
USB_CONFIG_ATTR_RESERVED
|
USB_CONFIG_ATTR_SELFPOWERED
),
.
MaxPowerConsumption
=
USB_CONFIG_POWER_MA
(
100
)
},
.
AVRISP_Interface
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_Interface_t
),
.
Type
=
DTYPE_Interface
},
.
InterfaceNumber
=
0
,
.
AlternateSetting
=
0
,
.
TotalEndpoints
=
2
,
.
Class
=
USB_CSCP_VendorSpecificClass
,
.
SubClass
=
USB_CSCP_NoDeviceSubclass
,
.
Protocol
=
USB_CSCP_NoDeviceProtocol
,
.
InterfaceStrIndex
=
NO_DESCRIPTOR
},
.
AVRISP_DataInEndpoint
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_Endpoint_t
),
.
Type
=
DTYPE_Endpoint
},
#if defined(RESET_TOGGLES_LIBUSB_COMPAT)
.
EndpointAddress
=
0
,
#else
.
EndpointAddress
=
AVRISP_DATA_IN_EPADDR
,
#endif
.
Attributes
=
(
EP_TYPE_BULK
|
ENDPOINT_ATTR_NO_SYNC
|
ENDPOINT_USAGE_DATA
),
.
EndpointSize
=
AVRISP_DATA_EPSIZE
,
.
PollingIntervalMS
=
0x0A
},
.
AVRISP_DataOutEndpoint
=
{
.
Header
=
{.
Size
=
sizeof
(
USB_Descriptor_Endpoint_t
),
.
Type
=
DTYPE_Endpoint
},
.
EndpointAddress
=
AVRISP_DATA_OUT_EPADDR
,
.
Attributes
=
(
EP_TYPE_BULK
|
ENDPOINT_ATTR_NO_SYNC
|
ENDPOINT_USAGE_DATA
),
.
EndpointSize
=
AVRISP_DATA_EPSIZE
,
.
PollingIntervalMS
=
0x0A
},
};
/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests
* the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
* via the language ID table available at USB.org what languages the device supports for its string descriptors.
*/
const
USB_Descriptor_String_t
PROGMEM
LanguageString
=
{
.
Header
=
{.
Size
=
USB_STRING_LEN
(
1
),
.
Type
=
DTYPE_String
},
.
UnicodeString
=
{
LANGUAGE_ID_ENG
}
};
/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable
* form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
* Descriptor.
*/
const
USB_Descriptor_String_t
PROGMEM
ManufacturerString
=
{
.
Header
=
{.
Size
=
USB_STRING_LEN
(
5
),
.
Type
=
DTYPE_String
},
.
UnicodeString
=
L"ATMEL"
};
/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
* and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
* Descriptor.
*/
const
USB_Descriptor_String_t
PROGMEM
ProductString
=
{
.
Header
=
{.
Size
=
USB_STRING_LEN
(
11
),
.
Type
=
DTYPE_String
},
.
UnicodeString
=
L"AVRISP mkII"
};
/** Serial number string. This is a Unicode string containing the device's unique serial number, expressed as a
* series of uppercase hexadecimal digits.
*/
const
USB_Descriptor_String_t
PROGMEM
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?
};
/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
* documentation) by the application code so that the address and size of a requested descriptor can be given
* to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
* USB host.
*/
uint16_t
CALLBACK_USB_GetDescriptor
(
const
uint16_t
wValue
,
const
uint8_t
wIndex
,
const
void
**
const
DescriptorAddress
,
uint8_t
*
DescriptorMemorySpace
)
{
const
uint8_t
DescriptorType
=
(
wValue
>>
8
);
const
uint8_t
DescriptorNumber
=
(
wValue
&
0xFF
);
const
void
*
Address
=
NULL
;
uint16_t
Size
=
NO_DESCRIPTOR
;
*
DescriptorMemorySpace
=
MEMSPACE_FLASH
;
switch
(
DescriptorType
)
{
case
DTYPE_Device
:
Address
=
&
DeviceDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Device_t
);
break
;
case
DTYPE_Configuration
:
*
DescriptorMemorySpace
=
MEMSPACE_RAM
;
#if defined(RESET_TOGGLES_LIBUSB_COMPAT)
ConfigurationDescriptor
.
AVRISP_DataInEndpoint
.
EndpointAddress
=
AVRISP_CurrDataINEndpointAddress
;
#endif
Address
=
&
ConfigurationDescriptor
;
Size
=
sizeof
(
USB_Descriptor_Configuration_t
);
break
;
case
DTYPE_String
:
switch
(
DescriptorNumber
)
{
case
0x00
:
Address
=
&
LanguageString
;
Size
=
pgm_read_byte
(
&
LanguageString
.
Header
.
Size
);
break
;
case
0x01
:
Address
=
&
ManufacturerString
;
Size
=
pgm_read_byte
(
&
ManufacturerString
.
Header
.
Size
);
break
;
case
0x02
:
Address
=
&
ProductString
;
Size
=
pgm_read_byte
(
&
ProductString
.
Header
.
Size
);
break
;
case
0x03
:
Address
=
&
SerialString
;
Size
=
pgm_read_byte
(
&
SerialString
.
Header
.
Size
);
break
;
}
break
;
}
*
DescriptorAddress
=
Address
;
return
Size
;
}
#if defined(RESET_TOGGLES_LIBUSB_COMPAT) || defined(__DOXYGEN__)
/** Checks the state of the system status register MCUSR and indicates via a flag if
* the current AVRISP driver compatibility mode needs to be reset.
*
* When the \c RESET_TOGGLES_LIBUSB_COMPAT compile time option is enabled, pulling
* the reset line of the AVR low will toggle between Jungo and libUSB compatibility
* modes. Other forms of reset (such as power on or watchdog) will not force a mode
* change.
*/
void
CheckExternalReset
(
void
)
{
/* If an external reset occured, we need to change compatibility mode */
AVRISP_NeedCompatibilitySwitch
=
(
MCUSR
==
(
1
<<
EXTRF
));
MCUSR
=
0
;
}
/** Updates the device descriptors so that the correct compatibility mode is used
* when the \c RESET_TOGGLES_LIBUSB_COMPAT compile time option is enabled. This
* configures the programmer for either Jungo or libUSB driver compatibility. Each
* time the AVR is reset via pulling the reset line low the compatibility mode will
* be toggled. The current mode is stored in EEPROM and preserved through power
* cycles of the AVR.
*/
void
UpdateCurrentCompatibilityMode
(
void
)
{
/* 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
)
{
/* Toggle between compatibility modes */
AVRISP_CurrDataINEndpointAddress
=
(
AVRISP_CurrDataINEndpointAddress
==
AVRISP_DATA_IN_EPADDR_LIBUSB
)
?
AVRISP_DATA_IN_EPADDR_JUNGO
:
AVRISP_DATA_IN_EPADDR_LIBUSB
;
/* Save the new mode into EEPROM */
eeprom_update_byte
(
&
AVRISP_CurrDataINEndpointAddress_EEPROM
,
AVRISP_CurrDataINEndpointAddress
);
}
LEDs_SetAllLEDs
(
LEDS_NO_LEDS
);
/* Validate IN endpoint address and indicate current mode via LED flashes */
switch
(
AVRISP_CurrDataINEndpointAddress
)
{
default:
/* Default to Jungo compatibility mode if saved EEPROM is invalid */
AVRISP_CurrDataINEndpointAddress
=
AVRISP_DATA_IN_EPADDR_JUNGO
;
case
AVRISP_DATA_IN_EPADDR_JUNGO
:
/* Two flashes for Jungo compatibility mode */
for
(
uint8_t
i
=
0
;
i
<
4
;
i
++
)
{
LEDs_ToggleLEDs
(
LEDS_ALL_LEDS
);
Delay_MS
(
100
);
}
break
;
case
AVRISP_DATA_IN_EPADDR_LIBUSB
:
/* Five flashes for libUSB compatibility mode */
for
(
uint8_t
i
=
0
;
i
<
10
;
i
++
)
{
LEDs_ToggleLEDs
(
LEDS_ALL_LEDS
);
Delay_MS
(
100
);
}
break
;
}
}
#endif
Projects/AVRISP-MKII/Lib/V2Protocol.h
View file @
5f709e28
...
...
@@ -43,10 +43,10 @@
#include
<LUFA/Drivers/USB/USB.h>
#include
"../Descriptors.h"
#include
"../
AVRISP
Descriptors.h"
#include
"V2ProtocolConstants.h"
#include
"V2ProtocolParams.h"
//
#include "ISP/ISPProtocol.h"
#include
"ISP/ISPProtocol.h"
#include
"XPROG/XPROGProtocol.h"
#include
"Config/AppConfig.h"
...
...
Projects/AVRISP-MKII/makefile
View file @
5f709e28
...
...
@@ -129,7 +129,7 @@ include $(LUFA_PATH)/LUFA/makefile
# List C source files here. (C dependencies are automatically generated.)
SRC
=
$(TARGET)
.c
\
Descriptors.c
\
AVRISP
Descriptors.c
\
Lib/V2Protocol.c
\
Lib/V2ProtocolParams.c
\
Lib/ISP/ISPProtocol.c
\
...
...
Projects/XPLAINBridge/AVRISPDescriptors.h
deleted
100644 → 0
View file @
28967ef2
/*
LUFA Library
Copyright (C) Dean Camera, 2012.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
Copyright 2012 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
software, including all implied warranties of merchantability
and fitness. In no event shall the author be liable for any
special, indirect or consequential damages or any damages
whatsoever resulting from loss of use, data or profits, whether
in an action of contract, negligence or other tortious action,
arising out of or in connection with the use or performance of
this software.
*/
/** \file
*
* Header file for AVRISPDescriptors.c.
*/
#ifndef _AVRISP_DESCRIPTORS_H_
#define _AVRISP_DESCRIPTORS_H_
/* Includes: */
#include
<avr/pgmspace.h>
#include
<LUFA/Drivers/USB/USB.h>
#include
"Config/AppConfig.h"
/* Macros: */
#if !defined(LIBUSB_DRIVER_COMPAT) || defined(__DOXYGEN__)
/** Endpoint address of the AVRISP data OUT endpoint. */
#define AVRISP_DATA_OUT_EPADDR (ENDPOINT_DIR_OUT | 2)
/** Endpoint address of the AVRISP data IN endpoint. */