X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcc1111%2Fao_usb.c;h=8bd2efdf73706e2c9060e02d389191fa2112f04b;hb=2e28d3541b8da31ebef5a199baf8f544d238298e;hp=08cb73900c6462fe52d7d8bfafe1b6a28ff47d90;hpb=f6f54d70b768dca1715ddddea64a4df00d82b09e;p=fw%2Faltos

diff --git a/src/cc1111/ao_usb.c b/src/cc1111/ao_usb.c
index 08cb7390..8bd2efdf 100644
--- a/src/cc1111/ao_usb.c
+++ b/src/cc1111/ao_usb.c
@@ -62,6 +62,9 @@ ao_usb_isr(void) __interrupt 6
 	ao_btm_isr();
 #endif
 #endif
+#if HAS_P2_ISR
+	ao_p2_isr();
+#endif
 }
 
 struct ao_usb_setup {
@@ -258,15 +261,15 @@ ao_usb_ep0_setup(void)
 		break;
 	case AO_USB_TYPE_CLASS:
 		switch (ao_usb_setup.request) {
-		case SET_LINE_CODING:
+		case AO_USB_SET_LINE_CODING:
 			ao_usb_ep0_out_len = 7;
 			ao_usb_ep0_out_data = (__xdata uint8_t *) &ao_usb_line_coding;
 			break;
-		case GET_LINE_CODING:
+		case AO_USB_GET_LINE_CODING:
 			ao_usb_ep0_in_len = 7;
 			ao_usb_ep0_in_data = (uint8_t *) &ao_usb_line_coding;
 			break;
-		case SET_CONTROL_LINE_STATE:
+		case AO_USB_SET_CONTROL_LINE_STATE:
 			break;
 		}
 		break;
@@ -379,10 +382,10 @@ ao_usb_putchar(char c) __critical __reentrant
 		ao_usb_in_send();
 }
 
-char
-ao_usb_pollchar(void) __critical
+int
+_ao_usb_pollchar(void)
 {
-	char c;
+	uint8_t c;
 	if (ao_usb_out_bytes == 0) {
 		USBINDEX = AO_USB_OUT_EP;
 		if ((USBCSOL & USBCSOL_OUTPKT_RDY) == 0)
@@ -404,12 +407,14 @@ ao_usb_pollchar(void) __critical
 }
 
 char
-ao_usb_getchar(void) __critical
+ao_usb_getchar(void)
 {
-	char	c;
+	int	c;
 
-	while ((c = ao_usb_pollchar()) == AO_READ_AGAIN)
+	ao_arch_block_interrupts();
+	while ((c = _ao_usb_pollchar()) == AO_READ_AGAIN)
 		ao_sleep(&ao_stdin_ready);
+	ao_arch_release_interrupts();
 	return c;
 }
 
@@ -456,5 +461,5 @@ ao_usb_init(void)
 	ao_usb_enable();
 
 	ao_add_task(&ao_usb_task, ao_usb_ep0, "usb");
-	ao_add_stdio(ao_usb_pollchar, ao_usb_putchar, ao_usb_flush);
+	ao_add_stdio(_ao_usb_pollchar, ao_usb_putchar, ao_usb_flush);
 }