aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/STM32
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-02-08 06:29:27 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-02-08 06:29:27 +0000
commit9ab9d1b44b1dfc11094faf3da939d35061b53bed (patch)
tree879d7431abdb2155de9b444005448499e757e437 /testhal/STM32
parent0847ae54f0d4f32f87dc47338a5a9903ce6bc3e0 (diff)
downloadChibiOS-9ab9d1b44b1dfc11094faf3da939d35061b53bed.tar.gz
ChibiOS-9ab9d1b44b1dfc11094faf3da939d35061b53bed.tar.bz2
ChibiOS-9ab9d1b44b1dfc11094faf3da939d35061b53bed.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2719 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32')
-rw-r--r--testhal/STM32/USB_CDC/main.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/testhal/STM32/USB_CDC/main.c b/testhal/STM32/USB_CDC/main.c
index b55b24892..04fd4d615 100644
--- a/testhal/STM32/USB_CDC/main.c
+++ b/testhal/STM32/USB_CDC/main.c
@@ -251,11 +251,12 @@ USBEndpointState ep3state;
* @brief EP1 initialization structure (IN only).
*/
static const USBEndpointConfig ep1config = {
+ EP_TYPE_BULK,
sduDataTransmitted,
NULL,
0x0040,
0x0000,
- EPR_EP_TYPE_BULK | EPR_STAT_TX_NAK | EPR_STAT_RX_DIS,
+ USB_EP_FLAGS_IN_PACKET_MODE,
0x00C0,
0x0000
};
@@ -264,11 +265,12 @@ static const USBEndpointConfig ep1config = {
* @brief EP2 initialization structure (IN only).
*/
static const USBEndpointConfig ep2config = {
+ EP_TYPE_INTR,
sduInterruptTransmitted,
NULL,
0x0010,
0x0000,
- EPR_EP_TYPE_INTERRUPT | EPR_STAT_TX_NAK | EPR_STAT_RX_DIS,
+ 0,
0x0100,
0x0000
};
@@ -277,11 +279,12 @@ static const USBEndpointConfig ep2config = {
* @brief EP3 initialization structure (OUT only).
*/
static const USBEndpointConfig ep3config = {
+ EP_TYPE_BULK,
NULL,
sduDataReceived,
0x0000,
0x0040,
- EPR_EP_TYPE_BULK | EPR_STAT_TX_DIS | EPR_STAT_RX_VALID,
+ USB_EP_FLAGS_OUT_PACKET_MODE,
0x0000,
0x0110
};