diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-06-12 14:03:33 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-06-12 14:03:33 +0000 |
| commit | 93ed653e57fb9947feadf43d36442658e00d4339 (patch) | |
| tree | d3e6640e18a1b8f464b524f8c287d5a759933391 | |
| parent | 41eb1a7e7ec33ee7abd62fa954be6b995d6e9707 (diff) | |
| download | ChibiOS-93ed653e57fb9947feadf43d36442658e00d4339.tar.gz ChibiOS-93ed653e57fb9947feadf43d36442658e00d4339.tar.bz2 ChibiOS-93ed653e57fb9947feadf43d36442658e00d4339.zip | |
STM32F4 USB driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4272 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/platforms/STM32/OTGv1/usb_lld.c | 17 | ||||
| -rw-r--r-- | readme.txt | 6 |
2 files changed, 14 insertions, 9 deletions
diff --git a/os/hal/platforms/STM32/OTGv1/usb_lld.c b/os/hal/platforms/STM32/OTGv1/usb_lld.c index 03fadadd9..33cb571ec 100644 --- a/os/hal/platforms/STM32/OTGv1/usb_lld.c +++ b/os/hal/platforms/STM32/OTGv1/usb_lld.c @@ -256,7 +256,7 @@ static void otg_fifo_write_from_queue(usbep_t ep, chSysLockFromIsr();
oqp->q_rdptr += n;
if (oqp->q_rdptr >= oqp->q_top)
- oqp->q_rdptr = oqp->q_buffer;
+ oqp->q_rdptr -= chQSizeI(oqp);
oqp->q_counter += n;
while (notempty(&oqp->q_waiting))
chSchReadyI(fifo_remove(&oqp->q_waiting))->p_u.rdymsg = Q_OK;
@@ -334,9 +334,6 @@ static void otg_fifo_read_to_queue(InputQueue *iqp, size_t n) { /* Updating queue.*/
chSysLockFromIsr();
- iqp->q_wrptr += n;
- if (iqp->q_wrptr >= iqp->q_top)
- iqp->q_wrptr = iqp->q_buffer;
iqp->q_counter += n;
while (notempty(&iqp->q_waiting))
chSchReadyI(fifo_remove(&iqp->q_waiting))->p_u.rdymsg = Q_OK;
@@ -416,6 +413,10 @@ static void otg_txfifo_handler(USBDriver *usbp, usbep_t ep) { usbp->epc[ep]->in_state->mode.linear.txbuf += n;
}
usbp->epc[ep]->in_state->txcnt += n;
+
+ /* Interrupt disabled on transaction end.*/
+ if (usbp->epc[ep]->in_state->txcnt >= usbp->epc[ep]->in_state->txsize)
+ OTG->DIEPEMPMSK &= ~DIEPEMPMSK_INEPTXFEM(ep);
}
/**
@@ -429,19 +430,17 @@ static void otg_txfifo_handler(USBDriver *usbp, usbep_t ep) { static void otg_epin_handler(USBDriver *usbp, usbep_t ep) {
uint32_t epint = OTG->ie[ep].DIEPINT;
+ OTG->ie[ep].DIEPINT = 0xFFFFFFFF;
+
if (epint & DIEPINT_TOC) {
/* Timeouts not handled yet, not sure how to handle.*/
- OTG->ie[ep].DIEPINT = DIEPINT_TOC;
}
if (epint & DIEPINT_XFRC) {
/* Transmit transfer complete.*/
- OTG->ie[ep].DIEPINT = DIEPINT_XFRC;
_usb_isr_invoke_in_cb(usbp, ep);
- OTG->DIEPEMPMSK &= ~DIEPEMPMSK_INEPTXFEM(ep);
}
- else if (epint & DIEPINT_TXFE) {
+ if ((epint & DIEPINT_TXFE) && (OTG->DIEPEMPMSK & DIEPEMPMSK_INEPTXFEM(ep))) {
/* TX FIFO empty or emptying.*/
- OTG->ie[ep].DIEPINT = DIEPINT_TXFE;
otg_txfifo_handler(usbp, ep);
}
}
diff --git a/readme.txt b/readme.txt index 33f5f152e..588b39d15 100644 --- a/readme.txt +++ b/readme.txt @@ -144,6 +144,12 @@ 3484947)(backported to 2.4.1).
- FIX: Fixed various minor documentation errors (bug 3484942)(backported
to 2.4.1).
+- NEW: USB implementation for STM32F105/F107/2xx/F4xx devices.
+ TODO: Modify the F103 USB driver for the new model.
+- NEW: Improved SerialUSB driver using the new queued mode, much smaller
+ than the previous driver.
+- NEW: Improved USB driver model supporting also queues for endpoint I/O,
+ packet mode removed.
- NEW: Added an application-defined field to I/O queues (a void pointer).
- NEW: Added board files for Maple Mini STM32F103, contributed by Wagner
Sartori Junior.
|