summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorMarcoen Hirschberg <marcoen@gmail.com>2007-04-19 10:14:55 +0000
committerMarcoen Hirschberg <marcoen@gmail.com>2007-04-19 10:14:55 +0000
commit6ffbe3896b89ce86cccfe3b1f492f60e34d89603 (patch)
treeb6b845fc876b0d98b793aefa906f5d5eab6993f5 /firmware
parent710a9ca194316d3a269a3c3dd2e603768da5a780 (diff)
downloadrockbox-6ffbe3896b89ce86cccfe3b1f492f60e34d89603.tar.gz
rockbox-6ffbe3896b89ce86cccfe3b1f492f60e34d89603.tar.bz2
rockbox-6ffbe3896b89ce86cccfe3b1f492f60e34d89603.zip
move the iriver ifp7xx and other pnx0101 related files together in the target tree
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13207 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/FILES2
-rw-r--r--firmware/SOURCES16
-rw-r--r--firmware/app.lds2
-rw-r--r--firmware/target/arm/pnx0101/backlight-target.h26
-rw-r--r--firmware/target/arm/pnx0101/crt0-pnx0101.S (renamed from firmware/target/arm/crt0-pnx0101.S)0
-rw-r--r--firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c)0
-rw-r--r--firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h (renamed from firmware/target/arm/iriver/ifp7xx/adc-target.h)0
-rw-r--r--firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c)0
-rw-r--r--firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c)0
-rw-r--r--firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h (renamed from firmware/target/arm/iriver/ifp7xx/button-target.h)0
-rw-r--r--firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c)0
-rw-r--r--firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c)0
-rw-r--r--firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h (renamed from firmware/target/arm/iriver/ifp7xx/system-target.h)0
-rw-r--r--firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c (renamed from firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c)0
-rw-r--r--firmware/target/arm/pnx0101/system-pnx0101.c (renamed from firmware/target/arm/system-pnx0101.c)0
-rw-r--r--firmware/target/arm/pnx0101/usb-target.h27
16 files changed, 63 insertions, 10 deletions
diff --git a/firmware/FILES b/firmware/FILES
index f44d5f28b7..f68e0cbb01 100644
--- a/firmware/FILES
+++ b/firmware/FILES
@@ -19,7 +19,7 @@ target/arm/archos/av300/*.[chS]
target/arm/s3c2440/gigabeat-fx/*.[chS]
target/arm/iriver/*.[chS]
target/arm/iriver/h10/*.[chS]
-target/arm/iriver/ifp7xx/*.[chS]
+target/arm/pnx0101/iriver-ifp7xx/*.[chS]
target/arm/ipod/*.[chS]
target/arm/ipod/3g/*.[chS]
target/arm/ipod/video/*.[chS]
diff --git a/firmware/SOURCES b/firmware/SOURCES
index d8d495c89c..d8e3d7e2ed 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -279,7 +279,7 @@ drivers/i2c-pnx0101.c
/* no i2c driver yet */
#endif
#if CONFIG_CPU == PNX0101
-target/arm/system-pnx0101.c
+target/arm/pnx0101/system-pnx0101.c
#endif
#if defined(CPU_PP)
#ifdef BOOTLOADER
@@ -290,7 +290,7 @@ target/arm/audio-pp.c
target/arm/crt0-pp.S
#endif
#elif CONFIG_CPU == PNX0101
-target/arm/crt0-pnx0101.S
+target/arm/pnx0101/crt0-pnx0101.S
#elif defined(CPU_ARM)
target/arm/crt0.S
#endif /* defined(CPU_*) */
@@ -642,12 +642,12 @@ target/arm/usb-pp.c
#endif /* IPOD_MINI2G */
#ifdef IRIVER_IFP7XX
-target/arm/iriver/ifp7xx/power-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c
#ifndef SIMULATOR
-target/arm/iriver/ifp7xx/adc-ifp7xx.c
-target/arm/iriver/ifp7xx/backlight-ifp7xx.c
-target/arm/iriver/ifp7xx/button-ifp7xx.c
-target/arm/iriver/ifp7xx/lcd-ifp7xx.c
-target/arm/iriver/ifp7xx/usb-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
#endif
#endif
diff --git a/firmware/app.lds b/firmware/app.lds
index f1a02b56d7..8b0bed31d2 100644
--- a/firmware/app.lds
+++ b/firmware/app.lds
@@ -10,7 +10,7 @@ OUTPUT_ARCH(arm)
#ifdef CPU_PP
INPUT(target/arm/crt0-pp.o)
#elif CONFIG_CPU == PNX0101
-INPUT(target/arm/crt0-pnx0101.o)
+INPUT(target/arm/pnx0101/crt0-pnx0101.o)
#elif defined(CPU_ARM)
INPUT(target/arm/crt0.o)
#endif
diff --git a/firmware/target/arm/pnx0101/backlight-target.h b/firmware/target/arm/pnx0101/backlight-target.h
new file mode 100644
index 0000000000..04236880ee
--- /dev/null
+++ b/firmware/target/arm/pnx0101/backlight-target.h
@@ -0,0 +1,26 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id: backlight-target.h 13136 2007-04-12 22:12:13Z amiconn $
+ *
+ * Copyright (C) 2006 by Barry Wardell
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef BACKLIGHT_TARGET_H
+#define BACKLIGHT_TARGET_H
+
+#define __backlight_init() true
+void __backlight_on(void);
+void __backlight_off(void);
+
+#endif
diff --git a/firmware/target/arm/crt0-pnx0101.S b/firmware/target/arm/pnx0101/crt0-pnx0101.S
index d11546edaa..d11546edaa 100644
--- a/firmware/target/arm/crt0-pnx0101.S
+++ b/firmware/target/arm/pnx0101/crt0-pnx0101.S
diff --git a/firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c
index 79b1ad0fcb..79b1ad0fcb 100644
--- a/firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c
+++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c
diff --git a/firmware/target/arm/iriver/ifp7xx/adc-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h
index 8e5e6edbc5..8e5e6edbc5 100644
--- a/firmware/target/arm/iriver/ifp7xx/adc-target.h
+++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h
diff --git a/firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c
index c0dc3974c0..c0dc3974c0 100644
--- a/firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c
+++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c
diff --git a/firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c
index 52e29fdfdf..52e29fdfdf 100644
--- a/firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c
+++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c
diff --git a/firmware/target/arm/iriver/ifp7xx/button-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h
index 954a2dfe9c..954a2dfe9c 100644
--- a/firmware/target/arm/iriver/ifp7xx/button-target.h
+++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h
diff --git a/firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c
index 0aacd8af67..0aacd8af67 100644
--- a/firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c
+++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c
diff --git a/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c
index 4e4f585298..4e4f585298 100644
--- a/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c
+++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c
diff --git a/firmware/target/arm/iriver/ifp7xx/system-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h
index dc11bb74da..dc11bb74da 100644
--- a/firmware/target/arm/iriver/ifp7xx/system-target.h
+++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h
diff --git a/firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
index a22a227b15..a22a227b15 100644
--- a/firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c
+++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
diff --git a/firmware/target/arm/system-pnx0101.c b/firmware/target/arm/pnx0101/system-pnx0101.c
index 9d8bb405a8..9d8bb405a8 100644
--- a/firmware/target/arm/system-pnx0101.c
+++ b/firmware/target/arm/pnx0101/system-pnx0101.c
diff --git a/firmware/target/arm/pnx0101/usb-target.h b/firmware/target/arm/pnx0101/usb-target.h
new file mode 100644
index 0000000000..fb263b2419
--- /dev/null
+++ b/firmware/target/arm/pnx0101/usb-target.h
@@ -0,0 +1,27 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id: usb-target.h 11494 2006-11-10 07:43:36Z tomal $
+ *
+ * Copyright (C) 2006 by Barry Wardelll
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/* Based off x5 version */
+
+#ifndef USB_TARGET_H
+#define USB_TARGET_H
+
+bool usb_init_device(void);
+
+#endif