projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AT91SAM7: add EMAC ethernet driver
[bertos.git]
/
bertos
/
cpu
/
cortex-m3
/
drv
/
usb_stm32.h
diff --git
a/bertos/cpu/cortex-m3/drv/usb_stm32.h
b/bertos/cpu/cortex-m3/drv/usb_stm32.h
index f9cf425b4d9bcfc915255cd4a7402fc399c7493e..a4cbb6b59d5a35ef68d807ed3e2db2452315d59f 100644
(file)
--- a/
bertos/cpu/cortex-m3/drv/usb_stm32.h
+++ b/
bertos/cpu/cortex-m3/drv/usb_stm32.h
@@
-42,6
+42,7
@@
#include <cfg/compiler.h>
#include <drv/usb.h>
#include <cfg/compiler.h>
#include <drv/usb.h>
+#include <drv/usb_endpoint.h>
#define USB_BASE_ADDR 0x40005C00
#define USB_BASE_ADDR 0x40005C00
@@
-50,8
+51,10
@@
#define USB_DISC_PIN (1 << 11)
#define USB_EP0_MAX_SIZE 8
#define USB_DISC_PIN (1 << 11)
#define USB_EP0_MAX_SIZE 8
-#define USB_RX_MAX_SIZE 64
-#define USB_TX_MAX_SIZE 64
+#define USB_XFER_MAX_SIZE 64
+
+#define EP_MAX_SLOTS USB_EP_MAX
+#define EP_MAX_NUM (EP_MAX_SLOTS << 1)
/* USB packet memory organization */
#define USB_PACKET_MEMORY_BASE 0x40006000
/* USB packet memory organization */
#define USB_PACKET_MEMORY_BASE 0x40006000
@@
-59,7
+62,7
@@
/* Offset of the buffer descriptor table inside the packet memory */
#define USB_BDT_OFFSET \
/* Offset of the buffer descriptor table inside the packet memory */
#define USB_BDT_OFFSET \
- ((USB_PACKET_MEMORY_SIZE - (sizeof(stm32_UsbBd) * E
NP_MAX_NUMB
)) & ~7)
+ ((USB_PACKET_MEMORY_SIZE - (sizeof(stm32_UsbBd) * E
P_MAX_NUM
)) & ~7)
#define USB_MEM_ADDR(offset) \
(USB_PACKET_MEMORY_BASE + ((offset << 1) & ~3) + (offset & 1))
#define USB_MEM_ADDR(offset) \
(USB_PACKET_MEMORY_BASE + ((offset << 1) & ~3) + (offset & 1))
@@
-169,7
+172,7
@@
typedef enum stm32_UsbEP
ENP14_OUT, ENP14_IN,
ENP15_OUT, ENP15_IN,
ENP14_OUT, ENP14_IN,
ENP15_OUT, ENP15_IN,
- E
NP_MAX_NUMB
+ E
P_MAX_HW_NUM
} stm32_UsbEP;
/* STM32 USB packet memory slot */
} stm32_UsbEP;
/* STM32 USB packet memory slot */