andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
gdisirio 2011-11-03 18:06:39 +00:00
parent 6d159cc390
commit c90189fc10
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
os/hal/platforms/STM32/USBv1/usb_lld.c
View File

@ -421,8 +421,8 @@ void usb_lld_init_endpoint(USBDriver *usbp, usbep_t ep) {
dp = USB_GET_DESCRIPTOR(ep); dp = USB_GET_DESCRIPTOR(ep);
dp->TXCOUNT0 = 0; dp->TXCOUNT0 = 0;
dp->RXCOUNT0 = nblocks; dp->RXCOUNT0 = nblocks;
dp->TXADDR = pm_alloc(usbp, epcp->in_maxsize); dp->TXADDR0 = pm_alloc(usbp, epcp->in_maxsize);
dp->RXADDR = pm_alloc(usbp, epcp->out_maxsize); dp->RXADDR0 = pm_alloc(usbp, epcp->out_maxsize);
} }
/** /**
@ -516,7 +516,7 @@ void usb_lld_read_setup(USBDriver *usbp, usbep_t ep, uint8_t *buf) {
(void)usbp; (void)usbp;
udp = USB_GET_DESCRIPTOR(ep); udp = USB_GET_DESCRIPTOR(ep);
pmap = USB_ADDR2PTR(udp->RXADDR); pmap = USB_ADDR2PTR(udp->RXADDR0);
for (n = 0; n < 4; n++) { for (n = 0; n < 4; n++) {
*(uint16_t *)buf = (uint16_t)*pmap++; *(uint16_t *)buf = (uint16_t)*pmap++;
buf += 2; buf += 2;
@ -548,7 +548,7 @@ size_t usb_lld_read_packet_buffer(USBDriver *usbp, usbep_t ep,
(void)usbp; (void)usbp;
udp = USB_GET_DESCRIPTOR(ep); udp = USB_GET_DESCRIPTOR(ep);
pmap = USB_ADDR2PTR(udp->RXADDR); pmap = USB_ADDR2PTR(udp->RXADDR0);
count = (size_t)udp->RXCOUNT0 & RXCOUNT_COUNT_MASK; count = (size_t)udp->RXCOUNT0 & RXCOUNT_COUNT_MASK;
if (n > count) if (n > count)
n = count; n = count;
@ -582,7 +582,7 @@ void usb_lld_write_packet_buffer(USBDriver *usbp, usbep_t ep,
(void)usbp; (void)usbp;
udp = USB_GET_DESCRIPTOR(ep); udp = USB_GET_DESCRIPTOR(ep);
pmap = USB_ADDR2PTR(udp->TXADDR); pmap = USB_ADDR2PTR(udp->TXADDR0);
udp->TXCOUNT0 = (uint16_t)n; udp->TXCOUNT0 = (uint16_t)n;
n = (n + 1) / 2; n = (n + 1) / 2;
while (n > 0) { while (n > 0) {