summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-03-22 11:06:45 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-03-22 11:06:45 +0000
commit8f186803a53a907431e428355dc355996c77f9e7 (patch)
tree6ebc8569b41145c3add6554e1dddd3b05965717d
parentd257683f3edbb0a2b819b27d34c2708809d3d57d (diff)
downloadrockbox-8f186803a53a907431e428355dc355996c77f9e7.zip
rockbox-8f186803a53a907431e428355dc355996c77f9e7.tar.gz
rockbox-8f186803a53a907431e428355dc355996c77f9e7.tar.bz2
rockbox-8f186803a53a907431e428355dc355996c77f9e7.tar.xz
USB mode for iAudio X5
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9179 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/SOURCES1
-rwxr-xr-xfirmware/target/coldfire/iaudio/x5/usb-target.h24
-rwxr-xr-xfirmware/target/coldfire/iaudio/x5/usb-x5.c46
-rw-r--r--firmware/usb.c7
4 files changed, 78 insertions, 0 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 6b80c5e..e99657c 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -211,5 +211,6 @@ target/coldfire/iaudio/x5/pcf50606-x5.c
target/coldfire/iaudio/x5/adc-x5.c
target/coldfire/iaudio/x5/ata-x5.c
target/coldfire/iaudio/x5/system-x5.c
+target/coldfire/iaudio/x5/usb-x5.c
#endif
#endif
diff --git a/firmware/target/coldfire/iaudio/x5/usb-target.h b/firmware/target/coldfire/iaudio/x5/usb-target.h
new file mode 100755
index 0000000..ab8cac6
--- /dev/null
+++ b/firmware/target/coldfire/iaudio/x5/usb-target.h
@@ -0,0 +1,24 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Linus Nielsen Feltzing
+ *
+ * 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 USB_TARGET_H
+#define USB_TARGET_H
+
+bool usb_init_device(void);
+
+#endif
diff --git a/firmware/target/coldfire/iaudio/x5/usb-x5.c b/firmware/target/coldfire/iaudio/x5/usb-x5.c
new file mode 100755
index 0000000..4f30501
--- /dev/null
+++ b/firmware/target/coldfire/iaudio/x5/usb-x5.c
@@ -0,0 +1,46 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Linus Nielsen Feltzing
+ *
+ * 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.
+ *
+ ****************************************************************************/
+#include "config.h"
+#include <stdbool.h>
+#include "cpu.h"
+#include "system.h"
+
+void usb_init_device(void)
+{
+ and_l(~0x00000010, &GPIO_OUT); /* Self powered */
+ or_l(0x00800000, &GPIO_OUT); /* RESET deasserted */
+ or_l(0x00800010, &GPIO_FUNCTION);
+ or_l(0x00800010, &GPIO_ENABLE);
+
+ or_l(0x00800000, &GPIO1_FUNCTION); /* USB detect */
+}
+
+bool usb_detect(void)
+{
+ return (GPIO1_READ & 0x00800000)?true:false;
+}
+
+void usb_enable(bool on)
+{
+ if(on) {
+ or_l(0x00000008, &GPIO1_OUT);
+ } else {
+ and_l(~0x00000008, &GPIO1_OUT);
+ }
+}
diff --git a/firmware/usb.c b/firmware/usb.c
index 9fd1818..ad4f2b9 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -41,6 +41,9 @@
#ifdef HAVE_MMC
#include "ata_mmc.h"
#endif
+#ifdef TARGET_TREE
+#include "usb-target.h"
+#endif
extern void dbg_ports(void); /* NASTY! defined in apps/ */
@@ -99,6 +102,7 @@ static struct event_queue usb_queue;
static bool last_usb_status;
static bool usb_monitor_enabled;
+#ifndef TARGET_TREE
void usb_enable(bool on)
{
#ifdef USB_ENABLE_ONDIOSTYLE
@@ -203,6 +207,7 @@ void usb_enable(bool on)
or_b(0x04, &PAIORH);
#endif
}
+#endif
#ifndef BOOTLOADER
static void usb_slave_mode(bool on)
@@ -381,6 +386,7 @@ static void usb_thread(void)
}
#endif
+#ifndef TARGET_TREE
bool usb_detect(void)
{
bool current_status;
@@ -414,6 +420,7 @@ bool usb_detect(void)
#endif
return current_status;
}
+#endif
#ifndef BOOTLOADER
static void usb_tick(void)