projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wrong license on ao_monitor.c
[fw/altos]
/
ao_usb.c
diff --git
a/ao_usb.c
b/ao_usb.c
index 8a0c672c6211f9e72d2881c4775bc1c52aaf1e18..c1520d750fc7e7c13c8790636f4da7e596df957e 100644
(file)
--- a/
ao_usb.c
+++ b/
ao_usb.c
@@
-102,7
+102,7
@@
ao_usb_ep0_flush(void)
USBCS0 = cs0;
}
USBCS0 = cs0;
}
-#define LE_WORD(x) ((x)&0xFF),((
x)>>8
)
+#define LE_WORD(x) ((x)&0xFF),((
uint8_t) (((uint16_t) (x))>>8)
)
/* CDC definitions */
#define CS_INTERFACE 0x24
/* CDC definitions */
#define CS_INTERFACE 0x24
@@
-241,7
+241,7
@@
static const uint8_t ao_usb_descriptors [] =
/* iSerial */
0x0e,
AO_USB_DESC_STRING,
/* iSerial */
0x0e,
AO_USB_DESC_STRING,
- '
t', 0, 'e', 0, 'l', 0, 'e', 0, '-
', 0, '0', 0,
+ '
0', 0, '0', 0, '0', 0, '0', 0, '0
', 0, '0', 0,
/* Terminating zero */
0
/* Terminating zero */
0
@@
-369,6
+369,7
@@
ao_usb_ep0_setup(void)
}
break;
case AO_USB_RECIP_INTERFACE:
}
break;
case AO_USB_RECIP_INTERFACE:
+ #pragma disable_warning 110
switch(ao_usb_setup.request) {
case AO_USB_REQ_GET_STATUS:
ao_usb_ep0_queue_byte(0);
switch(ao_usb_setup.request) {
case AO_USB_REQ_GET_STATUS:
ao_usb_ep0_queue_byte(0);
@@
-537,5
+538,5
@@
ao_usb_init(void)
USBOIF = 0;
USBIIF = 0;
USBOIF = 0;
USBIIF = 0;
- ao_add_task(&ao_usb_task, ao_usb_ep0);
+ ao_add_task(&ao_usb_task, ao_usb_ep0
, "usb"
);
}
}