zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STM32F4 USB driver. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4272 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2012-06-12 14:03:33 +00:00
parent 41eb1a7e7e
commit 93ed653e57
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
os/hal/platforms/STM32/OTGv1/usb_lld.c
View File

@ -256,7 +256,7 @@ static void otg_fifo_write_from_queue(usbep_t ep,
chSysLockFromIsr(); chSysLockFromIsr();
oqp->q_rdptr += n; oqp->q_rdptr += n;
if (oqp->q_rdptr >= oqp->q_top) if (oqp->q_rdptr >= oqp->q_top)
oqp->q_rdptr = oqp->q_buffer; oqp->q_rdptr -= chQSizeI(oqp);
oqp->q_counter += n; oqp->q_counter += n;
while (notempty(&oqp->q_waiting)) while (notempty(&oqp->q_waiting))
chSchReadyI(fifo_remove(&oqp->q_waiting))->p_u.rdymsg = Q_OK; 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.*/ /* Updating queue.*/
chSysLockFromIsr(); chSysLockFromIsr();
iqp->q_wrptr += n;
if (iqp->q_wrptr >= iqp->q_top)
iqp->q_wrptr = iqp->q_buffer;
iqp->q_counter += n; iqp->q_counter += n;
while (notempty(&iqp->q_waiting)) while (notempty(&iqp->q_waiting))
chSchReadyI(fifo_remove(&iqp->q_waiting))->p_u.rdymsg = Q_OK; 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->mode.linear.txbuf += n;
} }
usbp->epc[ep]->in_state->txcnt += 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) { static void otg_epin_handler(USBDriver *usbp, usbep_t ep) {
uint32_t epint = OTG->ie[ep].DIEPINT; uint32_t epint = OTG->ie[ep].DIEPINT;
OTG->ie[ep].DIEPINT = 0xFFFFFFFF;
if (epint & DIEPINT_TOC) { if (epint & DIEPINT_TOC) {
/* Timeouts not handled yet, not sure how to handle.*/ /* Timeouts not handled yet, not sure how to handle.*/
OTG->ie[ep].DIEPINT = DIEPINT_TOC;
} }
if (epint & DIEPINT_XFRC) { if (epint & DIEPINT_XFRC) {
/* Transmit transfer complete.*/ /* Transmit transfer complete.*/
OTG->ie[ep].DIEPINT = DIEPINT_XFRC;
_usb_isr_invoke_in_cb(usbp, ep); _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.*/ /* TX FIFO empty or emptying.*/
OTG->ie[ep].DIEPINT = DIEPINT_TXFE;
otg_txfifo_handler(usbp, ep); otg_txfifo_handler(usbp, ep);
} }
} }

6
readme.txt
View File

@ -144,6 +144,12 @@
3484947)(backported to 2.4.1). 3484947)(backported to 2.4.1).
- FIX: Fixed various minor documentation errors (bug 3484942)(backported - FIX: Fixed various minor documentation errors (bug 3484942)(backported
to 2.4.1). 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 an application-defined field to I/O queues (a void pointer).
- NEW: Added board files for Maple Mini STM32F103, contributed by Wagner - NEW: Added board files for Maple Mini STM32F103, contributed by Wagner
Sartori Junior. Sartori Junior.