Timer 3 working with slower clock and all 16 bits.

[fw/altos] / src / avr / ao_usb_avr.c

diff --git a/src/avr/ao_usb_avr.c b/src/avr/ao_usb_avr.c
index 74bdea23ef8d5eb630dde4c59d390eaf276672ec..9ba407af6f6a3e0f1027f4e5c5e5fa2378bfee6b 100644 (file)
--- a/src/avr/ao_usb_avr.c
+++ b/src/avr/ao_usb_avr.c
@@ -303,9 +303,6 @@ ao_usb_ep0_setup(void)
                        }
                        break;
                case AO_USB_RECIP_INTERFACE:
-#ifndef AVR
-                       #pragma disable_warning 110
-#endif
                        debug ("Interface setup packet\n");
                        switch(ao_usb_setup.request) {
                        case AO_USB_REQ_GET_STATUS:
@@ -333,17 +330,17 @@ ao_usb_ep0_setup(void)
        case AO_USB_TYPE_CLASS:
                debug ("Class setup packet\n");
                switch (ao_usb_setup.request) {
-               case SET_LINE_CODING:
+               case AO_USB_SET_LINE_CODING:
                        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:
+               case AO_USB_GET_LINE_CODING:
                        debug ("get line coding\n");
                        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;
@@ -661,18 +658,6 @@ ao_usb_echo(void)
 }
 #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)
 {
@@ -683,6 +668,5 @@ ao_usb_init(void)
 #if USB_DEBUG
        ao_add_task(&ao_usb_echo_task, ao_usb_echo, "usb echo");
 #endif
-       ao_cmd_register(&ao_usb_cmds[0]);
        ao_add_stdio(ao_usb_pollchar, ao_usb_putchar, ao_usb_flush);
 }