#include "ao.h"
#include "ao_usb.h"
+#define USB_DEBUG 0
+
+#if USB_DEBUG
+#define debug(format, args...) printf(format, ## args)
+#else
+#define debug(format, args...)
+#endif
+
struct ao_task __xdata ao_usb_task;
struct ao_usb_setup {
static const uint8_t * __xdata ao_usb_ep0_in_data;
static __xdata uint8_t ao_usb_ep0_in_len;
static __xdata uint8_t ao_usb_ep0_in_pending;
+static __xdata uint8_t ao_usb_addr_pending;
static __xdata uint8_t ao_usb_ep0_in_buf[2];
static __xdata uint8_t ao_usb_ep0_out_len;
static __xdata uint8_t *__xdata ao_usb_ep0_out_data;
ao_usb_set_address(uint8_t address)
{
UDADDR = (0 << ADDEN) | address;
- ao_usb_running = 1;
+ ao_usb_addr_pending = 1;
}
#define EP_SIZE(s) ((s) == 64 ? 0x30 : \
ao_usb_dump_ep(uint8_t ep)
{
UENUM = ep;
- printf ("EP %d: UECONX %02x UECFG0X %02x UECFG1X %02x UEIENX %02x UESTA0X %02x UESTA1X %02X\n",
+ debug ("EP %d: UECONX %02x UECFG0X %02x UECFG1X %02x UEIENX %02x UESTA0X %02x UESTA1X %02X\n",
ep, UECONX, UECFG0X, UECFG1X, UEIENX, UESTA0X, UESTA1X);
}
static void
ao_usb_set_ep0(void)
{
- printf ("set_ep0\n");
+ debug ("set_ep0\n");
/* Set the CONTROL max packet size, single buffered */
UENUM = 0;
UECONX = (1 << EPEN); /* Enable */
(1 << ALLOC));
UEIENX = ((1 << RXSTPE) | /* Enable SETUP interrupt */
- (1 << RXOUTE) | /* Enable OUT interrupt */
- (1 << TXINE)); /* Enable IN complete interrupt */
+ (1 << RXOUTE)); /* Enable OUT interrupt */
- ao_usb_dump_ep(0);
+// ao_usb_dump_ep(0);
+ ao_usb_addr_pending = 0;
}
static void
(1 << EPBK0) | /* Double bank */
(1 << ALLOC)); /* Allocate */
+#if 0
UEIENX = ((1 << TXINE)); /* Enable IN complete interrupt */
+#endif
ao_usb_dump_ep(AO_USB_IN_EP);
UEIENX = ((1 << RXOUTE)); /* Enable OUT complete interrupt */
ao_usb_dump_ep(AO_USB_OUT_EP);
+ ao_usb_running = 1;
}
ISR(USB_GEN_vect)
}
}
+static void
+ao_usb_ep0_set_in_pending(uint8_t in_pending)
+{
+ ao_usb_ep0_in_pending = in_pending;
+
+ if (in_pending) {
+ UENUM = 0;
+ UEIENX = ((1 << RXSTPE) | (1 << RXOUTE) | (1 << TXINE)); /* Enable IN interrupt */
+ }
+}
+
/* Send an IN data packet */
static void
ao_usb_ep0_flush(void)
{
__xdata uint8_t this_len;
- /* If the IN packet hasn't been picked up, just return */
+ cli();
UENUM = 0;
- if (!(UEINTX & (1 << TXINI)))
- return;
+ if (!(UEINTX & (1 << TXINI))) {
+ debug("EP0 not accepting IN data\n");
+ ao_usb_ep0_set_in_pending(1);
+ } else {
+ this_len = ao_usb_ep0_in_len;
+ if (this_len > AO_USB_CONTROL_SIZE)
+ this_len = AO_USB_CONTROL_SIZE;
- this_len = ao_usb_ep0_in_len;
- if (this_len > AO_USB_CONTROL_SIZE)
- this_len = AO_USB_CONTROL_SIZE;
+ ao_usb_ep0_in_len -= this_len;
- ao_usb_ep0_in_len -= this_len;
+ /* Set IN interrupt enable */
+ if (ao_usb_ep0_in_len == 0 && this_len != AO_USB_CONTROL_SIZE)
+ ao_usb_ep0_set_in_pending(0);
+ else
+ ao_usb_ep0_set_in_pending(1);
- /* Set IN interrupt enable */
- if (ao_usb_ep0_in_len == 0 && this_len != AO_USB_CONTROL_SIZE) {
- ao_usb_ep0_in_pending = 0;
- UEIENX = ((1 << RXSTPE) | (1 << RXOUTE)); /* Disable IN interrupt */
- } else {
- ao_usb_ep0_in_pending = 1;
- UEIENX = ((1 << RXSTPE) | (1 << RXOUTE) | (1 << TXINE)); /* Enable IN interrupt */
- }
+ debug ("Flush EP0 len %d:", this_len);
+ while (this_len--) {
+ uint8_t c = *ao_usb_ep0_in_data++;
+ debug(" %02x", c);
+ UEDATX = c;
+ }
+ debug ("\n");
- printf ("Flush EP0 len %d:", this_len);
- while (this_len--) {
- uint8_t c = *ao_usb_ep0_in_data++;
- printf(" %02x", c);
- UEDATX = c;
+ /* Clear the TXINI bit to send the packet */
+ UEINTX &= ~(1 << TXINI);
}
- printf ("\n");
-
- /* Clear the TXINI bit to send the packet */
- UEINTX = ~(1 << TXINI);
+ sei();
}
/* Read data from the ep0 OUT fifo */
static void
-ao_usb_ep0_fill(uint8_t len)
+ao_usb_ep0_fill(uint8_t len, uint8_t ack)
{
if (len > ao_usb_ep0_out_len)
len = ao_usb_ep0_out_len;
ao_usb_ep0_out_len -= len;
- printf ("EP0 UEINTX %02x UEBCLX %d UEBCHX %d\n",
- UEINTX, UEBCLX, UEBCHX);
+// debug ("EP0 UEINTX %02x UEBCLX %d UEBCHX %d\n",
+// UEINTX, UEBCLX, UEBCHX);
/* Pull all of the data out of the packet */
- printf ("Fill EP0 len %d:", len);
+ debug ("Fill EP0 len %d:", len);
UENUM = 0;
while (len--) {
uint8_t c = UEDATX;
*ao_usb_ep0_out_data++ = c;
- printf (" %02x", c);
+ debug (" %02x", c);
}
- printf ("\n");
+ debug ("\n");
+
+ /* ACK the packet */
+ UEINTX &= ~ack;
}
void
/* Pull the setup packet out of the fifo */
ao_usb_ep0_out_data = (__xdata uint8_t *) &ao_usb_setup;
ao_usb_ep0_out_len = 8;
- ao_usb_ep0_fill(8);
-
- /* ACK packet */
- UENUM = 0;
- UEINTX = ~(1 << RXSTPI);
+ ao_usb_ep0_fill(8, (1 << RXSTPI) | (1 << RXOUTI) | (1 << TXINI));
if (ao_usb_ep0_out_len != 0) {
- printf ("invalid setup packet length\n");
+ debug ("invalid setup packet length\n");
return;
}
ao_usb_ep0_in_len = 0;
switch(ao_usb_setup.dir_type_recip & AO_USB_SETUP_TYPE_MASK) {
case AO_USB_TYPE_STANDARD:
- printf ("Standard setup packet\n");
+ debug ("Standard setup packet\n");
switch(ao_usb_setup.dir_type_recip & AO_USB_SETUP_RECIP_MASK) {
case AO_USB_RECIP_DEVICE:
- printf ("Device setup packet\n");
+ debug ("Device setup packet\n");
switch(ao_usb_setup.request) {
case AO_USB_REQ_GET_STATUS:
- printf ("get status\n");
+ debug ("get status\n");
ao_usb_ep0_queue_byte(0);
ao_usb_ep0_queue_byte(0);
break;
case AO_USB_REQ_SET_ADDRESS:
- printf ("set address %d\n", ao_usb_setup.value);
+ debug ("set address %d\n", ao_usb_setup.value);
ao_usb_set_address(ao_usb_setup.value);
break;
case AO_USB_REQ_GET_DESCRIPTOR:
- printf ("get descriptor %d\n", ao_usb_setup.value);
+ debug ("get descriptor %d\n", ao_usb_setup.value);
ao_usb_get_descriptor(ao_usb_setup.value);
break;
case AO_USB_REQ_GET_CONFIGURATION:
- printf ("get configuration %d\n", ao_usb_configuration);
+ debug ("get configuration %d\n", ao_usb_configuration);
ao_usb_ep0_queue_byte(ao_usb_configuration);
break;
case AO_USB_REQ_SET_CONFIGURATION:
ao_usb_configuration = ao_usb_setup.value;
- printf ("set configuration %d\n", ao_usb_configuration);
+ debug ("set configuration %d\n", ao_usb_configuration);
ao_usb_set_configuration();
break;
}
#ifndef AVR
#pragma disable_warning 110
#endif
- printf ("Interface setup packet\n");
+ debug ("Interface setup packet\n");
switch(ao_usb_setup.request) {
case AO_USB_REQ_GET_STATUS:
ao_usb_ep0_queue_byte(0);
}
break;
case AO_USB_RECIP_ENDPOINT:
- printf ("Endpoint setup packet\n");
+ debug ("Endpoint setup packet\n");
switch(ao_usb_setup.request) {
case AO_USB_REQ_GET_STATUS:
ao_usb_ep0_queue_byte(0);
}
break;
case AO_USB_TYPE_CLASS:
- printf ("Class setup packet\n");
+ debug ("Class setup packet\n");
switch (ao_usb_setup.request) {
case SET_LINE_CODING:
- printf ("set line coding\n");
+ debug ("set line coding\n");
ao_usb_ep0_out_len = 7;
ao_usb_ep0_out_data = (__xdata uint8_t *) &ao_usb_line_coding;
break;
case GET_LINE_CODING:
- printf ("get line coding\n");
+ debug ("get line coding\n");
ao_usb_ep0_in_len = 7;
ao_usb_ep0_in_data = (uint8_t *) &ao_usb_line_coding;
break;
if (ao_usb_ep0_state != AO_USB_EP0_DATA_OUT) {
if (ao_usb_setup.length < ao_usb_ep0_in_len)
ao_usb_ep0_in_len = ao_usb_setup.length;
- printf ("Start ep0 in delivery\n");
- ao_usb_ep0_flush();
+ debug ("Start ep0 in delivery %d\n", ao_usb_ep0_in_len);
+ ao_usb_ep0_set_in_pending(1);
}
}
{
uint8_t intx, udint;
- printf ("usb task started\n");
+ debug ("usb task started\n");
ao_usb_ep0_state = AO_USB_EP0_IDLE;
for (;;) {
cli();
for (;;) {
udint = UDINT;
UDINT = 0;
-// printf ("UDINT %02x\n", udint);
+// debug ("UDINT %02x\n", udint);
if (udint & (1 << EORSTI)) {
ao_usb_configuration = 0;
ao_usb_set_ep0();
}
UENUM = 0;
intx = UEINTX;
-// printf ("UEINTX %02x\n", intx);
- if (intx & ((1 << RXSTPI) | (1 << RXOUTI) | (1 << TXINI)))
+// debug ("UEINTX %02x\n", intx);
+ if (intx & ((1 << RXSTPI) | (1 << RXOUTI)))
break;
- printf ("usb task sleeping...\n");
+ if ((intx & (1 << TXINI))) {
+ if (ao_usb_ep0_in_pending)
+ break;
+ else
+ {
+ if (ao_usb_addr_pending) {
+ UDADDR |= (1 << ADDEN);
+ ao_usb_addr_pending = 0;
+ }
+ UEIENX = ((1 << RXSTPE) | (1 << RXOUTE)); /* Disable IN interrupt */
+ }
+ }
+// debug ("usb task sleeping...\n");
ao_sleep(&ao_usb_task);
}
sei();
- printf ("UEINTX for ep0 is %02x\n", intx);
+// debug ("UEINTX for ep0 is %02x\n", intx);
if (intx & (1 << RXSTPI)) {
ao_usb_ep0_setup();
}
if (intx & (1 << RXOUTI)) {
- ao_usb_ep0_fill(UEBCLX);
- UENUM = 0;
- UEINTX = ~(1 << RXOUTI);
- ao_usb_ep0_flush();
+ ao_usb_ep0_fill(UEBCLX, (1 << RXOUTI));
+ ao_usb_ep0_set_in_pending(1);
}
if (intx & (1 << TXINI) && ao_usb_ep0_in_pending) {
- UDADDR |= (1 << ADDEN);
- printf ("continue sending ep0 IN data\n");
+ debug ("continue sending ep0 IN data\n");
ao_usb_ep0_flush();
}
}
ao_usb_in_wait(void)
{
for (;;) {
+ /* Check if the current buffer is writable */
UENUM = AO_USB_IN_EP;
if (UEINTX & (1 << RWAL))
break;
+
+ cli();
+ /* Wait for an IN buffer to be ready */
for (;;) {
UENUM = AO_USB_IN_EP;
if ((UEINTX & (1 << TXINI)))
break;
+ UEIENX = (1 << TXINE);
ao_sleep(&ao_usb_in_flushed);
}
- UEINTX = ~(1 << TXINI);
+ /* Ack the interrupt */
+ UEINTX &= ~(1 << TXINI);
+ sei();
}
}
+/* Queue the current IN buffer for transmission */
static void
ao_usb_in_send(void)
{
UENUM = AO_USB_IN_EP;
- UEINTX = (uint8_t) ~(1 << FIFOCON);
+ UEINTX &= ~(1 << FIFOCON);
}
void
if (!ao_usb_running)
return;
- /* If there are pending bytes, or if the last packet was full,
- * send another IN packet
+ /* Anytime we've sent a character since
+ * the last time we flushed, we'll need
+ * to send a packet -- the only other time
+ * we would send a packet is when that
+ * packet was full, in which case we now
+ * want to send an empty packet
*/
if (!ao_usb_in_flushed) {
ao_usb_in_flushed = 1;
if (!ao_usb_running)
return;
- ao_usb_in_flushed = 0;
+ ao_usb_in_wait();
/* Queue a byte */
UENUM = AO_USB_IN_EP;
/* Send the packet when full */
if ((UEINTX & (1 << RWAL)) == 0)
ao_usb_in_send();
+ ao_usb_in_flushed = 0;
}
static char
_ao_usb_pollchar(void)
{
char c;
+ uint8_t intx;
- UENUM = AO_USB_OUT_EP;
- while ((UEINTX & (1 << RWAL)) == 0) {
+ if (!ao_usb_running)
+ return AO_READ_AGAIN;
+
+ for (;;) {
+ UENUM = AO_USB_OUT_EP;
+ intx = UEINTX;
+ debug("usb_pollchar UEINTX %02d\n", intx);
+ if (intx & (1 << RWAL))
+ break;
- /* Ack the last packet */
- UEINTX = (uint8_t) ~(1 << FIFOCON);
+ if (intx & (1 << FIFOCON)) {
+ /* Ack the last packet */
+ UEINTX = (uint8_t) ~(1 << FIFOCON);
+ }
/* Check to see if a packet has arrived */
- if ((UEINTX & (1 << RXOUTI)) == 0)
+ if ((intx & (1 << RXOUTI)) == 0) {
+ UENUM = AO_USB_OUT_EP;
+ UEIENX = (1 << RXOUTE);
return AO_READ_AGAIN;
+ }
/* Ack the interrupt */
UEINTX = ~(1 << RXOUTI);
char c;
cli();
- while ((c = ao_usb_pollchar()) == AO_READ_AGAIN)
+ while ((c = _ao_usb_pollchar()) == AO_READ_AGAIN)
ao_sleep(&ao_stdin_ready);
sei();
return c;
}
+uint16_t control_count;
+uint16_t in_count;
+uint16_t out_count;
+
/* Endpoint interrupt */
ISR(USB_COM_vect)
{
+ uint8_t old_num = UENUM;
uint8_t i = UEINT;
+#ifdef AO_LED_RED
ao_led_toggle(AO_LED_RED);
+#endif
UEINT = 0;
- if (i & (1 << 0))
+ if (i & (1 << 0)) {
ao_wakeup(&ao_usb_task);
- if (i & (1 << AO_USB_IN_EP))
+ ++control_count;
+ }
+ if (i & (1 << AO_USB_IN_EP)) {
+ UENUM = AO_USB_IN_EP;
+ UEIENX = 0;
ao_wakeup(&ao_usb_in_flushed);
- if (i & (1 << AO_USB_OUT_EP))
+ in_count++;
+ }
+ if (i & (1 << AO_USB_OUT_EP)) {
+ UENUM = AO_USB_OUT_EP;
+ UEIENX = 0;
ao_wakeup(&ao_stdin_ready);
+ ++out_count;
+ }
+ UENUM = old_num;
}
#if AVR_VCC_5V
#define AO_PAD_REGULATOR_INIT (1 << UVREGE) /* Turn on pad regulator */
#endif
#if AVR_VCC_3V3
-#define AO_PAD_REGULATOR_INIT 0 /* Turn off pad regulator */
+/* TeleScience V0.1 has a hardware bug -- UVcc is hooked up, but UCap is not
+ * Make this work by running power through UVcc to the USB system
+ */
+#define AO_PAD_REGULATOR_INIT (1 << UVREGE) /* Turn off pad regulator */
#endif
#if AVR_CLOCK == 16000000UL
ao_usb_configuration = 0;
- printf ("ao_usb_enable\n");
+ debug ("ao_usb_enable\n");
+ debug ("UHWCON %02x USBCON %02x PLLCSR %02x UDIEN %02x\n",
+ UHWCON, USBCON, PLLCSR, UDIEN);
UDCON = (0 << DETACH); /* Clear the DETACH bit to plug into the bus */
}
+#if USB_DEBUG
+struct ao_task __xdata ao_usb_echo_task;
+
+static void
+ao_usb_echo(void)
+{
+ char c;
+
+ for (;;) {
+ c = ao_usb_getchar();
+ ao_usb_putchar(c);
+ ao_usb_flush();
+ }
+}
+#endif
+
+static void
+ao_usb_irq(void)
+{
+ printf ("control: %d out: %d in: %d\n",
+ control_count, out_count, in_count);
+}
+
+__code struct ao_cmds ao_usb_cmds[] = {
+ { ao_usb_irq, "i\0Show USB interrupt counts" },
+ { 0, NULL }
+};
+
void
ao_usb_init(void)
{
ao_usb_enable();
- printf ("ao_usb_init\n");
+ debug ("ao_usb_init\n");
ao_add_task(&ao_usb_task, ao_usb_ep0, "usb");
-// ao_add_stdio(ao_usb_pollchar, ao_usb_putchar, ao_usb_flush);
+// ao_add_task(&ao_usb_echo_task, ao_usb_echo, "usb echo");
+ ao_cmd_register(&ao_usb_cmds[0]);
+ ao_add_stdio(ao_usb_pollchar, ao_usb_putchar, ao_usb_flush);
}
projects / fw / altos / blobdiff