20 files changed, 1140 insertions, 8 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 0d7261632d..bbdd0bc5a2 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -118,7 +118,7 @@ drivers/ata_flash.c
 drivers/ata.c
 #endif /* HAVE_MMC */
 drivers/fat.c
-#ifdef HAVE_HOTSWAP
+#if defined(HAVE_HOTSWAP) || defined(HAVE_ATA_SD)
 hotswap.c
 #endif
 #endif /* SIMULATOR */
@@ -467,6 +467,20 @@ target/arm/sandisk/audio-c200_e200.c
 #endif /* SIMULATOR */
 #endif /* SANSA_C200 */
 
+#ifdef PHILIPS_SA9200
+#ifndef SIMULATOR
+target/arm/ata-sd-pp.c
+target/arm/philips/sa9200/lcd-sa9200.c
+target/arm/adc-as3514.c
+target/arm/philips/sa9200/backlight-sa9200.c
+target/arm/usb-fw-pp502x.c
+target/arm/philips/sa9200/button-sa9200.c
+target/arm/philips/sa9200/power-sa9200.c
+target/arm/philips/sa9200/powermgmt-sa9200.c
+target/arm/i2s-pp.c
+#endif /* SIMULATOR */
+#endif /* PHILIPS_SA9200 */
+
 #ifdef IAUDIO_X5
 #ifndef SIMULATOR
 target/coldfire/ata-as-coldfire.S
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c
index e1f325c3fe..b801375846 100644
--- a/firmware/drivers/audio/as3514.c
+++ b/firmware/drivers/audio/as3514.c
@@ -37,9 +37,11 @@ const struct sound_settings_info audiohw_settings[] = {
     [SOUND_BALANCE]       = {"%",    0,   1,-100, 100,   0},
     [SOUND_CHANNELS]      = {"",     0,   1,   0,   5,   0},
     [SOUND_STEREO_WIDTH]  = {"%",    0,   5,   0, 250, 100},
+#if defined(HAVE_RECORDING)
     [SOUND_MIC_GAIN]      = {"dB",   1,   1,   0,  39,  23},
     [SOUND_LEFT_GAIN]     = {"dB",   1,   1,   0,  31,  23},
     [SOUND_RIGHT_GAIN]    = {"dB",   1,   1,   0,  31,  23},
+#endif
 };
 
 /* Shadow registers */
@@ -112,11 +114,13 @@ int sound_val2phys(int setting, int value)
 
     switch(setting)
     {
+#if defined(HAVE_RECORDING)
     case SOUND_LEFT_GAIN:
     case SOUND_RIGHT_GAIN:
     case SOUND_MIC_GAIN:
         result = (value - 23) * 15;
         break;
+#endif
 
     default:
         result = value;
@@ -292,6 +296,7 @@ void audiohw_set_sample_rate(int sampling_control)
     (void)sampling_control;
 }
 
+#if defined(HAVE_RECORDING)
 void audiohw_enable_recording(bool source_mic)
 {
     if (source_mic) {
@@ -417,3 +422,4 @@ void audiohw_set_monitor(bool enable)
     /* Sync mixer volume */
     audiohw_set_master_vol(as3514.vol_l, as3514.vol_r);
 }
+#endif /* HAVE_RECORDING */
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h
index f6f759b75c..6edb5878f3 100644
--- a/firmware/export/as3514.h
+++ b/firmware/export/as3514.h
@@ -77,7 +77,7 @@ extern void audiohw_set_sample_rate(int sampling_control);
 #define VOLUME_MIN -735
 #define VOLUME_MAX   60
 
-#if defined(SANSA_E200) || defined(SANSA_C200)
+#if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200)
 #define AS3514_I2C_ADDR 0x46
 #endif
 
diff --git a/firmware/export/config-sa9200.h b/firmware/export/config-sa9200.h
new file mode 100755
index 0000000000..9cdfe6bba7
--- /dev/null
+++ b/firmware/export/config-sa9200.h
@@ -0,0 +1,167 @@
+/*
+ * This config file is for the Philips GoGear SA9200
+ */
+#define TARGET_TREE /* this target is using the target tree system */
+
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 26
+#define MODEL_NAME   "Philips GoGear SA200"
+
+#define HW_SAMPR_CAPS       (SAMPR_CAP_44)
+
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP
+
+/* define this if you have a colour LCD */
+#define HAVE_LCD_COLOR
+
+/* define this if you want album art for this target */
+#define HAVE_ALBUMART
+
+/* define this if you have a light associated with the buttons */
+#define HAVE_BUTTON_LIGHT
+
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
+
+/* define this if you would like tagcache to build on this target */
+#define HAVE_TAGCACHE
+
+/* LCD dimensions */
+#define LCD_WIDTH  128
+#define LCD_HEIGHT 160
+#define LCD_DEPTH  16   /* 65536 colours */
+#define LCD_PIXELFORMAT RGB565 /* rgb565 */
+
+/* define this if you have LCD enable function */
+/* #define HAVE_LCD_ENABLE */
+
+/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE
+   should be defined as well. */
+/* #define HAVE_LCD_SLEEP */
+
+/* define this if you can flip your LCD */
+/* #define HAVE_LCD_FLIP */
+
+/* define this if you can invert the colours on your LCD */
+/* #define HAVE_LCD_INVERT */
+
+/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */
+
+#define CONFIG_KEYPAD PHILIPS_SA9200_PAD
+
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+
+/* There is no hardware tone control */
+#define HAVE_SW_TONE_CONTROLS
+
+/* The PP5024 has a built-in AustriaMicrosystems AS3514 */
+#define HAVE_AS3514
+
+/* define this if you have a real-time clock */
+#ifndef BOOTLOADER
+#define CONFIG_RTC RTC_AS3514
+#endif
+
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+
+/* Some Sansa E200s seem to be FAT16 formatted */
+#define HAVE_FAT16SUPPORT
+
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x80000
+
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0x80000
+
+#define AB_REPEAT_ENABLE 1
+
+/* Define this for LCD backlight available */
+#define HAVE_BACKLIGHT
+#define HAVE_BACKLIGHT_BRIGHTNESS
+
+/* Main LCD backlight brightness range and defaults */
+#define MIN_BRIGHTNESS_SETTING      1
+#define MAX_BRIGHTNESS_SETTING     12
+#define DEFAULT_BRIGHTNESS_SETTING  6
+
+/* define this if you have a flash memory storage */
+#define HAVE_FLASH_STORAGE
+
+/* define this if the flash memory uses the SecureDigital Memory Card protocol */
+#define HAVE_ATA_SD
+
+#define BATTERY_CAPACITY_DEFAULT 750    /* default battery capacity */
+#define BATTERY_CAPACITY_MIN 750        /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 750        /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 0          /* capacity increment */
+#define BATTERY_TYPES_COUNT  1          /* only one type */
+
+/* Hardware controlled charging? FIXME */
+#define CONFIG_CHARGING CHARGING_SIMPLE
+
+/* define this if the unit can be powered or charged via USB */
+#define HAVE_USB_POWER
+
+/** Non-simulator section **/
+#ifndef SIMULATOR
+
+/* Define this if you have a PortalPlayer PP5024 */
+#define CONFIG_CPU PP5024
+
+/* Define this if you want to use the PP5024 i2c interface */
+#define CONFIG_I2C I2C_PP5024
+
+/* define this if the hardware can be powered off while charging */
+/* Sansa can't be powered off while charging */
+/* #define HAVE_POWEROFF_WHILE_CHARGING */
+
+/* The start address index for ROM builds */
+#define ROM_START 0x00000000
+
+/* Define this to the CPU frequency */
+#define CPU_FREQ 75000000
+
+/* Type of LCD TODO: hopefully the same as the x5 but check this*/
+#define CONFIG_LCD LCD_SA9200
+
+/* #define USB_IPODSTYLE */
+
+/* USB On-the-go */
+#define CONFIG_USBOTG USBOTG_ARC
+
+/* enable these for the experimental usb stack */
+#define HAVE_USBSTACK
+#define USB_VENDOR_ID 0x0471
+#define USB_PRODUCT_ID 0x014f
+
+/* WARNING! Enable Rockbox USB mass storage. */
+#ifndef BOOTLOADER
+#define USE_ROCKBOX_USB
+#endif
+
+/* Virtual LED (icon) */
+#define CONFIG_LED LED_VIRTUAL
+
+/* Define this if you have adjustable CPU frequency */
+#define HAVE_ADJUSTABLE_CPU_FREQ
+
+#define MI4_FORMAT
+#define BOOTFILE_EXT    "mi4"
+#define BOOTFILE        "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
+
+/* These values are unused, but need to be defined */
+#define FIRMWARE_OFFSET_FILE_CRC    0x0
+#define FIRMWARE_OFFSET_FILE_DATA   0x8
+
+#define ICODE_ATTR_TREMOR_NOT_MDCT
+
+#define INCLUDE_TIMEOUT_API
+
+#endif /* SIMULATOR */
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 51c79abccf..c200355872 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -82,6 +82,7 @@
 #define CREATIVEZVM_PAD    24
 #define SANSA_M200_PAD     25
 #define CREATIVEZV_PAD     26
+#define PHILIPS_SA9200_PAD 27
 
 /* CONFIG_REMOTE_KEYPAD */
 #define H100_REMOTE 1
@@ -120,6 +121,7 @@
 #define LCD_CREATIVEZVM 22 /* as used by Creative Zen Vision:M */
 #define LCD_TL0350A  23 /* as used by the iAudio M3 remote, treated as main LCD */
 #define LCD_COWOND2  24 /* as used by Cowon D2 - LTV250QV, TCC7801 driver */
+#define LCD_SA9200   25 /* as used by the Philips SA9200 */
 
 /* LCD_PIXELFORMAT */
 #define HORIZONTAL_PACKING 1
@@ -258,6 +260,8 @@
 #include "config-creativezvm60gb.h"
 #elif defined(CREATIVE_ZV)
 #include "config-creativezv.h"
+#elif defined(PHILIPS_SA9200)
+#include "config-sa9200.h"
 #else
 /* no known platform */
 #endif
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index ff1f55cd35..0590f702c5 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -60,7 +60,8 @@ enum {
 #define USBPOWER_BUTTON BUTTON_RIGHT
 #define USBPOWER_BTN_IGNORE BUTTON_POWER
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
-      (CONFIG_KEYPAD == SANSA_C200_PAD)
+      (CONFIG_KEYPAD == SANSA_C200_PAD) || \
+      (CONFIG_KEYPAD == PHILIPS_SA9200_PAD)
 #define USBPOWER_BUTTON BUTTON_SELECT
 #define USBPOWER_BTN_IGNORE BUTTON_POWER
 #endif
diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c
index e4ab922f24..797a9f8e36 100644
--- a/firmware/target/arm/ata-sd-pp.c
+++ b/firmware/target/arm/ata-sd-pp.c
@@ -526,7 +526,7 @@ static int sd_select_bank(unsigned char bank)
 static void sd_card_mux(int card_no)
 {
 /* Set the current card mux */
-#ifdef SANSA_E200
+#if defined(SANSA_E200) || defined(PHILIPS_SA9200)
     if (card_no == 0)
     {
         GPO32_VAL |= 0x4;
diff --git a/firmware/target/arm/i2c-pp.c b/firmware/target/arm/i2c-pp.c
index 5799d7c37f..7dbd223ddf 100644
--- a/firmware/target/arm/i2c-pp.c
+++ b/firmware/target/arm/i2c-pp.c
@@ -209,7 +209,7 @@ void i2c_init(void)
     outl(0x0, 0x600060a4);
     outl(0x80 | (0 << 8), 0x600060a4);
 #elif CONFIG_I2C == I2C_PP5024
-#ifdef SANSA_E200
+#if defined(SANSA_E200) || defined(PHILIPS_SA9200)
     /* Sansa OF sets this to 0x20 first, communicates with the AS3514
        then sets it to 0x23 - this still works fine though */
     outl(0x0, 0x600060a4);
diff --git a/firmware/target/arm/philips/app.lds b/firmware/target/arm/philips/app.lds
new file mode 100644
index 0000000000..d7159e8e1e
--- /dev/null
+++ b/firmware/target/arm/philips/app.lds
@@ -0,0 +1,198 @@
+#include "config.h"
+
+ENTRY(start)
+
+OUTPUT_FORMAT(elf32-littlearm)
+OUTPUT_ARCH(arm)
+STARTUP(target/arm/crt0-pp.o)
+
+#define PLUGINSIZE PLUGIN_BUFFER_SIZE
+#define CODECSIZE CODEC_SIZE
+
+#ifdef DEBUG
+#define STUBOFFSET 0x10000
+#else
+#define STUBOFFSET 0
+#endif
+
+#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE
+
+#define DRAMORIG 0x00000000 + STUBOFFSET
+#define IRAMORIG 0x40000000
+#define IRAMSIZE 0xc000
+
+#ifdef CPU_PP502x
+#define NOCACHE_BASE    0x10000000
+#else
+#define NOCACHE_BASE    0x28000000
+#endif
+
+#define CACHEALIGN_SIZE 16
+
+/* End of the audio buffer, where the codec buffer starts */
+#define ENDAUDIOADDR  (DRAMORIG + DRAMSIZE)
+
+/* Where the codec buffer ends, and the plugin buffer starts */
+#define ENDADDR (ENDAUDIOADDR + CODECSIZE)
+
+MEMORY
+{
+    DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
+    IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
+}
+
+SECTIONS
+{
+    .text :
+    {
+        loadaddress = .;
+        _loadaddress = .;
+        . = ALIGN(0x200);
+        *(.init.text)
+        *(.text*)
+        *(.glue_7)
+        *(.glue_7t)
+        . = ALIGN(0x4);
+    } > DRAM
+
+    .rodata :
+    {
+        *(.rodata)  /* problems without this, dunno why */
+        *(.rodata*)
+        *(.rodata.str1.1)
+        *(.rodata.str1.4)
+        . = ALIGN(0x4);
+
+        /* Pseudo-allocate the copies of the data sections */
+        _datacopy = .;
+    } > DRAM
+
+    /* TRICK ALERT! For RAM execution, we put the .data section at the
+       same load address as the copy. Thus, we don't waste extra RAM
+       when we don't actually need the copy.  */
+    .data : AT ( _datacopy )
+    {
+        _datastart = .;
+        *(.data*)
+        . = ALIGN(0x4);
+        _dataend  = .;
+    } > DRAM
+
+#if NOCACHE_BASE != 0
+    /* .ncdata section is placed at uncached physical alias address and is
+     * loaded at the proper cached virtual address - no copying is
+     * performed in the init code */
+    .ncdata . + NOCACHE_BASE :
+    {
+        . = ALIGN(CACHEALIGN_SIZE);
+        *(.ncdata*)
+        . = ALIGN(CACHEALIGN_SIZE);
+    } AT> DRAM
+#endif
+    
+    /DISCARD/ :
+    {
+        *(.eh_frame)
+    }
+
+    .vectors 0x0 :
+    {
+        _vectorsstart = .;
+        *(.vectors);
+        _vectorsend = .;
+    } AT> DRAM
+
+    _vectorscopy = LOADADDR(.vectors);
+
+    .ibss IRAMORIG (NOLOAD) :
+    {
+        _iedata = .;
+        *(.qharray)
+        *(.ibss)
+        . = ALIGN(0x4);
+        _iend = .;
+    } > IRAM
+
+    .iram _iend :
+    {
+        _iramstart = .;
+        *(.icode)
+        *(.irodata)
+        *(.idata)
+        . = ALIGN(0x4);
+        _iramend = .;
+    } > IRAM AT> DRAM
+
+    _iramcopy = LOADADDR(.iram);
+
+    .idle_stacks (NOLOAD) :
+    {
+       *(.idle_stacks)
+#if NUM_CORES > 1
+       cpu_idlestackbegin = .;
+       . += IDLE_STACK_SIZE;
+       cpu_idlestackend = .;
+#endif
+       cop_idlestackbegin = .;
+       . += IDLE_STACK_SIZE;
+       cop_idlestackend = .;
+    } > IRAM
+
+    .stack (NOLOAD) :
+    {
+       *(.stack)
+       stackbegin = .;
+       . += 0x2000;
+       stackend = .;
+    } > IRAM
+
+    /* .bss and .ncbss are treated as a single section to use one init loop to
+     * zero it - note "_edata" and "_end" */
+    .bss ADDR(.data) + SIZEOF(.data) + SIZEOF(.ncdata) +\
+         SIZEOF(.iram) + SIZEOF(.vectors) (NOLOAD) :
+    {
+       _edata = .;
+        *(.bss*)
+        *(COMMON)
+        . = ALIGN(0x4);
+    } > DRAM
+
+#if NOCACHE_BASE != 0
+    .ncbss . + NOCACHE_BASE (NOLOAD):
+    {
+        . = ALIGN(CACHEALIGN_SIZE);
+        *(.ncbss*)
+        . = ALIGN(CACHEALIGN_SIZE);
+    } AT> DRAM
+#endif
+
+    /* This will be aligned by preceding alignments */
+    .endaddr . - NOCACHE_BASE (NOLOAD) :
+    {
+        _end = .;
+    } > DRAM
+
+    .audiobuf (NOLOAD) :
+    {
+        _audiobuffer = .;
+        audiobuffer = .;
+    } > DRAM
+    
+    .audiobufend ENDAUDIOADDR (NOLOAD) :
+    {
+        audiobufend = .;
+        _audiobufend = .;
+    } > DRAM
+
+    .codec ENDAUDIOADDR (NOLOAD) :
+    {
+        codecbuf = .;
+        _codecbuf = .;
+    }
+
+    .plugin ENDADDR (NOLOAD) :
+    {
+        _pluginbuf = .;
+        pluginbuf = .;
+    }
+}
diff --git a/firmware/target/arm/philips/boot.lds b/firmware/target/arm/philips/boot.lds
new file mode 100644
index 0000000000..d115aa5949
--- /dev/null
+++ b/firmware/target/arm/philips/boot.lds
@@ -0,0 +1,65 @@
+#include "config.h"
+
+ENTRY(start)
+OUTPUT_FORMAT(elf32-littlearm)
+OUTPUT_ARCH(arm)
+STARTUP(target/arm/crt0-pp-bl.o)
+
+#define DRAMSIZE (MEMORYSIZE * 0x100000)
+
+#define DRAMORIG 0x10000000
+#ifndef IRAMORIG
+#define IRAMORIG 0x40000000
+#endif
+#define IRAMSIZE 0x20000
+#define FLASHORIG 0x001f0000
+#define FLASHSIZE 2M
+
+MEMORY
+{
+    DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE
+    IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
+}
+
+SECTIONS
+{
+  . = IRAMORIG;
+
+  .text : {
+    *(.init.text)
+    *(.text*)
+    *(.glue_7)
+    *(.glue_7t)
+  } > IRAM
+
+  .data : {
+    *(.icode)
+    *(.irodata)
+    *(.idata)
+    *(.data*)
+    *(.ncdata*)
+    *(.rodata*)
+    _dataend = . ;
+  } > IRAM
+
+  .stack : {
+     *(.stack)
+     _stackbegin = .;
+     stackbegin = .;
+     . += 0x2000;
+     _stackend = .;
+     stackend = .;
+  } > IRAM
+
+  /* The bss section is too large for IRAM - we just move it 16MB into the
+     DRAM */
+
+  . = DRAMORIG;
+  .bss  . + (16*1024*1024) : {
+     _edata = .;
+     *(.bss*);
+     *(.ibss);
+     *(.ncbss*);
+     _end = .;
+  } > DRAM
+}
diff --git a/firmware/target/arm/philips/sa9200/adc-target.h b/firmware/target/arm/philips/sa9200/adc-target.h
new file mode 100644
index 0000000000..56efdf7574
--- /dev/null
+++ b/firmware/target/arm/philips/sa9200/adc-target.h
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   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.
+ *
+ ****************************************************************************/
+#ifndef _ADC_TARGET_H_
+#define _ADC_TARGET_H_
+
+/* ADC channels */
+#define NUM_ADC_CHANNELS 13
+
+#define ADC_BVDD         0  /* Battery voltage of 4V LiIo accumulator */
+#define ADC_RTCSUP       1  /* RTC backup battery voltage */
+#define ADC_UVDD         2  /* USB host voltage */
+#define ADC_CHG_IN       3  /* Charger input voltage */
+#define ADC_CVDD         4  /* Charger pump output voltage */
+#define ADC_BATTEMP      5  /* Battery charging temperature */
+#define ADC_MICSUP1      6  /* Voltage on MicSup1 for remote control
+                                or external voltage measurement */
+#define ADC_MICSUP2      7  /* Voltage on MicSup1 for remote control
+                                or external voltage measurement */
+#define ADC_VBE1         8  /* Measuring junction temperature @ 2uA */
+#define ADC_VBE2         9  /* Measuring junction temperature @ 1uA */
+#define ADC_I_MICSUP1    10 /* Current of MicSup1 for remote control detection */
+#define ADC_I_MICSUP2    11 /* Current of MicSup2 for remote control detection */
+#define ADC_VBAT         12 /* Single cell battery voltage */
+
+#define ADC_UNREG_POWER  ADC_BVDD   /* For compatibility */
+
+#endif
diff --git a/firmware/target/arm/philips/sa9200/backlight-sa9200.c b/firmware/target/arm/philips/sa9200/backlight-sa9200.c
new file mode 100644
index 0000000000..aaec8cf007
--- /dev/null
+++ b/firmware/target/arm/philips/sa9200/backlight-sa9200.c
@@ -0,0 +1,75 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   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.
+ *
+ ****************************************************************************/
+#include "config.h"
+#include "backlight-target.h"
+#include "system.h"
+#include "lcd.h"
+#include "backlight.h"
+#include "i2c-pp.h"
+#include "as3514.h"
+
+static unsigned short backlight_brightness = DEFAULT_BRIGHTNESS_SETTING;
+
+void _backlight_set_brightness(int brightness)
+{
+    backlight_brightness = brightness;
+
+    if (brightness > 0)
+        _backlight_on();
+    else
+        _backlight_off();
+}
+
+void _backlight_on(void)
+{
+#ifdef HAVE_LCD_SLEEP
+    backlight_lcd_sleep_countdown(false); /* stop counter */
+#endif
+#ifdef HAVE_LCD_ENABLE
+    lcd_enable(true); /* power on lcd + visible display */
+#endif
+    pp_i2c_send(AS3514_I2C_ADDR, AS3514_DCDC15, backlight_brightness);
+}
+
+void _backlight_off(void)
+{
+    pp_i2c_send(AS3514_I2C_ADDR, AS3514_DCDC15, 0x0);
+#ifdef HAVE_LCD_ENABLE
+    lcd_enable(false); /* power off visible display */
+#endif
+#ifdef HAVE_LCD_SLEEP
+    backlight_lcd_sleep_countdown(true); /* start countdown */
+#endif
+}
+
+void _buttonlight_on(void)
+{
+    GPIO_SET_BITWISE(GPIOG_OUTPUT_VAL, 0x80);
+#ifdef SANSA_C200
+    GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x10); /* The "menu" backlight */
+#endif
+}
+
+void _buttonlight_off(void)
+{
+    GPIO_CLEAR_BITWISE(GPIOG_OUTPUT_VAL, 0x80);
+#ifdef SANSA_C200
+    GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x10); /* The "menu" backlight */
+#endif
+}
diff --git a/firmware/target/arm/philips/sa9200/backlight-target.h b/firmware/target/arm/philips/sa9200/backlight-target.h
new file mode 100644
index 0000000000..01573b8403
--- /dev/null
+++ b/firmware/target/arm/philips/sa9200/backlight-target.h
@@ -0,0 +1,30 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   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.
+ *
+ ****************************************************************************/
+#ifndef BACKLIGHT_TARGET_H
+#define BACKLIGHT_TARGET_H
+
+#define _backlight_init() true
+void _backlight_on(void);
+void _backlight_off(void);
+void _backlight_set_brightness(int brightness);
+int  __backlight_is_on(void);
+
+void _buttonlight_on(void);
+void _buttonlight_off(void);
+#endif
diff --git a/firmware/target/arm/philips/sa9200/button-sa9200.c b/firmware/target/arm/philips/sa9200/button-sa9200.c
new file mode 100755
index 0000000000..dc9f3466c2
--- /dev/null
+++ b/firmware/target/arm/philips/sa9200/button-sa9200.c
@@ -0,0 +1,72 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 by Mark Arigo
+ *
+ * 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 "system.h"
+#include "button.h"
+#include "backlight.h"
+
+void button_init_device(void)
+{
+    /* TODO...for now, hardware initialisation is done by the c200 bootloader */
+}
+
+bool button_hold(void)
+{
+    return !(GPIOL_INPUT_VAL & 0x40);
+}
+
+/*
+ * Get button pressed from hardware
+ */
+int button_read_device(void)
+{
+    int btn = BUTTON_NONE;
+    static bool hold_button = false;
+    bool hold_button_old;
+
+    /* Hold */
+    hold_button_old = hold_button;
+    hold_button = button_hold();
+
+#ifndef BOOTLOADER
+    if (hold_button != hold_button_old)
+        backlight_hold_changed(hold_button);
+#endif
+
+    /* device buttons */
+    if (!hold_button)
+    {
+#if 0
+        if (!(GPIOB_INPUT_VAL & 0x20)) btn |= BUTTON_POWER;
+        if (!(GPIOF_INPUT_VAL & 0x10)) btn |= BUTTON_VOL_UP;
+        if (!(GPIOF_INPUT_VAL & 0x04)) btn |= BUTTON_VOL_DOWN;
+#endif
+        /* A hack until the touchpad works */
+        if (!(GPIOB_INPUT_VAL & 0x20)) btn |= BUTTON_SELECT;
+        if (!(GPIOF_INPUT_VAL & 0x10)) btn |= BUTTON_UP;
+        if (!(GPIOF_INPUT_VAL & 0x04)) btn |= BUTTON_DOWN;
+    }
+
+    return btn;
+}
+
+bool headphones_inserted(void)
+{
+    return (GPIOB_INPUT_VAL & 0x10) ? false : true;
+}
diff --git a/firmware/target/arm/philips/sa9200/button-target.h b/firmware/target/arm/philips/sa9200/button-target.h
new file mode 100755
index 0000000000..1cd6e52097
--- /dev/null
+++ b/firmware/target/arm/philips/sa9200/button-target.h
@@ -0,0 +1,53 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id:$
+ *
+ * Copyright (C) 2007 by Mark Arigo
+ *
+ * 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 _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);
+
+/* Main unit's buttons */
+#define BUTTON_POWER        0x00000001
+#define BUTTON_SELECT       0x00000002
+#define BUTTON_MENU         0x00000004
+#define BUTTON_LEFT         0x00000008
+#define BUTTON_RIGHT        0x00000010
+#define BUTTON_REW          0x00000020
+#define BUTTON_FFWD         0x00000040
+#define BUTTON_UP           0x00000080
+#define BUTTON_DOWN         0x00000100
+#define BUTTON_VOL_UP       0x00000200
+#define BUTTON_VOL_DOWN     0x00000400
+
+#define BUTTON_MAIN         0x00000fff
+
+/* 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/philips/sa9200/lcd-sa9200.c b/firmware/target/arm/philips/sa9200/lcd-sa9200.c
new file mode 100755
index 0000000000..b06dcd952b
--- /dev/null
+++ b/firmware/target/arm/philips/sa9200/lcd-sa9200.c
@@ -0,0 +1,205 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 by Mark Arigo
+ *
+ * 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 "cpu.h"
+#include "lcd.h"
+#include "kernel.h"
+#include "system.h"
+
+/* Display status */
+static unsigned lcd_yuv_options SHAREDBSS_ATTR = 0;
+
+/* wait for LCD */
+static inline void lcd_wait_write(void)
+{
+    while (LCD1_CONTROL & LCD1_BUSY_MASK);
+}
+
+/* send LCD data */
+static void lcd_send_data(unsigned data)
+{
+    lcd_wait_write();
+    LCD1_DATA = data >> 8;
+    lcd_wait_write();
+    LCD1_DATA = data & 0xff;
+}
+
+/* send LCD command */
+static void lcd_send_command(unsigned cmd)
+{
+    lcd_wait_write();
+    LCD1_CMD = cmd >> 8;
+    lcd_wait_write();
+    LCD1_CMD = cmd & 0xff;
+}
+
+static void lcd_write_reg(unsigned reg, unsigned data)
+{
+    lcd_send_command(reg);
+    lcd_send_data(data);
+}
+
+void lcd_init_device(void)
+{
+#if 0
+    /* This is the init done by the OF bootloader.
+       Re-initializing the lcd causes it to flash
+       a white screen, so for now disable this. */
+    DEV_INIT1 &= ~0x3000;
+    DEV_INIT1 = DEV_INIT1;
+    DEV_INIT2 &= ~0x400;
+
+    LCD1_CONTROL = 0x4680;
+    udelay(1500);
+    LCD1_CONTROL = 0x4684;
+
+    outl(1, 0x70003018);
+
+    LCD1_CONTROL &= ~0x200;
+    LCD1_CONTROL &= ~0x800;
+    LCD1_CONTROL &= ~0x400;
+    udelay(30000);
+
+    LCD1_CONTROL |= 0x1;
+
+    lcd_write_reg(0x0000, 0x0001);
+    udelay(50000);
+
+    lcd_write_reg(0x0011, 0x171f);
+    lcd_write_reg(0x0012, 0x0001);
+    lcd_write_reg(0x0013, 0x08cd);
+    lcd_write_reg(0x0014, 0x0416);
+    lcd_write_reg(0x0010, 0x1208);
+    udelay(50000);
+
+    lcd_write_reg(0x0013, 0x081C);
+    udelay(200000);
+
+    lcd_write_reg(0x0001, 0x0a0c);
+    lcd_write_reg(0x0002, 0x0200);
+    lcd_write_reg(0x0003, 0x1030);
+    lcd_write_reg(0x0007, 0x0005);
+    lcd_write_reg(0x0008, 0x030a);
+    lcd_write_reg(0x000b, 0x0000);
+    lcd_write_reg(0x000c, 0x0000);
+    lcd_write_reg(0x0030, 0x0000);
+    lcd_write_reg(0x0031, 0x0204);
+    lcd_write_reg(0x0032, 0x0001);
+    lcd_write_reg(0x0033, 0x0600);
+    lcd_write_reg(0x0034, 0x0607);
+    lcd_write_reg(0x0035, 0x0305);
+    lcd_write_reg(0x0036, 0x0707);
+    lcd_write_reg(0x0037, 0x0006);
+    lcd_write_reg(0x0038, 0x0400);
+    lcd_write_reg(0x0040, 0x0000);
+    lcd_write_reg(0x0042, 0x9f00);
+    lcd_write_reg(0x0043, 0x0000);
+    lcd_write_reg(0x0044, 0x7f00);
+    lcd_write_reg(0x0045, 0x9f00);
+    lcd_write_reg(0x00a8, 0x0125);
+    lcd_write_reg(0x00a9, 0x0014);
+    lcd_write_reg(0x00a7, 0x0022);
+
+    lcd_write_reg(0x0007, 0x0021);
+    udelay(40000);
+    lcd_write_reg(0x0007, 0x0023);
+    udelay(40000);
+    lcd_write_reg(0x0007, 0x1037);
+
+    lcd_write_reg(0x0021, 0x0000);
+#endif
+}
+
+/*** hardware configuration ***/
+#if 0
+int lcd_default_contrast(void)
+{
+    return DEFAULT_CONTRAST_SETTING;
+}
+#endif
+
+void lcd_set_contrast(int val)
+{
+    (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;
+}
+
+void lcd_yuv_set_options(unsigned options)
+{
+    lcd_yuv_options = options;
+}
+
+/* Performance function to blit a YUV bitmap directly to the LCD */
+void lcd_blit_yuv(unsigned char * const src[3],
+                  int src_x, int src_y, int stride,
+                  int x, int y, int width, int height)
+{
+    (void)src;
+    (void)src_x;
+    (void)src_y;
+    (void)stride;
+    (void)x;
+    (void)y;
+    (void)width;
+    (void)height;
+}
+ 
+/* Update the display.
+   This must be called after all other LCD functions that change the display. */
+void lcd_update(void)
+{
+    lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);
+}
+
+/* Update a fraction of the display. */
+void lcd_update_rect(int x, int y, int width, int height)
+{
+    const fb_data *addr;
+    
+    if (x + width >= LCD_WIDTH)
+        width = LCD_WIDTH - x;
+    if (y + height >= LCD_HEIGHT)
+        height = LCD_HEIGHT - y;
+        
+    if ((width <= 0) || (height <= 0))
+        return; /* Nothing left to do. */
+
+    addr = &lcd_framebuffer[y][x];
+
+    do {
+        lcd_write_reg(0x0021, ((y++ & 0xff) << 8) | (x & 0xff));
+        lcd_send_command(0x0022);
+
+        int w = width;
+        do {
+            lcd_send_data(*addr++);
+        } while (--w > 0);
+        addr += LCD_WIDTH - width;
+    } while (--height > 0);
+}
diff --git a/firmware/target/arm/philips/sa9200/power-sa9200.c b/firmware/target/arm/philips/sa9200/power-sa9200.c
new file mode 100644
index 0000000000..8c8214a7ce
--- /dev/null
+++ b/firmware/target/arm/philips/sa9200/power-sa9200.c
@@ -0,0 +1,136 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Daniel Ankers
+ *
+ * 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 <stdbool.h>
+#include "system.h"
+#include "cpu.h"
+#include "i2c-pp.h"
+#include "tuner.h"
+#include "as3514.h"
+#include "power.h"
+
+void power_init(void)
+{
+}
+
+void power_off(void)
+{
+    char byte;
+
+    /* Send shutdown command to PMU */
+    byte = i2c_readbyte(AS3514_I2C_ADDR, AS3514_SYSTEM);
+    byte &= ~0x1;   
+    pp_i2c_send(AS3514_I2C_ADDR, AS3514_SYSTEM, byte);
+
+    /* Stop interrupts on both cores */
+    disable_interrupt(IRQ_FIQ_STATUS);
+    COP_INT_CLR = -1;
+    CPU_INT_CLR = -1;
+
+    /* Halt everything and wait for device to power off */
+    while (1)
+    {
+        COP_CTL = 0x40000000;
+        CPU_CTL = 0x40000000;
+    }
+}
+
+bool charger_inserted(void)
+{
+#ifdef SANSA_E200
+    if(GPIOB_INPUT_VAL & 0x10)
+#else /* SANSA_C200 */
+    if(GPIOH_INPUT_VAL & 0x2)
+#endif
+        return true;
+    return false;
+}
+
+void ide_power_enable(bool on)
+{
+    (void)on;
+}
+
+#if CONFIG_TUNER
+
+/** Tuner **/
+static bool powered = false;
+
+bool tuner_power(bool status)
+{
+    bool old_status;
+    lv24020lp_lock();
+
+    old_status = powered;
+
+    if (status != old_status)
+    {
+        if (status)
+        {
+            /* init mystery amplification device */
+#if defined(SANSA_E200)
+            GPO32_ENABLE |= 0x1;
+#else /* SANSA_C200 */
+            DEV_INIT2 &= ~0x800;
+#endif
+            udelay(5);
+
+            /* When power up, host should initialize the 3-wire bus
+               in host read mode: */
+
+            /* 1. Set direction of the DATA-line to input-mode. */
+            GPIOH_OUTPUT_EN &= ~(1 << 5); 
+            GPIOH_ENABLE |= (1 << 5); 
+
+            /* 2. Drive NR_W low */
+            GPIOH_OUTPUT_VAL &= ~(1 << 3); 
+            GPIOH_OUTPUT_EN |= (1 << 3); 
+            GPIOH_ENABLE |= (1 << 3); 
+
+            /* 3. Drive CLOCK high */
+            GPIOH_OUTPUT_VAL |= (1 << 4); 
+            GPIOH_OUTPUT_EN |= (1 << 4); 
+            GPIOH_ENABLE |= (1 << 4);
+
+            lv24020lp_power(true);
+        }
+        else
+        {
+            lv24020lp_power(false);
+
+            /* set all as inputs */
+            GPIOH_OUTPUT_EN &= ~((1 << 5) | (1 << 3) | (1 << 4));
+            GPIOH_ENABLE &= ~((1 << 3) | (1 << 4)); 
+
+            /* turn off mystery amplification device */
+#if defined (SANSA_E200)
+            GPO32_ENABLE &= ~0x1;
+#else
+            DEV_INIT2 |= 0x800;
+#endif
+        }
+
+        powered = status;
+    }
+
+    lv24020lp_unlock();
+    return old_status;
+}
+
+#endif /* CONFIG_TUNER */
diff --git a/firmware/target/arm/philips/sa9200/powermgmt-sa9200.c b/firmware/target/arm/philips/sa9200/powermgmt-sa9200.c
new file mode 100644
index 0000000000..9bb70263be
--- /dev/null
+++ b/firmware/target/arm/philips/sa9200/powermgmt-sa9200.c
@@ -0,0 +1,58 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese
+ * Revisions copyright (C) 2005 by Gerald Van Baren
+ *
+ * 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 "adc.h"
+#include "powermgmt.h"
+
+const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
+{
+    3400
+};
+
+const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
+{
+    3300
+};
+
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
+const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
+{
+    /* Sansa Li Ion 750mAH, took from battery benchs */
+    { 3300, 3680, 3740, 3760, 3780, 3810, 3870, 3930, 3970, 4070, 4160 },
+};
+
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
+const unsigned short percent_to_volt_charge[11] =
+{
+    /* Sansa Li Ion 750mAH FIXME */
+    3300, 3680, 3740, 3760, 3780, 3810, 3870, 3930, 3970, 4070, 4160
+};
+
+/* ADC should read 0x3ff=5.12V */
+#define BATTERY_SCALE_FACTOR 5125       
+/* full-scale ADC readout (2^10) in millivolt */
+
+/* Returns battery voltage from ADC [millivolts] */
+unsigned int battery_adc_voltage(void)
+{
+    return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10;
+}
+
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c
index 4e3f2c0cf0..f74b0484ab 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -374,7 +374,7 @@ void system_init(void)
         /* to be done */
 #endif
 
-#if !defined(SANSA_E200) && !defined(SANSA_C200)
+#if !defined(SANSA_E200) && !defined(SANSA_C200) && !defined(PHILIPS_SA9200)
         /* Remap the flash ROM on CPU, keep hidden from COP:
          * 0x00000000-0x3fffffff = 0x20000000-0x23ffffff */
         MMAP1_LOGICAL  = 0x20003c00;
@@ -405,7 +405,7 @@ void system_init(void)
         GPIOK_INT_EN        = 0;
         GPIOL_INT_EN        = 0;
 
-#if defined(SANSA_E200) || defined(SANSA_C200)
+#if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200)
         /* outl(0x00000000, 0x6000b000); */
         outl(inl(0x6000a000) | 0x80000000, 0x6000a000); /* Init DMA controller? */
 #endif 
@@ -433,7 +433,7 @@ void system_init(void)
 void system_reboot(void)
 {
     /* Reboot */
-#if defined(SANSA_E200) || defined(SANSA_C200)
+#if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200)
     CACHE_CTL &= ~CACHE_CTL_VECT_REMAP;
 
     /* Magic used by the c200 OF: 0x23066000
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c
index 18ef3d234e..eae78886f4 100644
--- a/firmware/target/arm/usb-fw-pp502x.c
+++ b/firmware/target/arm/usb-fw-pp502x.c
@@ -121,6 +121,11 @@ static bool usb_pin_detect(void)
     /* GPIO L bit 2 is usb detect */
     if (GPIOL_INPUT_VAL & 0x4)
         retval = true;
+
+#elif defined(PHILIPS_SA9200)
+    /* GPIO F bit 7 is usb detect */
+    if (!(GPIOF_INPUT_VAL & 0x80))
+        retval = true;
 #endif
 
     return retval;