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

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8640 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
Giovanni Di Sirio 2015-12-24 13:04:12 +00:00
parent f6622af31b
commit 6a20a7107a
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
os/hal/ports/STM32/LLD/OTGv1/usb_lld.c
View File

@ -220,24 +220,16 @@ static uint32_t otg_ram_alloc(USBDriver *usbp, size_t size) {
static void otg_fifo_write_from_buffer(volatile uint32_t *fifop, static void otg_fifo_write_from_buffer(volatile uint32_t *fifop,
const uint8_t *buf, const uint8_t *buf,
size_t n) { size_t n) {
uint32_t w;
size_t i;
/* Pushing all complete words.*/ osalDbgAssert(n > 0, "is zero");
i = 0;
w = 0; while (true) {
while (i < n) { *fifop = *((uint32_t *)buf);
w |= (uint32_t)*buf++ << ((i & 3) * 8); if (n <= 4) {
i++; break;
if ((i & 3) == 0) {
*fifop = w;
w = 0;
} }
} n -= 4;
buf += 4;
/* Remaining bytes.*/
if ((i & 3) != 0) {
*fifop = w;
} }
} }
@ -300,9 +292,8 @@ static void otg_fifo_read_to_buffer(volatile uint32_t *fifop,
size_t n, size_t n,
size_t max) { size_t max) {
uint32_t w = 0; uint32_t w = 0;
size_t i; size_t i = 0;
i = 0;
while (i < n) { while (i < n) {
if ((i & 3) == 0){ if ((i & 3) == 0){
w = *fifop; w = *fifop;
@ -414,7 +405,7 @@ static bool otg_txfifo_handler(USBDriver *usbp, usbep_t ep) {
/* Transaction end condition.*/ /* Transaction end condition.*/
if (usbp->epc[ep]->in_state->txcnt >= usbp->epc[ep]->in_state->txsize) if (usbp->epc[ep]->in_state->txcnt >= usbp->epc[ep]->in_state->txsize)
return TRUE; return true;
/* Number of bytes remaining in current transaction.*/ /* Number of bytes remaining in current transaction.*/
n = usbp->epc[ep]->in_state->txsize - usbp->epc[ep]->in_state->txcnt; n = usbp->epc[ep]->in_state->txsize - usbp->epc[ep]->in_state->txcnt;
@ -424,7 +415,7 @@ static bool otg_txfifo_handler(USBDriver *usbp, usbep_t ep) {
/* Checks if in the TXFIFO there is enough space to accommodate the /* Checks if in the TXFIFO there is enough space to accommodate the
next packet.*/ next packet.*/
if (((usbp->otg->ie[ep].DTXFSTS & DTXFSTS_INEPTFSAV_MASK) * 4) < n) if (((usbp->otg->ie[ep].DTXFSTS & DTXFSTS_INEPTFSAV_MASK) * 4) < n)
return FALSE; return false;
#if STM32_USB_OTGFIFO_FILL_BASEPRI #if STM32_USB_OTGFIFO_FILL_BASEPRI
__set_BASEPRI(CORTEX_PRIO_MASK(STM32_USB_OTGFIFO_FILL_BASEPRI)); __set_BASEPRI(CORTEX_PRIO_MASK(STM32_USB_OTGFIFO_FILL_BASEPRI));

2
os/hal/ports/STM32/LLD/OTGv1/usb_lld.h
View File

@ -273,7 +273,7 @@ typedef struct {
/** /**
* @brief Pointer to the input queue. * @brief Pointer to the input queue.
*/ */
input_queue_t *rxqueue; input_queue_t *rxqueue;
} queue; } queue;
} mode; } mode;
/** /**