X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_usb.c;h=315eea0828ab6fd3c5a3473f4cbe46d1730ba506;hp=20a853a45e43d167d10545e88b79ab6ab286dec1;hb=37250b00f6286aee4b3b28604f5d463db3079a89;hpb=7e4abf3a40c39d0ce4f466281bef9a464df85dd4 diff --git a/ao_usb.c b/ao_usb.c index 20a853a4..315eea08 100644 --- a/ao_usb.c +++ b/ao_usb.c @@ -20,22 +20,23 @@ struct ao_task __xdata ao_usb_task; -#define AO_USB_CONTROL_EP 0 -#define AO_USB_INT_EP 1 -#define AO_USB_OUT_EP 4 -#define AO_USB_IN_EP 5 -#define AO_USB_CONTROL_SIZE 32 -/* - * Double buffer IN and OUT EPs, so each - * gets half of the available space - */ -#define AO_USB_IN_SIZE 256 -#define AO_USB_OUT_SIZE 128 +static __xdata uint16_t ao_usb_in_bytes; +static __xdata uint16_t ao_usb_out_bytes; +static __xdata uint8_t ao_usb_iif; +static __xdata uint8_t ao_usb_running; -static uint16_t ao_usb_in_bytes; -static uint16_t ao_usb_out_bytes; -static __data uint8_t ao_usb_iif; -static __data uint8_t ao_usb_oif; +static void +ao_usb_set_interrupts(void) +{ + /* IN interrupts on the control an IN endpoints */ + USBIIE = (1 << AO_USB_CONTROL_EP) | (1 << AO_USB_IN_EP); + + /* OUT interrupts on the OUT endpoint */ + USBOIE = (1 << AO_USB_OUT_EP); + + /* Only care about reset */ + USBCIE = USBCIE_RSTIE; +} /* This interrupt is shared with port 2, * so when we hook that up, fix this @@ -50,14 +51,12 @@ ao_usb_isr(void) interrupt 6 if (ao_usb_iif & (1 << AO_USB_IN_EP)) ao_wakeup(&ao_usb_in_bytes); - ao_usb_oif |= USBOIF; - if (ao_usb_oif & (1 << AO_USB_OUT_EP)) + if (USBOIF & (1 << AO_USB_OUT_EP)) ao_wakeup(&ao_usb_out_bytes); -} -#define AO_USB_EP0_IDLE 0 -#define AO_USB_EP0_DATA_IN 1 -#define AO_USB_EP0_DATA_OUT 2 + if (USBCIF & USBCIF_RSTIF) + ao_usb_set_interrupts(); +} struct ao_usb_setup { uint8_t dir_type_recip; @@ -65,22 +64,22 @@ struct ao_usb_setup { uint16_t value; uint16_t index; uint16_t length; -} ao_usb_setup; +} __xdata ao_usb_setup; -__data uint8_t ao_usb_ep0_state; -uint8_t * __data ao_usb_ep0_in_data; -__data uint8_t ao_usb_ep0_in_len; +__xdata uint8_t ao_usb_ep0_state; +uint8_t * __xdata ao_usb_ep0_in_data; +__xdata uint8_t ao_usb_ep0_in_len; __xdata uint8_t ao_usb_ep0_in_buf[2]; -__data uint8_t ao_usb_ep0_out_len; +__xdata uint8_t ao_usb_ep0_out_len; __xdata uint8_t *__data ao_usb_ep0_out_data; -__data uint8_t ao_usb_configuration; +__xdata uint8_t ao_usb_configuration; /* Send an IN data packet */ static void ao_usb_ep0_flush(void) { - uint8_t this_len; - uint8_t cs0; + __xdata uint8_t this_len; + __xdata uint8_t cs0; USBINDEX = 0; cs0 = USBCS0; @@ -102,159 +101,16 @@ ao_usb_ep0_flush(void) USBCS0 = cs0; } -#define LE_WORD(x) ((x)&0xFF),((x)>>8) - -/* CDC definitions */ -#define CS_INTERFACE 0x24 -#define CS_ENDPOINT 0x25 - -#define SET_LINE_CODING 0x20 -#define GET_LINE_CODING 0x21 -#define SET_CONTROL_LINE_STATE 0x22 - -/* Data structure for GET_LINE_CODING / SET_LINE_CODING class requests */ -struct ao_usb_line_coding { - uint32_t rate; - uint8_t char_format; - uint8_t parity; - uint8_t data_bits; -} ; - -static struct ao_usb_line_coding ao_usb_line_coding = {115200, 0, 0, 8}; - -/* USB descriptors in one giant block of bytes */ -static const uint8_t ao_usb_descriptors [] = -{ - /* Device descriptor */ - 0x12, - AO_USB_DESC_DEVICE, - LE_WORD(0x0110), /* bcdUSB */ - 0x02, /* bDeviceClass */ - 0x00, /* bDeviceSubClass */ - 0x00, /* bDeviceProtocol */ - AO_USB_CONTROL_SIZE, /* bMaxPacketSize */ - LE_WORD(0xFFFE), /* idVendor */ - LE_WORD(0x000A), /* idProduct */ - LE_WORD(0x0100), /* bcdDevice */ - 0x01, /* iManufacturer */ - 0x02, /* iProduct */ - 0x03, /* iSerialNumber */ - 0x01, /* bNumConfigurations */ - - /* Configuration descriptor */ - 0x09, - AO_USB_DESC_CONFIGURATION, - LE_WORD(67), /* wTotalLength */ - 0x02, /* bNumInterfaces */ - 0x01, /* bConfigurationValue */ - 0x00, /* iConfiguration */ - 0xC0, /* bmAttributes */ - 0x32, /* bMaxPower */ - - /* Control class interface */ - 0x09, - AO_USB_DESC_INTERFACE, - 0x00, /* bInterfaceNumber */ - 0x00, /* bAlternateSetting */ - 0x01, /* bNumEndPoints */ - 0x02, /* bInterfaceClass */ - 0x02, /* bInterfaceSubClass */ - 0x01, /* bInterfaceProtocol, linux requires value of 1 for the cdc_acm module */ - 0x00, /* iInterface */ - - /* Header functional descriptor */ - 0x05, - CS_INTERFACE, - 0x00, /* bDescriptor SubType Header */ - LE_WORD(0x0110), /* CDC version 1.1 */ - - /* Call management functional descriptor */ - 0x05, - CS_INTERFACE, - 0x01, /* bDescriptor SubType Call Management */ - 0x01, /* bmCapabilities = device handles call management */ - 0x01, /* bDataInterface call management interface number */ - - /* ACM functional descriptor */ - 0x04, - CS_INTERFACE, - 0x02, /* bDescriptor SubType Abstract Control Management */ - 0x02, /* bmCapabilities = D1 (Set_line_Coding, Set_Control_Line_State, Get_Line_Coding and Serial_State) */ - - /* Union functional descriptor */ - 0x05, - CS_INTERFACE, - 0x06, /* bDescriptor SubType Union Functional descriptor */ - 0x00, /* bMasterInterface */ - 0x01, /* bSlaveInterface0 */ - - /* Notification EP */ - 0x07, - AO_USB_DESC_ENDPOINT, - AO_USB_INT_EP|0x80, /* bEndpointAddress */ - 0x03, /* bmAttributes = intr */ - LE_WORD(8), /* wMaxPacketSize */ - 0x0A, /* bInterval */ - - /* Data class interface descriptor */ - 0x09, - AO_USB_DESC_INTERFACE, - 0x01, /* bInterfaceNumber */ - 0x00, /* bAlternateSetting */ - 0x02, /* bNumEndPoints */ - 0x0A, /* bInterfaceClass = data */ - 0x00, /* bInterfaceSubClass */ - 0x00, /* bInterfaceProtocol */ - 0x00, /* iInterface */ - - /* Data EP OUT */ - 0x07, - AO_USB_DESC_ENDPOINT, - AO_USB_OUT_EP, /* bEndpointAddress */ - 0x02, /* bmAttributes = bulk */ - LE_WORD(AO_USB_OUT_SIZE),/* wMaxPacketSize */ - 0x00, /* bInterval */ - - /* Data EP in */ - 0x07, - AO_USB_DESC_ENDPOINT, - AO_USB_IN_EP|0x80, /* bEndpointAddress */ - 0x02, /* bmAttributes = bulk */ - LE_WORD(AO_USB_IN_SIZE),/* wMaxPacketSize */ - 0x00, /* bInterval */ - - /* String descriptors */ - 0x04, - AO_USB_DESC_STRING, - LE_WORD(0x0409), - - /* iManufacturer */ - 0x20, - AO_USB_DESC_STRING, - 'a', 0, 'l', 0, 't', 0, 'u', 0, 's', 0, 'm', 0, 'e', 0, 't', 0, 'r', 0, 'u', 0, 'm', 0, '.', 0, 'o', 0, 'r', 0, 'g', 0, - - /* iProduct */ - 0x16, - AO_USB_DESC_STRING, - 'T', 0, 'e', 0, 'l', 0, 'e', 0, 'M', 0, 'e', 0, 't', 0, 'r', 0, 'u', 0, 'm', 0, - - /* iSerial */ - 0x0e, - AO_USB_DESC_STRING, - 't', 0, 'e', 0, 'l', 0, 'e', 0, '-', 0, '0', 0, - - /* Terminating zero */ - 0 -}; +__xdata static struct ao_usb_line_coding ao_usb_line_coding = {115200, 0, 0, 8}; /* Walk through the list of descriptors and find a match */ static void ao_usb_get_descriptor(uint16_t value) { - const uint8_t *descriptor; - uint8_t type = value >> 8; - uint8_t index = value; + const uint8_t *__xdata descriptor; + __xdata uint8_t type = value >> 8; + __xdata uint8_t index = value; descriptor = ao_usb_descriptors; while (descriptor[0] != 0) { @@ -275,7 +131,7 @@ ao_usb_get_descriptor(uint16_t value) static void ao_usb_ep0_fill(void) { - uint8_t len; + __xdata uint8_t len; USBINDEX = 0; len = USBCNT0; @@ -295,6 +151,7 @@ ao_usb_ep0_queue_byte(uint8_t a) void ao_usb_set_address(uint8_t address) { + ao_usb_running = 1; USBADDR = address | 0x80; while (USBADDR & 0x80) ; @@ -369,6 +226,7 @@ ao_usb_ep0_setup(void) } 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); @@ -417,19 +275,17 @@ ao_usb_ep0_setup(void) static void ao_usb_ep0(void) { - uint8_t cs0; + __xdata uint8_t cs0; ao_usb_ep0_state = AO_USB_EP0_IDLE; for (;;) { - ao_interrupt_disable(); - for (;;) { + __critical for (;;) { if (ao_usb_iif & 1) { ao_usb_iif &= ~1; break; } ao_sleep(&ao_usb_task); } - ao_interrupt_enable(); USBINDEX = 0; cs0 = USBCS0; if (cs0 & USBCS0_SETUP_END) { @@ -466,21 +322,20 @@ ao_usb_ep0(void) } void -ao_usb_flush(void) +ao_usb_flush(void) __critical { - ao_interrupt_disable(); if (ao_usb_in_bytes) { USBINDEX = AO_USB_IN_EP; USBCSIL |= USBCSIL_INPKT_RDY; ao_usb_in_bytes = 0; } - ao_interrupt_enable(); } void -ao_usb_putchar(uint8_t c) +ao_usb_putchar(char c) __critical { - ao_interrupt_disable(); + if (!ao_usb_running) + return; for (;;) { USBINDEX = AO_USB_IN_EP; if ((USBCSIL & USBCSIL_INPKT_RDY) == 0) @@ -488,16 +343,17 @@ ao_usb_putchar(uint8_t c) ao_sleep(&ao_usb_in_bytes); } USBFIFO[AO_USB_IN_EP << 1] = c; - if (++ao_usb_in_bytes == AO_USB_IN_SIZE) - ao_usb_flush(); - ao_interrupt_enable(); + if (++ao_usb_in_bytes == AO_USB_IN_SIZE) { + USBINDEX = AO_USB_IN_EP; + USBCSIL |= USBCSIL_INPKT_RDY; + ao_usb_in_bytes = 0; + } } -uint8_t -ao_usb_getchar(void) +char +ao_usb_getchar(void) __critical { - uint8_t c; - ao_interrupt_disable(); + __xdata char c; while (ao_usb_out_bytes == 0) { for (;;) { USBINDEX = AO_USB_OUT_EP; @@ -513,27 +369,19 @@ ao_usb_getchar(void) USBINDEX = AO_USB_OUT_EP; USBCSOL &= ~USBCSOL_OUTPKT_RDY; } - ao_interrupt_enable(); return c; } void -ao_usb_init(void) +ao_usb_enable(void) { /* Turn on the USB controller */ SLEEP |= SLEEP_USB_EN; ao_usb_set_configuration(); - /* IN interrupts on the control an IN endpoints */ - USBIIE = (1 << AO_USB_CONTROL_EP) | (1 << AO_USB_IN_EP); - - /* OUT interrupts on the OUT endpoint */ - USBOIE = (1 << AO_USB_OUT_EP); + ao_usb_set_interrupts(); - /* Ignore control interrupts */ - USBCIE = 0; - /* enable USB interrupts */ IEN2 |= IEN2_USBIE; @@ -541,6 +389,30 @@ ao_usb_init(void) USBCIF = 0; USBOIF = 0; USBIIF = 0; +} + +void +ao_usb_disable(void) +{ + /* Disable USB interrupts */ + USBIIE = 0; + USBOIE = 0; + USBCIE = 0; + IEN2 &= ~IEN2_USBIE; - ao_add_task(&ao_usb_task, ao_usb_ep0); + /* Clear any pending interrupts */ + USBCIF = 0; + USBOIF = 0; + USBIIF = 0; + + /* Turn off the USB controller */ + SLEEP &= ~SLEEP_USB_EN; +} + +void +ao_usb_init(void) +{ + ao_usb_enable(); + + ao_add_task(&ao_usb_task, ao_usb_ep0, "usb"); }