Fix USB input/output by reloading packet limits.

The USB controller is reset during the connection process, which clears the
packet limits set in the controller at initialization time. Reload those
values when the configuration is set.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/ao_test.c b/ao_test.c
index 9a8adc3d6532daf6f0fc16aa43c60538ade24964..5d50ab8332e13c1cc4d02b027e07c7639016b884 100644 (file)
--- a/ao_test.c
+++ b/ao_test.c
@@ -21,6 +21,7 @@ struct ao_task __xdata blink_0_task;
 struct ao_task __xdata blink_1_task;
 struct ao_task __xdata wakeup_task;
 struct ao_task __xdata beep_task;
 struct ao_task __xdata blink_1_task;
 struct ao_task __xdata wakeup_task;
 struct ao_task __xdata beep_task;

+struct ao_task __xdata echo_task;

 
 void delay(int n) __reentrant
 {
 
 void delay(int n) __reentrant
 {


@@ -83,6 +84,19 @@ beep(void)
        }
 }
 
        }
 }
 

+void
+echo(void)
+{
+       uint8_t c;
+       for (;;) {
+               c = ao_usb_getchar();
+               ao_usb_putchar(c);
+               if (c == '\r')
+                       ao_usb_putchar('\n');
+               ao_usb_flush();
+       }
+}
+

 void
 main(void)
 {
 void
 main(void)
 {


@@ -94,5 +108,6 @@ main(void)
        ao_add_task(&blink_1_task, blink_1);
        ao_add_task(&wakeup_task, wakeup);
        ao_add_task(&beep_task, beep);
        ao_add_task(&blink_1_task, blink_1);
        ao_add_task(&wakeup_task, wakeup);
        ao_add_task(&beep_task, beep);

+       ao_add_task(&echo_task, echo);

        ao_start_scheduler();
 }
        ao_start_scheduler();
 }

diff --git a/ao_usb.c b/ao_usb.c
index d8f099c0b6aef985884879210fa656b66293d695..3e9bb5b39c4ddb153a4fdc29e77646475b304333 100644 (file)
--- a/ao_usb.c
+++ b/ao_usb.c
@@ -300,6 +300,24 @@ ao_usb_set_address(uint8_t address)
                ;
 }
 
                ;
 }
 

+static void
+ao_usb_set_configuration(void)
+{
+       uint8_t size;
+
+       /* Set the IN max packet size, double buffered */
+       USBINDEX = AO_USB_IN_EP;
+       size = AO_USB_IN_SIZE >> 3;
+       USBMAXI = size;
+//     USBCSIH |= USBCSIH_IN_DBL_BUF;
+
+       /* Set the OUT max packet size, double buffered */
+       USBINDEX = AO_USB_OUT_EP;
+       size = AO_USB_OUT_SIZE >> 3;
+       USBMAXO = size;
+//     USBCSOH = USBCSOH_OUT_DBL_BUF;
+}
+

 static void
 ao_usb_ep0_setup(void)
 {
 static void
 ao_usb_ep0_setup(void)
 {


@@ -350,6 +368,7 @@ ao_usb_ep0_setup(void)
                                break;
                        case AO_USB_REQ_SET_CONFIGURATION:
                                ao_usb_configuration = ao_usb_setup.value;
                                break;
                        case AO_USB_REQ_SET_CONFIGURATION:
                                ao_usb_configuration = ao_usb_setup.value;

+                               ao_usb_set_configuration();

                                break;
                        }
                        break;
                                break;
                        }
                        break;


@@ -494,6 +513,10 @@ ao_usb_getchar(void)
        }
        --ao_usb_out_bytes;
        c = USBFIFO[AO_USB_OUT_EP << 1];
        }
        --ao_usb_out_bytes;
        c = USBFIFO[AO_USB_OUT_EP << 1];

+       if (ao_usb_out_bytes == 0) {
+               USBINDEX = AO_USB_OUT_EP;
+               USBCSOL &= ~USBCSOL_OUTPKT_RDY;
+       }

        ao_interrupt_enable();
        return c;
 }
        ao_interrupt_enable();
        return c;
 }


@@ -504,15 +527,7 @@ ao_usb_init(void)
        /* Turn on the USB controller */
        SLEEP |= SLEEP_USB_EN;
 
        /* Turn on the USB controller */
        SLEEP |= SLEEP_USB_EN;
 

-       /* Set the IN max packet size, double buffered */
-       USBINDEX = AO_USB_IN_EP;
-       USBMAXI = AO_USB_IN_SIZE >> 3;
-       USBCSIH |= USBCSIH_IN_DBL_BUF;
-
-       /* Set the OUT max packet size, double buffered */
-       USBINDEX = AO_USB_OUT_EP;
-       USBMAXO = AO_USB_OUT_SIZE >> 3;
-       USBCSOH = USBCSOH_OUT_DBL_BUF;
+       ao_usb_set_configuration();

        
        /* IN interrupts on the control an IN endpoints */
        USBIIE = (1 << AO_USB_CONTROL_EP) | (1 << AO_USB_IN_EP);
        
        /* IN interrupts on the control an IN endpoints */
        USBIIE = (1 << AO_USB_CONTROL_EP) | (1 << AO_USB_IN_EP);