projects
/
pub
/
USBasp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4a3b70e
)
General cleanup and more port work to the AVR32 UC3B.
author
Dean Camera
<dean@fourwalledcubicle.com>
Sun, 27 Feb 2011 18:25:29 +0000
(18:25 +0000)
committer
Dean Camera
<dean@fourwalledcubicle.com>
Sun, 27 Feb 2011 18:25:29 +0000
(18:25 +0000)
LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Core/UC3B/Host_UC3B.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.h
patch
|
blob
|
blame
|
history
diff --git
a/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
index
61e47cf
..
dbbe884
100644
(file)
--- a/
LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
+++ b/
LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
@@
-92,7
+92,7
@@
defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__)))
/** String descriptor index for the device's unique serial number string descriptor within the device.
* This unique serial number is used by the host to associate resources to the device (such as drivers or COM port
defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__)))
/** String descriptor index for the device's unique serial number string descriptor within the device.
* This unique serial number is used by the host to associate resources to the device (such as drivers or COM port
- * number allocations) to a device regardless of the port it is plugged in to on the host. Some
USB AVR
s contain
+ * number allocations) to a device regardless of the port it is plugged in to on the host. Some
microcontroller
s contain
* a unique serial number internally, and setting the device descriptors serial number string index to this value
* will cause it to use the internal serial number.
*
* a unique serial number internally, and setting the device descriptors serial number string index to this value
* will cause it to use the internal serial number.
*
diff --git
a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
index
b51f17d
..
30979af
100644
(file)
--- a/
LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
+++ b/
LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
@@
-101,7
+101,7
@@
#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
#define ENDPOINT_DETAILS_MAXEP 7
#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
#define ENDPOINT_DETAILS_MAXEP 7
- #define ENDPOINT_DETAILS_EP0 64,
2
+ #define ENDPOINT_DETAILS_EP0 64,
1
#define ENDPOINT_DETAILS_EP1 256, 2
#define ENDPOINT_DETAILS_EP2 64, 2
#define ENDPOINT_DETAILS_EP3 64, 2
#define ENDPOINT_DETAILS_EP1 256, 2
#define ENDPOINT_DETAILS_EP2 64, 2
#define ENDPOINT_DETAILS_EP3 64, 2
@@
-111,7
+111,7
@@
#else
#define ENDPOINT_DETAILS_MAXEP 5
#else
#define ENDPOINT_DETAILS_MAXEP 5
- #define ENDPOINT_DETAILS_EP0 64,
2
+ #define ENDPOINT_DETAILS_EP0 64,
1
#define ENDPOINT_DETAILS_EP1 64, 1
#define ENDPOINT_DETAILS_EP2 64, 1
#define ENDPOINT_DETAILS_EP3 64, 2
#define ENDPOINT_DETAILS_EP1 64, 1
#define ENDPOINT_DETAILS_EP2 64, 1
#define ENDPOINT_DETAILS_EP3 64, 2
@@
-262,8
+262,8
@@
* ascending order, or bank corruption will occur.
* \n\n
*
* ascending order, or bank corruption will occur.
* \n\n
*
- * \note
Certain models of USB AVR's endpoints may have different maximum packet sizes based on the endpoint's
- *
index - refer to the chosen USB AVR
's datasheet to determine the maximum bank size for each endpoint.
+ * \note
Different endpoints may have different maximum packet sizes based on the endpoint's index - refer to
+ *
the chosen microcontroller model
's datasheet to determine the maximum bank size for each endpoint.
* \n\n
*
* \note The default control endpoint should not be manually configured by the user application, as
* \n\n
*
* \note The default control endpoint should not be manually configured by the user application, as
diff --git
a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
index
42876d6
..
3aea58f
100644
(file)
--- a/
LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
+++ b/
LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
@@
-838,8
+838,8
@@
* or bank corruption will occur.
* \n\n
*
* or bank corruption will occur.
* \n\n
*
- * \note Certain m
odels of USB AVR
's pipes may have different maximum packet sizes based on the pipe's
- * index - refer to the chosen
USB AVR
's datasheet to determine the maximum bank size for each pipe.
+ * \note Certain m
icrocontroller model
's pipes may have different maximum packet sizes based on the pipe's
+ * index - refer to the chosen
microcontroller
's datasheet to determine the maximum bank size for each pipe.
* \n\n
*
* \note The default control pipe should not be manually configured by the user application, as it is
* \n\n
*
* \note The default control pipe should not be manually configured by the user application, as it is
diff --git
a/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
b/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
index
0e76923
..
e74f361
100644
(file)
--- a/
LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
+++ b/
LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
@@
-63,18
+63,13
@@
/* Macros: */
\r
/** \name USB Device Mode Option Masks */
\r
//@{
\r
/* Macros: */
\r
/** \name USB Device Mode Option Masks */
\r
//@{
\r
- #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) || defined(__DOXYGEN__)
\r
- /** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
\r
- * USB interface should be initialized in low speed (1.5Mb/s) mode.
\r
- *
\r
- * \note Low Speed mode is not available on all USB AVR models.
\r
- * \n
\r
- *
\r
- * \note Restrictions apply on the number, size and type of endpoints which can be used
\r
- * when running in low speed mode - refer to the USB 2.0 specification.
\r
- */
\r
- #define USB_DEVICE_OPT_LOWSPEED (1 << 0)
\r
- #endif
\r
+ /** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
\r
+ * USB interface should be initialized in low speed (1.5Mb/s) mode.
\r
+ *
\r
+ * \note Restrictions apply on the number, size and type of endpoints which can be used
\r
+ * when running in low speed mode - refer to the USB 2.0 specification.
\r
+ */
\r
+ #define USB_DEVICE_OPT_LOWSPEED (1 << 0)
\r
\r
/** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
\r
* USB interface should be initialized in full speed (12Mb/s) mode.
\r
\r
/** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
\r
* USB interface should be initialized in full speed (12Mb/s) mode.
\r
@@
-84,7
+79,7
@@
\r
/** String descriptor index for the device's unique serial number string descriptor within the device.
\r
* This unique serial number is used by the host to associate resources to the device (such as drivers or COM port
\r
\r
/** String descriptor index for the device's unique serial number string descriptor within the device.
\r
* This unique serial number is used by the host to associate resources to the device (such as drivers or COM port
\r
- * number allocations) to a device regardless of the port it is plugged in to on the host. Some
USB AVR
s contain
\r
+ * number allocations) to a device regardless of the port it is plugged in to on the host. Some
microcontroller
s contain
\r
* a unique serial number internally, and setting the device descriptors serial number string index to this value
\r
* will cause it to use the internal serial number.
\r
*
\r
* a unique serial number internally, and setting the device descriptors serial number string index to this value
\r
* will cause it to use the internal serial number.
\r
*
\r
@@
-152,7
+147,6
@@
/* Private Interface - For use in library only: */
\r
#if !defined(__DOXYGEN__)
\r
/* Inline Functions: */
\r
/* Private Interface - For use in library only: */
\r
#if !defined(__DOXYGEN__)
\r
/* Inline Functions: */
\r
- #if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
\r
static inline void USB_Device_SetLowSpeed(void) ATTR_ALWAYS_INLINE;
\r
static inline void USB_Device_SetLowSpeed(void)
\r
{
\r
static inline void USB_Device_SetLowSpeed(void) ATTR_ALWAYS_INLINE;
\r
static inline void USB_Device_SetLowSpeed(void)
\r
{
\r
@@
-164,7
+158,6
@@
{
\r
AVR32_USBB.UDCON.ls = false;
\r
}
\r
{
\r
AVR32_USBB.UDCON.ls = false;
\r
}
\r
- #endif
\r
\r
static inline void USB_Device_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
\r
static inline void USB_Device_SetDeviceAddress(const uint8_t Address)
\r
\r
static inline void USB_Device_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
\r
static inline void USB_Device_SetDeviceAddress(const uint8_t Address)
\r
diff --git
a/LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.h
b/LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.h
index
ca7403a
..
556ac84
100644
(file)
--- a/
LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.h
+++ b/
LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.h
@@
-98,25
+98,15
@@
#define _ENDPOINT_GET_BANKS2(EPDetails) _ENDPOINT_GET_BANKS3(EPDetails)
\r
#define _ENDPOINT_GET_BANKS3(MaxSize, Banks) (Banks)
\r
\r
#define _ENDPOINT_GET_BANKS2(EPDetails) _ENDPOINT_GET_BANKS3(EPDetails)
\r
#define _ENDPOINT_GET_BANKS3(MaxSize, Banks) (Banks)
\r
\r
- #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
\r
- #define ENDPOINT_DETAILS_MAXEP 7
\r
-
\r
- #define ENDPOINT_DETAILS_EP0 64, 2
\r
- #define ENDPOINT_DETAILS_EP1 256, 2
\r
- #define ENDPOINT_DETAILS_EP2 64, 2
\r
- #define ENDPOINT_DETAILS_EP3 64, 2
\r
- #define ENDPOINT_DETAILS_EP4 64, 2
\r
- #define ENDPOINT_DETAILS_EP5 64, 2
\r
- #define ENDPOINT_DETAILS_EP6 64, 2
\r
- #else
\r
- #define ENDPOINT_DETAILS_MAXEP 5
\r
+ #define ENDPOINT_DETAILS_MAXEP 7
\r
\r
\r
- #define ENDPOINT_DETAILS_EP0 64, 2
\r
- #define ENDPOINT_DETAILS_EP1 64, 1
\r
- #define ENDPOINT_DETAILS_EP2 64, 1
\r
- #define ENDPOINT_DETAILS_EP3 64, 2
\r
- #define ENDPOINT_DETAILS_EP4 64, 2
\r
- #endif
\r
+ #define ENDPOINT_DETAILS_EP0 64, 1
\r
+ #define ENDPOINT_DETAILS_EP1 64, 2
\r
+ #define ENDPOINT_DETAILS_EP2 64, 2
\r
+ #define ENDPOINT_DETAILS_EP3 64, 2
\r
+ #define ENDPOINT_DETAILS_EP4 64, 2
\r
+ #define ENDPOINT_DETAILS_EP5 256, 2
\r
+ #define ENDPOINT_DETAILS_EP6 256, 2
\r
\r
/* Inline Functions: */
\r
static inline uint32_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST
\r
\r
/* Inline Functions: */
\r
static inline uint32_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST
\r
@@
-174,13
+164,6
@@
* accesses the second bank.
\r
*/
\r
#define ENDPOINT_BANK_DOUBLE AVR32_USBB_UECFG0_EPBK_DOUBLE
\r
* accesses the second bank.
\r
*/
\r
#define ENDPOINT_BANK_DOUBLE AVR32_USBB_UECFG0_EPBK_DOUBLE
\r
-
\r
- /** Mask for the bank mode selection for the \ref Endpoint_ConfigureEndpoint() macro. This indicates
\r
- * that the endpoint should have three banks, which requires more USB FIFO memory but results
\r
- * in faster transfers as one USB device (the AVR or the host) can access one bank while the other
\r
- * accesses the remaining banks.
\r
- */
\r
- #define ENDPOINT_BANK_TRIPLE AVR32_USBB_UECFG0_EPBK_TRIPLE
\r
//@}
\r
\r
#if (!defined(FIXED_CONTROL_ENDPOINT_SIZE) || defined(__DOXYGEN__))
\r
//@}
\r
\r
#if (!defined(FIXED_CONTROL_ENDPOINT_SIZE) || defined(__DOXYGEN__))
\r
@@
-210,7
+193,7
@@
\r
#if !defined(CONTROL_ONLY_DEVICE) || defined(__DOXYGEN__)
\r
/** Total number of endpoints (including the default control endpoint at address 0) which may
\r
\r
#if !defined(CONTROL_ONLY_DEVICE) || defined(__DOXYGEN__)
\r
/** Total number of endpoints (including the default control endpoint at address 0) which may
\r
- * be used in the device. Different
USB
AVR models support different amounts of endpoints,
\r
+ * be used in the device. Different AVR models support different amounts of endpoints,
\r
* this value reflects the maximum number of endpoints for the currently selected AVR model.
\r
*/
\r
#define ENDPOINT_TOTAL_ENDPOINTS ENDPOINT_DETAILS_MAXEP
\r
* this value reflects the maximum number of endpoints for the currently selected AVR model.
\r
*/
\r
#define ENDPOINT_TOTAL_ENDPOINTS ENDPOINT_DETAILS_MAXEP
\r
@@
-270,8
+253,8
@@
* ascending order, or bank corruption will occur.
\r
* \n\n
\r
*
\r
* ascending order, or bank corruption will occur.
\r
* \n\n
\r
*
\r
- * \note
Certain models of USB AVR's endpoints may have different maximum packet sizes based on the endpoint's
\r
- *
index - refer to the chosen USB AVR
's datasheet to determine the maximum bank size for each endpoint.
\r
+ * \note
Different endpoints may have different maximum packet sizes based on the endpoint's index - refer to
\r
+ *
the chosen microcontroller model
's datasheet to determine the maximum bank size for each endpoint.
\r
* \n\n
\r
*
\r
* \note The default control endpoint should not be manually configured by the user application, as
\r
* \n\n
\r
*
\r
* \note The default control endpoint should not be manually configured by the user application, as
\r
diff --git
a/LUFA/Drivers/USB/Core/UC3B/Host_UC3B.h
b/LUFA/Drivers/USB/Core/UC3B/Host_UC3B.h
index
816b198
..
4d08a4c
100644
(file)
--- a/
LUFA/Drivers/USB/Core/UC3B/Host_UC3B.h
+++ b/
LUFA/Drivers/USB/Core/UC3B/Host_UC3B.h
@@
-355,8
+355,6
@@
static inline void USB_Host_VBUS_Manual_Enable(void)
\r
{
\r
AVR32_USBB.USBCON.vbushwc = true;
\r
static inline void USB_Host_VBUS_Manual_Enable(void)
\r
{
\r
AVR32_USBB.USBCON.vbushwc = true;
\r
-
\r
- // TODO: Manual VBUS pin output setup
\r
}
\r
\r
static inline void USB_Host_VBUS_Auto_On(void) ATTR_ALWAYS_INLINE;
\r
}
\r
\r
static inline void USB_Host_VBUS_Auto_On(void) ATTR_ALWAYS_INLINE;
\r
@@
-368,7
+366,7
@@
static inline void USB_Host_VBUS_Manual_On(void) ATTR_ALWAYS_INLINE;
\r
static inline void USB_Host_VBUS_Manual_On(void)
\r
{
\r
static inline void USB_Host_VBUS_Manual_On(void) ATTR_ALWAYS_INLINE;
\r
static inline void USB_Host_VBUS_Manual_On(void)
\r
{
\r
- // TODO: Manual VBUS pin output on
\r
+ AVR32_USBB.USBSTASET.vbusrqs = true;
\r
}
\r
\r
static inline void USB_Host_VBUS_Auto_Off(void) ATTR_ALWAYS_INLINE;
\r
}
\r
\r
static inline void USB_Host_VBUS_Auto_Off(void) ATTR_ALWAYS_INLINE;
\r
@@
-380,7
+378,7
@@
static inline void USB_Host_VBUS_Manual_Off(void) ATTR_ALWAYS_INLINE;
\r
static inline void USB_Host_VBUS_Manual_Off(void)
\r
{
\r
static inline void USB_Host_VBUS_Manual_Off(void) ATTR_ALWAYS_INLINE;
\r
static inline void USB_Host_VBUS_Manual_Off(void)
\r
{
\r
- // TODO: Manual VBUS pin output off
\r
+ AVR32_USBB.USBSTACLR.vbusrqc = true;
\r
}
\r
\r
static inline void USB_Host_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
\r
}
\r
\r
static inline void USB_Host_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
\r
diff --git
a/LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.h
b/LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.h
index
1d7a002
..
484e48a
100644
(file)
--- a/
LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.h
+++ b/
LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.h
@@
-172,15
+172,14
@@
#define PIPE_CONTROLPIPE_DEFAULT_SIZE 64
\r
\r
/** Total number of pipes (including the default control pipe at address 0) which may be used in
\r
#define PIPE_CONTROLPIPE_DEFAULT_SIZE 64
\r
\r
/** Total number of pipes (including the default control pipe at address 0) which may be used in
\r
- * the device. Different USB AVR models support different amounts of pipes, this value reflects
\r
- * the maximum number of pipes for the currently selected AVR model.
\r
+ * the device.
\r
*/
\r
#define PIPE_TOTAL_PIPES 7
\r
\r
/** Size in bytes of the largest pipe bank size possible in the device. Not all banks on each AVR
\r
* model supports the largest bank size possible on the device; different pipe numbers support
\r
* different maximum bank sizes. This value reflects the largest possible bank of any pipe on the
\r
*/
\r
#define PIPE_TOTAL_PIPES 7
\r
\r
/** Size in bytes of the largest pipe bank size possible in the device. Not all banks on each AVR
\r
* model supports the largest bank size possible on the device; different pipe numbers support
\r
* different maximum bank sizes. This value reflects the largest possible bank of any pipe on the
\r
- * currently selected U
S
B AVR model.
\r
+ * currently selected U
C3
B AVR model.
\r
*/
\r
#define PIPE_MAX_SIZE 256
\r
\r
*/
\r
#define PIPE_MAX_SIZE 256
\r
\r
@@
-857,8
+856,8
@@
* or bank corruption will occur.
\r
* \n\n
\r
*
\r
* or bank corruption will occur.
\r
* \n\n
\r
*
\r
- * \note Certain m
odels of USB AVR
's pipes may have different maximum packet sizes based on the pipe's
\r
- * index - refer to the chosen
USB AVR
's datasheet to determine the maximum bank size for each pipe.
\r
+ * \note Certain m
icrocontroller model
's pipes may have different maximum packet sizes based on the pipe's
\r
+ * index - refer to the chosen
microcontroller
's datasheet to determine the maximum bank size for each pipe.
\r
* \n\n
\r
*
\r
* \note The default control pipe should not be manually configured by the user application, as it is
\r
* \n\n
\r
*
\r
* \note The default control pipe should not be manually configured by the user application, as it is
\r
diff --git
a/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c
b/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c
index
68092fb
..
cc4de29
100644
(file)
--- a/
LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c
+++ b/
LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c
@@
-152,25
+152,15
@@
static void USB_Init_Device(void)
USB_Descriptor_Device_t* DeviceDescriptorPtr;
\r
\r
if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR)
\r
USB_Descriptor_Device_t* DeviceDescriptorPtr;
\r
\r
if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR)
\r
- {
\r
- #if defined(USE_RAM_DESCRIPTORS)
\r
- USB_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;
\r
- #elif defined(USE_EEPROM_DESCRIPTORS)
\r
- USB_ControlEndpointSize = eeprom_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
\r
- #else
\r
- USB_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
\r
- #endif
\r
- }
\r
+ USB_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;
\r
#endif
\r
\r
#endif
\r
\r
- #if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
\r
if (USB_Options & USB_DEVICE_OPT_LOWSPEED)
\r
USB_Device_SetLowSpeed();
\r
else
\r
USB_Device_SetFullSpeed();
\r
\r
USB_INT_Enable(USB_INT_VBUS);
\r
if (USB_Options & USB_DEVICE_OPT_LOWSPEED)
\r
USB_Device_SetLowSpeed();
\r
else
\r
USB_Device_SetFullSpeed();
\r
\r
USB_INT_Enable(USB_INT_VBUS);
\r
- #endif
\r
\r
Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
\r
ENDPOINT_DIR_OUT, USB_ControlEndpointSize,
\r
\r
Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
\r
ENDPOINT_DIR_OUT, USB_ControlEndpointSize,
\r
@@
-192,9
+182,7
@@
static void USB_Init_Host(void)
\r
USB_Host_HostMode_On();
\r
\r
\r
USB_Host_HostMode_On();
\r
\r
- USB_Host_VBUS_Auto_Off();
\r
- USB_Host_VBUS_Manual_Enable();
\r
- USB_Host_VBUS_Manual_On();
\r
+ USB_Host_VBUS_Auto_On();
\r
\r
USB_INT_Enable(USB_INT_SRPI);
\r
USB_INT_Enable(USB_INT_BCERRI);
\r
\r
USB_INT_Enable(USB_INT_SRPI);
\r
USB_INT_Enable(USB_INT_BCERRI);
\r
diff --git
a/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.h
b/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.h
index
7eb69cd
..
56ee252
100644
(file)
--- a/
LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.h
+++ b/
LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.h
@@
-123,8
+123,6
@@
/* Inline Functions: */
\r
/** Determines if the VBUS line is currently high (i.e. the USB host is supplying power).
\r
*
\r
/* Inline Functions: */
\r
/** Determines if the VBUS line is currently high (i.e. the USB host is supplying power).
\r
*
\r
- * \note This function is not available on some AVR models which do not support hardware VBUS monitoring.
\r
- *
\r
* \return Boolean \c true if the VBUS line is currently detecting power from a host, \c false otherwise.
\r
*/
\r
static inline bool USB_VBUS_GetStatus(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
\r
* \return Boolean \c true if the VBUS line is currently detecting power from a host, \c false otherwise.
\r
*/
\r
static inline bool USB_VBUS_GetStatus(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
\r
@@
-193,10
+191,6
@@
* this function). To statically set the USB options, pass in the \c USE_STATIC_OPTIONS token,
\r
* defined to the appropriate options masks. When the options are statically set, this
\r
* parameter does not exist in the function prototype.
\r
* this function). To statically set the USB options, pass in the \c USE_STATIC_OPTIONS token,
\r
* defined to the appropriate options masks. When the options are statically set, this
\r
* parameter does not exist in the function prototype.
\r
- * \n\n
\r
- *
\r
- * \note The mode parameter does not exist on devices where only one mode is possible, such as USB
\r
- * AVR models which only implement the USB device mode in hardware.
\r
*
\r
* \see \ref Group_Device for the \c USB_DEVICE_OPT_* masks.
\r
*/
\r
*
\r
* \see \ref Group_Device for the \c USB_DEVICE_OPT_* masks.
\r
*/
\r
projects / pub / USBasp.git / commitdiff