summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-07-22 13:07:56 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-07-22 13:07:56 +0000
commit7d9cc0e2ce94cc0b0d42371cca1abbee552ad629 (patch)
tree979a9b0205b0edf786251ef19cff894d403d9cac /firmware/export
parent2e6058787445458e8c786fbc802a8adb221050dd (diff)
downloadrockbox-7d9cc0e2ce94cc0b0d42371cca1abbee552ad629.tar.gz
rockbox-7d9cc0e2ce94cc0b0d42371cca1abbee552ad629.zip
CCU_BASE+0x20 is specific to AMSv2 -> move to as3525v2.h
Rename to simply 'CCU_USB' git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27518 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/as3525.h1
-rw-r--r--firmware/export/as3525v2.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h
index 52f10efb3e..e44b4ed693 100644
--- a/firmware/export/as3525.h
+++ b/firmware/export/as3525.h
@@ -109,7 +109,6 @@
109#define CCU_VERS (*(volatile unsigned long *)(CCU_BASE + 0x14)) 109#define CCU_VERS (*(volatile unsigned long *)(CCU_BASE + 0x14))
110#define CCU_SPARE1 (*(volatile unsigned long *)(CCU_BASE + 0x18)) 110#define CCU_SPARE1 (*(volatile unsigned long *)(CCU_BASE + 0x18))
111#define CCU_SPARE2 (*(volatile unsigned long *)(CCU_BASE + 0x1C)) 111#define CCU_SPARE2 (*(volatile unsigned long *)(CCU_BASE + 0x1C))
112#define CCU_USB_THINGY (*(volatile unsigned long *)(CCU_BASE + 0x20))
113 112
114/* DBOP */ 113/* DBOP */
115#define DBOP_TIMPOL_01 (*(volatile unsigned long *)(DBOP_BASE + 0x00)) 114#define DBOP_TIMPOL_01 (*(volatile unsigned long *)(DBOP_BASE + 0x00))
diff --git a/firmware/export/as3525v2.h b/firmware/export/as3525v2.h
index 4b719a905a..caae57e061 100644
--- a/firmware/export/as3525v2.h
+++ b/firmware/export/as3525v2.h
@@ -40,4 +40,6 @@
40 40
41#define USB_NUM_ENDPOINTS 6 41#define USB_NUM_ENDPOINTS 6
42 42
43#define CCU_USB (*(volatile unsigned long *)(CCU_BASE + 0x20))
44
43#endif /* __AS3525V2_H__ */ 45#endif /* __AS3525V2_H__ */