projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AltosTelemetryReader: actually open serial port
[fw/altos]
/
src
/
ao_usb.c
diff --git
a/src/ao_usb.c
b/src/ao_usb.c
index 527e9b302ec387355317b447c7cacad1ea926540..b4e3f1fe6aa3364bd7925458d6e58af28f4922e8 100644
(file)
--- a/
src/ao_usb.c
+++ b/
src/ao_usb.c
@@
-43,7
+43,7
@@
ao_usb_set_interrupts(void)
* so when we hook that up, fix this
*/
void
* so when we hook that up, fix this
*/
void
-ao_usb_isr(void) interrupt 6
+ao_usb_isr(void)
__
interrupt 6
{
USBIF = 0;
ao_usb_iif |= USBIIF;
{
USBIF = 0;
ao_usb_iif |= USBIIF;
@@
-82,10
+82,11
@@
ao_usb_ep0_flush(void)
__xdata uint8_t this_len;
__xdata uint8_t cs0;
__xdata uint8_t this_len;
__xdata uint8_t cs0;
+ /* If the IN packet hasn't been picked up, just return */
USBINDEX = 0;
cs0 = USBCS0;
if (cs0 & USBCS0_INPKT_RDY)
USBINDEX = 0;
cs0 = USBCS0;
if (cs0 & USBCS0_INPKT_RDY)
-
ao_panic(0)
;
+
return
;
this_len = ao_usb_ep0_in_len;
if (this_len > AO_USB_CONTROL_SIZE)
this_len = ao_usb_ep0_in_len;
if (this_len > AO_USB_CONTROL_SIZE)
@@
-382,8
+383,11
@@
ao_usb_pollchar(void) __critical
if ((USBCSOL & USBCSOL_OUTPKT_RDY) == 0)
return AO_READ_AGAIN;
ao_usb_out_bytes = (USBCNTH << 8) | USBCNTL;
if ((USBCSOL & USBCSOL_OUTPKT_RDY) == 0)
return AO_READ_AGAIN;
ao_usb_out_bytes = (USBCNTH << 8) | USBCNTL;
- if (ao_usb_out_bytes == 0)
+ if (ao_usb_out_bytes == 0) {
+ USBINDEX = AO_USB_OUT_EP;
+ USBCSOL &= ~USBCSOL_OUTPKT_RDY;
return AO_READ_AGAIN;
return AO_READ_AGAIN;
+ }
}
--ao_usb_out_bytes;
c = USBFIFO[AO_USB_OUT_EP << 1];
}
--ao_usb_out_bytes;
c = USBFIFO[AO_USB_OUT_EP << 1];
@@
-395,7
+399,7
@@
ao_usb_pollchar(void) __critical
}
char
}
char
-ao_usb_getchar(void)
+ao_usb_getchar(void)
__critical
{
char c;
{
char c;