aboutsummaryrefslogtreecommitdiffstats
path: root/testhal
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-02-12 19:52:43 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-02-12 19:52:43 +0000
commiteb3355b5589b499e0d36e23f282bf8544cde0bbf (patch)
tree7727990b80520ec66fd759a3cc3739d1381b4e1f /testhal
parent95d128420a70587ce2845df383ed9b6a165e58dc (diff)
downloadChibiOS-eb3355b5589b499e0d36e23f282bf8544cde0bbf.tar.gz
ChibiOS-eb3355b5589b499e0d36e23f282bf8544cde0bbf.tar.bz2
ChibiOS-eb3355b5589b499e0d36e23f282bf8544cde0bbf.zip
Simplified USB endpoints configuration.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2734 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal')
-rw-r--r--testhal/STM32/USB_CDC/main.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/testhal/STM32/USB_CDC/main.c b/testhal/STM32/USB_CDC/main.c
index 6af497542..05c8fa11a 100644
--- a/testhal/STM32/USB_CDC/main.c
+++ b/testhal/STM32/USB_CDC/main.c
@@ -251,12 +251,11 @@ USBEndpointState ep3state;
* @brief EP1 initialization structure (IN only).
*/
static const USBEndpointConfig ep1config = {
- EP_TYPE_BULK,
+ USB_EP_MODE_TYPE_BULK | USB_EP_MODE_PACKET,
sduDataTransmitted,
NULL,
0x0040,
0x0000,
- USB_EP_FLAGS_IN_PACKET_MODE,
0x00C0,
0x0000
};
@@ -265,12 +264,11 @@ static const USBEndpointConfig ep1config = {
* @brief EP2 initialization structure (IN only).
*/
static const USBEndpointConfig ep2config = {
- EP_TYPE_INTR,
+ USB_EP_MODE_TYPE_INTR | USB_EP_MODE_PACKET,
sduInterruptTransmitted,
NULL,
0x0010,
0x0000,
- 0,
0x0100,
0x0000
};
@@ -279,12 +277,11 @@ static const USBEndpointConfig ep2config = {
* @brief EP3 initialization structure (OUT only).
*/
static const USBEndpointConfig ep3config = {
- EP_TYPE_BULK,
+ USB_EP_MODE_TYPE_BULK | USB_EP_MODE_PACKET,
NULL,
sduDataReceived,
0x0000,
0x0040,
- USB_EP_FLAGS_OUT_PACKET_MODE,
0x0000,
0x0110
};