Barry Wardell's initial work for the iriver H10 port

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10447 a1c6a512-1295-4272-9138-f99709370657

10 files changed, 906 insertions, 0 deletions

diff --git a/firmware/target/arm/iriver/h10/ata-h10.c b/firmware/target/arm/iriver/h10/ata-h10.c
new file mode 100644
index 0000000000..f8ca773132
--- /dev/null
+++ b/firmware/target/arm/iriver/h10/ata-h10.c
@@ -0,0 +1,51 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/* ATA stuff was taken from the iPod code */
+
+#include <stdbool.h>
+#include "system.h"
+#include "ata-target.h"
+
+void ata_reset() 
+{
+
+}
+
+void ata_enable(bool on)
+{
+    /* TODO: Implement ata_enable() */
+    (void)on;
+}
+
+bool ata_is_coldstart()
+{
+    return false;
+    /* TODO: Implement coldstart variable */
+}
+
+void ata_device_init()
+{
+    /* From ipod-ide.c:ipod_ide_register() */
+    outl(inl(0xc3000028) | (1 << 5), 0xc3000028);
+    outl(inl(0xc3000028) & ~0x10000000, 0xc3000028);
+
+    outl(0x10, 0xc3000000);
+    outl(0x80002150, 0xc3000004);
+}
diff --git a/firmware/target/arm/iriver/h10/ata-target.h b/firmware/target/arm/iriver/h10/ata-target.h
new file mode 100644
index 0000000000..a93af79015
--- /dev/null
+++ b/firmware/target/arm/iriver/h10/ata-target.h
@@ -0,0 +1,72 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/* ATA stuff was taken from the iPod code */
+
+/* Plain C read & write loops */
+#define PREFER_C_READING
+#define PREFER_C_WRITING
+
+#if (CONFIG_CPU == PP5002)
+#define ATA_IOBASE      0xc00031e0
+#define ATA_CONTROL     (*((volatile unsigned char*)(0xc00033f8)))
+#elif (CONFIG_CPU == PP5020)
+#define ATA_IOBASE      0xc30001e0
+#define ATA_CONTROL     (*((volatile unsigned char*)(0xc30003f8)))
+#endif
+
+#define ATA_DATA        (*((volatile unsigned short*)(ATA_IOBASE)))
+#define ATA_ERROR       (*((volatile unsigned char*)(ATA_IOBASE + 0x04)))
+#define ATA_NSECTOR     (*((volatile unsigned char*)(ATA_IOBASE + 0x08)))
+#define ATA_SECTOR      (*((volatile unsigned char*)(ATA_IOBASE + 0x0c)))
+#define ATA_LCYL        (*((volatile unsigned char*)(ATA_IOBASE + 0x10)))
+#define ATA_HCYL        (*((volatile unsigned char*)(ATA_IOBASE + 0x14)))
+#define ATA_SELECT      (*((volatile unsigned char*)(ATA_IOBASE + 0x18)))
+#define ATA_COMMAND     (*((volatile unsigned char*)(ATA_IOBASE + 0x1c)))
+
+#define STATUS_BSY      0x80
+#define STATUS_RDY      0x40
+#define STATUS_DF       0x20
+#define STATUS_DRQ      0x08
+#define STATUS_ERR      0x01
+#define ERROR_ABRT      0x04
+
+#define WRITE_PATTERN1 0xa5
+#define WRITE_PATTERN2 0x5a
+#define WRITE_PATTERN3 0xaa
+#define WRITE_PATTERN4 0x55
+
+#define READ_PATTERN1 0xa5
+#define READ_PATTERN2 0x5a
+#define READ_PATTERN3 0xaa
+#define READ_PATTERN4 0x55
+
+#define READ_PATTERN1_MASK 0xff
+#define READ_PATTERN2_MASK 0xff
+#define READ_PATTERN3_MASK 0xff
+#define READ_PATTERN4_MASK 0xff
+
+#define SET_REG(reg,val) reg = (val)
+#define SET_16BITREG(reg,val) reg = (val)
+
+
+void ata_reset(void);
+void ata_enable(bool on);
+bool ata_is_coldstart(void);
+void ata_device_init(void);
diff --git a/firmware/target/arm/iriver/h10/backlight-h10.c b/firmware/target/arm/iriver/h10/backlight-h10.c
new file mode 100644
index 0000000000..b4221dd60a
--- /dev/null
+++ b/firmware/target/arm/iriver/h10/backlight-h10.c
@@ -0,0 +1,44 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/* The H10 display (and hence backlight) possibly identical to that of the X5,
+  so that code was used here but left #if 0'ed  out for the moment */
+   
+#include "config.h"
+#include "cpu.h"
+#include "system.h"
+#include "backlight.h"
+
+void __backlight_on(void)
+{
+#if 0    
+        int level = set_irq_level(HIGHEST_IRQ_LEVEL);
+    pcf50606_write(0x38, 0xb0); /* Backlight ON, GPO1INV=1, GPO1ACT=011 */
+    set_irq_level(level);
+#endif
+}
+
+void __backlight_off(void)
+{
+#if 0
+    int level = set_irq_level(HIGHEST_IRQ_LEVEL);
+    pcf50606_write(0x38, 0x80); /* Backlight OFF, GPO1INV=1, GPO1ACT=000 */
+    set_irq_level(level);
+#endif
+}
diff --git a/firmware/target/arm/iriver/h10/backlight-target.h b/firmware/target/arm/iriver/h10/backlight-target.h
new file mode 100644
index 0000000000..b5fe2f7c5d
--- /dev/null
+++ b/firmware/target/arm/iriver/h10/backlight-target.h
@@ -0,0 +1,28 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/* Taken from the x5's implementation */
+
+#ifndef BACKLIGHT_TARGET_H
+#define BACKLIGHT_TARGET_H
+
+void __backlight_on(void);
+void __backlight_off(void);
+
+#endif
diff --git a/firmware/target/arm/iriver/h10/button-h10.c b/firmware/target/arm/iriver/h10/button-h10.c
new file mode 100644
index 0000000000..badcd594a1
--- /dev/null
+++ b/firmware/target/arm/iriver/h10/button-h10.c
@@ -0,0 +1,69 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/* Custom written for the H10 based on analysis of the GPIO data */
+
+
+#include <stdlib.h>
+#include "config.h"
+#include "cpu.h"
+#include "system.h"
+#include "button.h"
+#include "kernel.h"
+#include "backlight.h"
+#include "adc.h"
+#include "system.h"
+
+
+void button_init_device(void)
+{
+        /* No hardware initialisation required as it is done by the bootloader */
+}
+
+bool button_hold(void)
+{
+    return (GPIOA_INPUT_VAL & 0x40)?false:true;
+}
+
+/*
+ * Get button pressed from hardware
+ */
+int button_read_device(void)
+{
+    int btn = BUTTON_NONE;
+        unsigned char state;
+        static bool hold_button = false;
+#if 0
+    /* light handling */
+    if (hold_button && !button_hold())
+    {
+        backlight_on();
+    }
+#endif
+
+    hold_button = button_hold();
+    state = GPIOA_INPUT_VAL & 0xf8;
+    if ((state & 0x8) == 0) btn |= BUTTON_FF;
+    if ((state & 0x16) == 0) btn |= BUTTON_PLAY;
+    if ((state & 0x32) == 0) btn |= BUTTON_REW;
+    if ((state & 0x64) == 0) btn |= BUTTON_RIGHT;
+    if ((state & 0x128) == 0) btn |= BUTTON_LEFT;
+        
+    return btn;
+}
diff --git a/firmware/target/arm/iriver/h10/button-target.h b/firmware/target/arm/iriver/h10/button-target.h
new file mode 100644
index 0000000000..48aa10c124
--- /dev/null
+++ b/firmware/target/arm/iriver/h10/button-target.h
@@ -0,0 +1,58 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/* Custom written for the H10 */
+
+#ifndef _BUTTON_TARGET_H_
+#define _BUTTON_TARGET_H_
+
+#include <stdbool.h>
+#include "config.h"
+
+#define HAS_BUTTON_HOLD
+
+bool button_hold(void);
+void button_init_device(void);
+int button_read_device(void);
+
+/* iriver H10 specific button codes */
+
+    /* Main unit's buttons */
+#define BUTTON_POWER        0x00000001
+
+#define BUTTON_LEFT         0x00000002
+#define BUTTON_RIGHT        0x00000004
+
+#define BUTTON_REW          0x00000008
+#define BUTTON_PLAY         0x00000010
+#define BUTTON_FF           0x00000020
+
+#define BUTTON_SCROLL_UP    0x00000040
+#define BUTTON_SCROLL_DOWN  0x00000080
+
+#define BUTTON_MAIN (BUTTON_POWER|BUTTON_O|BUTTON_BACK|BUTTON_REW\
+                |BUTTON_PLAY|BUTTON_FF)
+
+    /* No Remote control */
+#define BUTTON_REMOTE 0
+
+#define POWEROFF_BUTTON BUTTON_POWER
+#define POWEROFF_COUNT 10
+
+#endif /* _BUTTON_TARGET_H_ */
diff --git a/firmware/target/arm/iriver/h10/lcd-h10.c b/firmware/target/arm/iriver/h10/lcd-h10.c
new file mode 100644
index 0000000000..c2fa05b05c
--- /dev/null
+++ b/firmware/target/arm/iriver/h10/lcd-h10.c
@@ -0,0 +1,351 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/* The H10 display possibly identical to that of the X5, so that code was used here
+   but left #if 0'ed  out for the moment */
+
+#include "config.h"
+
+#include "cpu.h"
+#include "lcd.h"
+#include "kernel.h"
+#include "thread.h"
+#include <string.h>
+#include <stdlib.h>
+#include "file.h"
+#include "debug.h"
+#include "system.h"
+#include "font.h"
+#include "bidi.h"
+
+static bool display_on=false; /* is the display turned on? */
+
+#define LCD_CMD  *(volatile unsigned short *)0xf0008000
+#define LCD_DATA *(volatile unsigned short *)0xf0008002
+
+/* register defines for the Renesas HD66773R */
+#define R_HORIZ_RAM_ADDR_POS    0x16
+#define R_VERT_RAM_ADDR_POS     0x17
+#define R_RAM_ADDR_SET          0x21
+#define R_WRITE_DATA_2_GRAM     0x22
+
+/*****************************************************
+The table below was generated by the following script:
+
+#!/usr/bin/perl
+
+# high byte table
+print "short high8to9[] = {\n";
+$str = "  ";
+for my $m (0 .. 255) {
+    # RRRRRGGG => RRRRR0GGG
+    my $v = (($m & 0xF8) << 1) | ($m & 0x07);
+    if(length($str) > 75) {
+        print "$str\n";
+        $str="  ";
+    }
+    $str .= sprintf("0x%03x, ", $v);
+}
+print "$str\n};\n";
+
+*****************************************************/
+
+/* Lookup table for 16->18bit conversion, high byte. The low byte is just
+   shifted. */
+const short high8to9[] ICONST_ATTR = {
+  0x000, 0x001, 0x002, 0x003, 0x004, 0x005, 0x006, 0x007, 0x010, 0x011, 0x012,
+  0x013, 0x014, 0x015, 0x016, 0x017, 0x020, 0x021, 0x022, 0x023, 0x024, 0x025,
+  0x026, 0x027, 0x030, 0x031, 0x032, 0x033, 0x034, 0x035, 0x036, 0x037, 0x040,
+  0x041, 0x042, 0x043, 0x044, 0x045, 0x046, 0x047, 0x050, 0x051, 0x052, 0x053,
+  0x054, 0x055, 0x056, 0x057, 0x060, 0x061, 0x062, 0x063, 0x064, 0x065, 0x066,
+  0x067, 0x070, 0x071, 0x072, 0x073, 0x074, 0x075, 0x076, 0x077, 0x080, 0x081,
+  0x082, 0x083, 0x084, 0x085, 0x086, 0x087, 0x090, 0x091, 0x092, 0x093, 0x094,
+  0x095, 0x096, 0x097, 0x0a0, 0x0a1, 0x0a2, 0x0a3, 0x0a4, 0x0a5, 0x0a6, 0x0a7,
+  0x0b0, 0x0b1, 0x0b2, 0x0b3, 0x0b4, 0x0b5, 0x0b6, 0x0b7, 0x0c0, 0x0c1, 0x0c2,
+  0x0c3, 0x0c4, 0x0c5, 0x0c6, 0x0c7, 0x0d0, 0x0d1, 0x0d2, 0x0d3, 0x0d4, 0x0d5,
+  0x0d6, 0x0d7, 0x0e0, 0x0e1, 0x0e2, 0x0e3, 0x0e4, 0x0e5, 0x0e6, 0x0e7, 0x0f0,
+  0x0f1, 0x0f2, 0x0f3, 0x0f4, 0x0f5, 0x0f6, 0x0f7, 0x100, 0x101, 0x102, 0x103,
+  0x104, 0x105, 0x106, 0x107, 0x110, 0x111, 0x112, 0x113, 0x114, 0x115, 0x116,
+  0x117, 0x120, 0x121, 0x122, 0x123, 0x124, 0x125, 0x126, 0x127, 0x130, 0x131,
+  0x132, 0x133, 0x134, 0x135, 0x136, 0x137, 0x140, 0x141, 0x142, 0x143, 0x144,
+  0x145, 0x146, 0x147, 0x150, 0x151, 0x152, 0x153, 0x154, 0x155, 0x156, 0x157,
+  0x160, 0x161, 0x162, 0x163, 0x164, 0x165, 0x166, 0x167, 0x170, 0x171, 0x172,
+  0x173, 0x174, 0x175, 0x176, 0x177, 0x180, 0x181, 0x182, 0x183, 0x184, 0x185,
+  0x186, 0x187, 0x190, 0x191, 0x192, 0x193, 0x194, 0x195, 0x196, 0x197, 0x1a0,
+  0x1a1, 0x1a2, 0x1a3, 0x1a4, 0x1a5, 0x1a6, 0x1a7, 0x1b0, 0x1b1, 0x1b2, 0x1b3,
+  0x1b4, 0x1b5, 0x1b6, 0x1b7, 0x1c0, 0x1c1, 0x1c2, 0x1c3, 0x1c4, 0x1c5, 0x1c6,
+  0x1c7, 0x1d0, 0x1d1, 0x1d2, 0x1d3, 0x1d4, 0x1d5, 0x1d6, 0x1d7, 0x1e0, 0x1e1,
+  0x1e2, 0x1e3, 0x1e4, 0x1e5, 0x1e6, 0x1e7, 0x1f0, 0x1f1, 0x1f2, 0x1f3, 0x1f4,
+  0x1f5, 0x1f6, 0x1f7,
+};
+
+/* called very frequently - inline! */
+inline void lcd_write_reg(int reg, int val)
+{
+#if 0
+    LCD_CMD = (reg >> 8) << 1;
+    LCD_CMD = (reg & 0xff) << 1;
+    LCD_DATA = (val >> 8) << 1;
+    LCD_DATA = (val & 0xff) << 1;
+#endif
+        (void)reg;
+        (void)val;
+}
+
+/* called very frequently - inline! */
+inline void lcd_begin_write_gram(void)
+{
+#if 0
+    LCD_CMD = (R_WRITE_DATA_2_GRAM >> 8) << 1;
+    LCD_CMD = (R_WRITE_DATA_2_GRAM & 0xff) << 1;
+#endif
+}
+
+/* called very frequently - inline! */
+inline void lcd_write_data(const unsigned short* p_bytes, int count) ICODE_ATTR;
+inline void lcd_write_data(const unsigned short* p_bytes, int count)
+{
+#if 0
+    unsigned int tmp;
+    unsigned int *ptr = (unsigned int *)p_bytes;
+    bool extra;
+
+    /* if there's on odd number of pixels, remmber this and output the
+       trailing pixel after the loop */
+    extra = (count&1)?true:false;
+
+    count >>= 1;
+    while(count--) {
+        tmp = *ptr++;
+        LCD_DATA = high8to9[tmp >> 24];
+        LCD_DATA = tmp>>15;
+        LCD_DATA = high8to9[(tmp >> 8)&255];
+        LCD_DATA = tmp<<1;
+    }
+    if(extra) {
+        /* the final "spare" pixel */
+        unsigned short read = *(unsigned short *)ptr;
+        LCD_DATA = high8to9[read >> 8];
+        LCD_DATA = read<<1;
+    }
+#endif
+        (void)p_bytes;
+        (void)count;
+}
+
+/*** hardware configuration ***/
+
+int lcd_default_contrast(void)
+{
+    return 16;
+}
+
+void lcd_set_contrast(int val)
+{
+#if 0
+    if (val >= 15) // val must'nt be 15 or 31
+     ++val; 
+    if (val > 30)
+      return;
+
+    lcd_write_reg(0x0e, 0x201e + (val << 8));
+#endif
+        (void)val;
+}
+
+void lcd_set_invert_display(bool yesno)
+{
+    (void)yesno;
+}
+
+/* turn the display upside down (call lcd_update() afterwards) */
+void lcd_set_flip(bool yesno)
+{
+    (void)yesno;
+}
+
+/* Rolls up the lcd display by the specified amount of lines.
+ * Lines that are rolled out over the top of the screen are
+ * rolled in from the bottom again. This is a hardware 
+ * remapping only and all operations on the lcd are affected.
+ * -> 
+ * @param int lines - The number of lines that are rolled. 
+ *  The value must be 0 <= pixels < LCD_HEIGHT. */
+void lcd_roll(int lines)
+{
+    (void)lines;
+}
+
+/* LCD init
+ * These settings are taken from the original X5 firmware
+ */
+void lcd_init_device(void)
+{
+#if 0
+    display_on=true;
+
+    /* LCD Reset */
+    and_l(~0x00000010, &GPIO1_OUT);
+    or_l(0x00000010, &GPIO1_ENABLE);
+    or_l(0x00000010, &GPIO1_FUNCTION);
+    sleep(HZ/100);
+    or_l(0x00000010, &GPIO1_OUT);
+
+    sleep(HZ/100);
+
+    lcd_write_reg(0, 0x0001);
+    
+    sleep(HZ/50);
+    
+    lcd_write_reg(0x0d, 0x0401);
+    lcd_write_reg(0x0e, 0x321e);
+    lcd_write_reg(0x01, 0x0313);
+    lcd_write_reg(0x02, 0x0700);
+    lcd_write_reg(0x05, 0x9038);
+    lcd_write_reg(0x06, 0x0000);
+    lcd_write_reg(0x0b, 0x4000);
+    
+    sleep(HZ/100);
+    
+    lcd_write_reg(0x21,0x0000);
+    lcd_write_reg(0x30,0x0003);
+    lcd_write_reg(0x31,0x0400);
+    lcd_write_reg(0x32,0x0407);
+    lcd_write_reg(0x33,0x0305);
+    lcd_write_reg(0x34,0x0003);
+    lcd_write_reg(0x35,0x0704);
+    lcd_write_reg(0x36,0x0407);
+    lcd_write_reg(0x37,0x0503);
+    lcd_write_reg(0x0f,0x0002);
+    lcd_write_reg(0x11,0x0000);
+    lcd_write_reg(0x14,0x9f00);
+    lcd_write_reg(0x15,0x5c00);
+    lcd_write_reg(0x16,0x7f00);
+    lcd_write_reg(0x17,0x9f00);
+    lcd_write_reg(0x3a,0x1409);
+    lcd_write_reg(0x3b,0x0602);
+    
+    lcd_write_reg(0x0c,0x0001);
+
+    sleep(HZ/25);
+    
+    lcd_write_reg(0x03,0x002c);
+    lcd_write_reg(0x04,0x8000);
+
+    sleep(HZ/25);
+    
+    lcd_write_reg(0x0e,0x3318);
+    
+    sleep(HZ/25);
+    
+    lcd_write_reg(0x0d,0x0411);
+
+    sleep(HZ/100);
+    
+    lcd_write_reg(0x07,0x0006);
+    lcd_write_reg(0x07,0x036);
+    lcd_write_reg(0x07,0x037);
+    lcd_write_reg(0x07,0x0037);
+    return;
+#endif
+}
+
+void lcd_enable(bool on)
+{
+#if 0
+    display_on = on;
+#endif
+        (void)on;
+}
+
+/*** update functions ***/
+
+/* Performance function that works with an external buffer
+   note that by and bheight are in 8-pixel units! */
+void lcd_blit(const fb_data* data, int x, int by, int width,
+              int bheight, int stride)
+{
+    /* TODO: Implement lcd_blit() */
+    (void)data;
+    (void)x;
+    (void)by;
+    (void)width;
+    (void)bheight;
+    (void)stride;
+    /*if(display_on)*/ 
+}
+
+
+/* Update the display.
+   This must be called after all other LCD functions that change the display. */
+void lcd_update(void) ICODE_ATTR;
+void lcd_update(void)
+{
+#if 0
+    if(display_on){
+
+        /* Copy display bitmap to hardware */
+        lcd_write_reg(R_RAM_ADDR_SET, 0x0000);
+        lcd_begin_write_gram();
+        lcd_write_data((unsigned short *)lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT);
+    }
+#endif
+}
+
+/* Update a fraction of the display. */
+void lcd_update_rect(int, int, int, int) ICODE_ATTR;
+void lcd_update_rect(int x, int y, int width, int height)
+{
+#if 0
+    if(display_on) {    
+        int ymax = y + height;
+
+        if(x + width > LCD_WIDTH)
+            width = LCD_WIDTH - x;
+        if (width <= 0)
+            return; /* nothing left to do, 0 is harmful to lcd_write_data() */
+        if(ymax >= LCD_HEIGHT)
+            ymax = LCD_HEIGHT-1;
+
+        /* set update window */ 
+
+        /* horiz ram addr */ 
+        lcd_write_reg(R_HORIZ_RAM_ADDR_POS, (ymax<<8) | y); 
+        
+        /* vert ram addr */ 
+        lcd_write_reg(R_VERT_RAM_ADDR_POS,((x+width-1)<<8) | x); 
+        lcd_write_reg(R_RAM_ADDR_SET, (x<<8) | y); 
+        lcd_begin_write_gram(); 
+
+        /* Copy specified rectangle bitmap to hardware */ 
+        for (; y <= ymax; y++) 
+        { 
+            lcd_write_data ((unsigned short *)&lcd_framebuffer[y][x], width); 
+        } 
+
+        /* reset update window */ 
+        lcd_write_reg(R_HORIZ_RAM_ADDR_POS, 0x7f00);
+        lcd_write_reg(R_VERT_RAM_ADDR_POS, 0x9f00);
+    }
+#endif
+        (void)x;
+        (void)y;
+        (void)width;
+        (void)height;
+}
diff --git a/firmware/target/arm/iriver/h10/power-h10.c b/firmware/target/arm/iriver/h10/power-h10.c
new file mode 100644
index 0000000000..58dd25174f
--- /dev/null
+++ b/firmware/target/arm/iriver/h10/power-h10.c
@@ -0,0 +1,99 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/* Created from power.c using some iPod code, and some custom stuff based on 
+   GPIO analysis 
+*/
+
+#include "config.h"
+#include "cpu.h"
+#include <stdbool.h>
+#include "adc.h"
+#include "kernel.h"
+#include "system.h"
+#include "power.h"
+#include "hwcompat.h"
+#include "logf.h"
+#include "usb.h"
+
+#if CONFIG_CHARGING == CHARGING_CONTROL
+bool charger_enabled;
+#endif
+
+#if 0
+#ifdef CONFIG_TUNER
+
+static bool powered = false;
+
+bool radio_powered()
+{
+    return powered;
+}
+
+bool radio_power(bool status)
+{
+    bool old_status = powered;
+    powered = status;
+#ifdef HAVE_TUNER_PWR_CTRL
+    if (status)
+    {
+        and_b(~0x04, &PADRL); /* drive PA2 low for tuner enable */
+        sleep(1); /* let the voltage settle */
+    }
+    else
+        or_b(0x04, &PADRL); /* drive PA2 high for tuner disable */
+#endif
+    return old_status;
+}
+
+#endif /* #ifdef CONFIG_TUNER */
+#endif
+
+void power_init(void)
+{
+}
+
+bool charger_inserted(void)
+{     
+        return (GPIOL_INPUT_VAL & 0x04)?true:false; /* FIXME: This only checks if USB is connected */
+}
+
+void ide_power_enable(bool on)
+{
+    (void)on;
+    /* We do nothing on the iPod */
+}
+
+
+bool ide_powered(void)
+{
+    /* pretend we are always powered - we don't turn it off on the ipod */
+    return true;
+}
+
+void power_off(void)
+{
+    /* set_irq_level(HIGHEST_IRQ_LEVEL);*/
+        #ifndef BOOTLOADER
+    /* We don't turn off the ipod, we put it in a deep sleep */
+    /* pcf50605_standby_mode(); */
+    while(1)
+        yield();
+        #endif
+}
diff --git a/firmware/target/arm/iriver/h10/usb-h10.c b/firmware/target/arm/iriver/h10/usb-h10.c
new file mode 100644
index 0000000000..dccdea81aa
--- /dev/null
+++ b/firmware/target/arm/iriver/h10/usb-h10.c
@@ -0,0 +1,107 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/* Code from the iPod port but commented out. USB detection custom made based
+   on GPIO analysis */
+
+#include "config.h"
+#include "cpu.h"
+#include "kernel.h"
+#include "thread.h"
+#include "system.h"
+#include "debug.h"
+#include "ata.h"
+#include "fat.h"
+#include "disk.h"
+#include "panic.h"
+#include "lcd.h"
+#include "adc.h"
+#include "usb.h"
+#include "button.h"
+#include "sprintf.h"
+#include "string.h"
+#include "hwcompat.h"
+#ifdef HAVE_MMC
+#include "ata_mmc.h"
+#endif
+
+void usb_init_device(void)
+{
+#if 0
+    int r0;
+    outl(inl(0x70000084) | 0x200, 0x70000084);
+
+    outl(inl(0x7000002C) | 0x3000000, 0x7000002C);
+    outl(inl(0x6000600C) | 0x400000, 0x6000600C);
+
+    outl(inl(0x60006004) | 0x400000, 0x60006004);   /* reset usb start */
+    outl(inl(0x60006004) & ~0x400000, 0x60006004);  /* reset usb end */
+
+    outl(inl(0x70000020) | 0x80000000, 0x70000020);
+    while ((inl(0x70000028) & 0x80) == 0);
+
+    outl(inl(0xc5000184) | 0x100, 0xc5000184);
+    while ((inl(0xc5000184) & 0x100) != 0);
+
+    outl(inl(0xc50001A4) | 0x5F000000, 0xc50001A4);
+    if ((inl(0xc50001A4) & 0x100) == 0) {
+        outl(inl(0xc50001A8) & ~0x3, 0xc50001A8);
+        outl(inl(0xc50001A8) | 0x2, 0xc50001A8);
+        outl(inl(0x70000028) | 0x4000, 0x70000028);
+        outl(inl(0x70000028) | 0x2, 0x70000028);
+    } else {
+        outl(inl(0xc50001A8) | 0x3, 0xc50001A8);
+        outl(inl(0x70000028) &~0x4000, 0x70000028);
+        outl(inl(0x70000028) | 0x2, 0x70000028);
+    }
+    outl(inl(0xc5000140) | 0x2, 0xc5000140);
+    while((inl(0xc5000140) & 0x2) != 0);
+    r0 = inl(0xc5000184);
+
+    /* Note from IPL source (referring to next 5 lines of code: 
+       THIS NEEDS TO BE CHANGED ONCE THERE IS KERNEL USB */
+    outl(inl(0x70000020) | 0x80000000, 0x70000020);
+    outl(inl(0x6000600C) | 0x400000, 0x6000600C);
+    while ((inl(0x70000028) & 0x80) == 0);
+    outl(inl(0x70000028) | 0x2, 0x70000028);
+
+    udelay(0x186A0);
+#endif
+}
+
+bool usb_detect(void)
+{
+    return (GPIOA_INPUT_VAL & 0x04)?true:false;
+}
+
+void usb_enable(bool on)
+{
+        (void)on;
+#if 0
+        /* For the ipod, we can only do one thing with USB mode - reboot
+           into Apple's flash-based disk-mode.  This does not return. */
+    if (on)
+    {
+      /* The following code is copied from ipodlinux */
+        unsigned char* storage_ptr = (unsigned char *)0x40017F00;
+        memcpy(storage_ptr, "diskmode\0\0hotstuff\0\0\1", 21);
+        DEV_RS |= 4; /* Reboot */
+    }
+#endif
+}
diff --git a/firmware/target/arm/iriver/h10/usb-target.h b/firmware/target/arm/iriver/h10/usb-target.h
new file mode 100644
index 0000000000..7a17f7bacf
--- /dev/null
+++ b/firmware/target/arm/iriver/h10/usb-target.h
@@ -0,0 +1,27 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * 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