Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / kernel / ao_usb.h

diff --git a/src/kernel/ao_usb.h b/src/kernel/ao_usb.h
index 40516de10340ffa439f606a2292e776c25ca0d55..6c74a04265e3ecf282093c33e981de4ad79f2fce 100644 (file)
--- a/src/kernel/ao_usb.h
+++ b/src/kernel/ao_usb.h
@@ -69,7 +69,7 @@ ao_usb_disable(void);
 void
 ao_usb_init(void);
 
-extern __code __at (0x00aa) uint8_t ao_usb_descriptors [];
+extern const uint8_t ao_usb_descriptors [];
 
 #define AO_USB_SETUP_DIR_MASK  (0x01 << 7)
 #define AO_USB_SETUP_TYPE_MASK (0x03 << 5)
@@ -176,8 +176,8 @@ struct ao_usb_line_coding {
        uint8_t         data_bits;
 } ;
 
-extern __xdata struct ao_usb_line_coding ao_usb_line_coding;
+extern struct ao_usb_line_coding ao_usb_line_coding;
 
-extern __pdata uint8_t ao_usb_running;
+extern uint8_t ao_usb_running;
 
 #endif /* _AO_USB_H_ */