12 files changed, 486 insertions, 6 deletions

diff --git a/firmware/target/arm/crt0-pp.S b/firmware/target/arm/crt0-pp.S
index 85dd7f8b24..c1ced11cec 100644
--- a/firmware/target/arm/crt0-pp.S
+++ b/firmware/target/arm/crt0-pp.S
@@ -60,7 +60,7 @@ start:
 .space 60*4 /* (more than enough) space for exception vectors and mi4 magic */
 
 pad_skip:
-#ifdef SANSA_E200
+#if defined(SANSA_E200) || defined(SANSA_C200)
     /* On the Sansa, copying the vectors fails if the cache is initialised */
     ldr    r1, =CACHE_CTRL
     mov    r2, #0x0
diff --git a/firmware/target/arm/i2c-pp.c b/firmware/target/arm/i2c-pp.c
index 07fa822ab3..1cc25a1a10 100644
--- a/firmware/target/arm/i2c-pp.c
+++ b/firmware/target/arm/i2c-pp.c
@@ -198,10 +198,27 @@ void i2c_init(void)
     outl(0x0, 0x600060a4);
     outl(0x80 | (0 << 8), 0x600060a4);
 #elif CONFIG_I2C == I2C_PP5024
+#ifdef SANSA_E200
     /* Sansa OF sets this to 0x20 first, communicates with the AS3514
        then sets it to 0x23 - this still works fine though */
     outl(0x0, 0x600060a4);
     outl(0x23, 0x600060a4);
+#elif defined(SANSA_C200)
+    /* This is the init sequence from the Sansa c200 bootloader.
+       I'm not sure what's really necessary. */
+    pp_i2c_wait_not_busy();
+
+    outl(0, 0x600060a4);
+    outl(0x64, 0x600060a4);
+
+    outl(0x55, 0x7000c02c);
+    outl(0x54, 0x7000c030);
+
+    outl(0, 0x600060a4);
+    outl(0x1e, 0x600060a4);
+
+    pp_i2c_send(0x46, 0x24, 5);
+#endif
 #endif
 
     spinlock_init(&i2c_mutex);
diff --git a/firmware/target/arm/i2s-pp.c b/firmware/target/arm/i2s-pp.c
index b9e32b8789..fc01e38e91 100644
--- a/firmware/target/arm/i2s-pp.c
+++ b/firmware/target/arm/i2s-pp.c
@@ -142,7 +142,7 @@ void i2s_reset(void)
     IISFIFO_CFG |= 0x1100;
 }
 
-#ifdef SANSA_E200
+#if defined(SANSA_E200) || defined(SANSA_C200)
 void i2s_scale_attn_level(long frequency)
 {
     unsigned int iisfifo_cfg = IISFIFO_CFG & ~0xff;
diff --git a/firmware/target/arm/sandisk/ata-c200_e200.c b/firmware/target/arm/sandisk/ata-c200_e200.c
index a61e2ab610..addc490417 100644
--- a/firmware/target/arm/sandisk/ata-c200_e200.c
+++ b/firmware/target/arm/sandisk/ata-c200_e200.c
@@ -519,6 +519,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 (card_no == 0)
     {
         outl(inl(0x70000080) | 0x4, 0x70000080);
@@ -543,6 +544,32 @@ static void sd_card_mux(int card_no)
 
         outl(inl(0x70000014) & ~(0x3ffff), 0x70000014);
     }
+#else /* SANSA_C200 */
+    if (card_no == 0)
+    {
+        outl(inl(0x70000080) | 0x4, 0x70000080);
+
+        GPIOD_ENABLE     &= ~0x1f;
+        GPIOD_OUTPUT_EN  &= ~0x1f;
+        GPIOA_ENABLE     |=  0x7a;
+        GPIOA_OUTPUT_VAL |=  0x7a;
+        GPIOA_OUTPUT_EN  |=  0x7a;
+
+        outl(inl(0x70000014) & ~(0x3ffff), 0x70000014);
+    }
+    else
+    {
+        outl(inl(0x70000080) & ~0x4, 0x70000080);
+
+        GPIOA_ENABLE     &= ~0x7a;
+        GPIOA_OUTPUT_EN  &= ~0x7a;
+        GPIOD_ENABLE     |=  0x1f;
+        GPIOD_OUTPUT_VAL |=  0x1f;
+        GPIOD_OUTPUT_EN  |=  0x1f;
+
+        outl((inl(0x70000014) & ~(0x3ffff)) | 0x255aa, 0x70000014);
+    }
+#endif
 }
 
 static void sd_init_device(int card_no)
diff --git a/firmware/target/arm/sandisk/backlight-c200_e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c
index 29c6ab4b45..411c19f7ad 100644
--- a/firmware/target/arm/sandisk/backlight-c200_e200.c
+++ b/firmware/target/arm/sandisk/backlight-c200_e200.c
@@ -36,17 +36,21 @@ void __backlight_set_brightness(int brightness)
 
 void __backlight_on(void)
 {
+#ifdef HAVE_LCD_ENABLE
     lcd_enable(true); /* power on lcd */
+#endif
     pp_i2c_send( 0x46, 0x23, backlight_brightness);
 }
 
 void __backlight_off(void)
 {
     pp_i2c_send( 0x46, 0x23, 0x0);
+#ifdef HAVE_LCD_ENABLE
     lcd_enable(false); /* power off lcd */
+#endif
 }
 
-
+#ifdef HAVE_BUTTON_LIGHT
 void __button_backlight_on(void)
 {
     GPIOG_OUTPUT_VAL |=0x80;
@@ -56,3 +60,4 @@ void __button_backlight_off(void)
 {
     GPIOG_OUTPUT_VAL &=~ 0x80;
 }
+#endif
diff --git a/firmware/target/arm/sandisk/backlight-target.h b/firmware/target/arm/sandisk/backlight-target.h
index ac256036b9..1b1a6ad4e1 100644
--- a/firmware/target/arm/sandisk/backlight-target.h
+++ b/firmware/target/arm/sandisk/backlight-target.h
@@ -25,6 +25,8 @@ void __backlight_off(void);
 void __backlight_set_brightness(int brightness);
 int  __backlight_is_on(void);
 
+#ifdef HAVE_BUTTON_LIGHT
 void __button_backlight_on(void);
 void __button_backlight_off(void);
 #endif
+#endif
diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
index b9a77cb9e0..cb85b117c4 100644
--- a/firmware/target/arm/sandisk/power-c200_e200.c
+++ b/firmware/target/arm/sandisk/power-c200_e200.c
@@ -53,7 +53,11 @@ void power_off(void)
 
 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;
 }
@@ -63,6 +67,7 @@ void ide_power_enable(bool on)
     (void)on;
 }
 
+#if CONFIG_TUNER
 /** Tuner **/
 static bool powered = false;
 
@@ -125,3 +130,5 @@ bool tuner_power(bool status)
     lv24020lp_unlock();
     return old_status;
 }
+
+#endif
diff --git a/firmware/target/arm/sandisk/sansa-c200/button-c200.c b/firmware/target/arm/sandisk/sansa-c200/button-c200.c
new file mode 100644
index 0000000000..eedd937699
--- /dev/null
+++ b/firmware/target/arm/sandisk/sansa-c200/button-c200.c
@@ -0,0 +1,62 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   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.
+ *
+ ****************************************************************************/
+
+#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 !(GPIOI_INPUT_VAL & 0x80);
+}
+
+/*
+ * 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();
+
+    /* device buttons */
+    if (!hold_button)
+    {
+        if ( (GPIOB_INPUT_VAL & 0x20)) btn |= BUTTON_POWER;
+        if (!(GPIOG_INPUT_VAL & 0x10)) btn |= BUTTON_UP;
+        if (!(GPIOH_INPUT_VAL & 0x01)) btn |= BUTTON_DOWN;
+        if (!(GPIOI_INPUT_VAL & 0x04)) btn |= BUTTON_LEFT;
+        if (!(GPIOG_INPUT_VAL & 0x02)) btn |= BUTTON_RIGHT;
+        if (!(GPIOL_INPUT_VAL & 0x04)) btn |= BUTTON_SELECT;
+        if (!(GPIOG_INPUT_VAL & 0x01)) btn |= BUTTON_REC;
+        if (!(GPIOL_INPUT_VAL & 0x10)) btn |= BUTTON_VOL_UP;
+        if (!(GPIOL_INPUT_VAL & 0x20)) btn |= BUTTON_VOL_DOWN;
+    }
+
+    return btn;
+}
diff --git a/firmware/target/arm/sandisk/sansa-c200/button-target.h b/firmware/target/arm/sandisk/sansa-c200/button-target.h
new file mode 100644
index 0000000000..6f42822f7f
--- /dev/null
+++ b/firmware/target/arm/sandisk/sansa-c200/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);
+
+/* Sandisk Sansa c200 button codes */
+
+/* Main unit's buttons */
+#define BUTTON_REC          0x00000001
+#define BUTTON_DOWN         0x00000002
+#define BUTTON_RIGHT        0x00000004
+#define BUTTON_LEFT         0x00000008
+#define BUTTON_SELECT       0x00000010
+#define BUTTON_UP           0x00000020
+#define BUTTON_POWER        0x00000040
+#define BUTTON_VOL_UP       0x00000080
+#define BUTTON_VOL_DOWN     0x00000100
+
+#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/sandisk/sansa-c200/lcd-c200.c b/firmware/target/arm/sandisk/sansa-c200/lcd-c200.c
new file mode 100644
index 0000000000..6626ea4e6d
--- /dev/null
+++ b/firmware/target/arm/sandisk/sansa-c200/lcd-c200.c
@@ -0,0 +1,249 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   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.
+ *
+ ****************************************************************************/
+#include "config.h"
+#include "cpu.h"
+#include "lcd.h"
+#include "kernel.h"
+#include "system.h"
+
+#define LCD_BASE  (*(volatile unsigned long *)(0x70003000))
+#define LCD_CMD   (*(volatile unsigned long *)(0x70003008))
+#define LCD_DATA  (*(volatile unsigned long *)(0x70003010))
+
+#define LCD_BUSY  0x8000
+
+/* check if number of useconds has past */
+static inline bool timer_check(int clock_start, int usecs)
+{
+    return ((int)(USEC_TIMER - clock_start)) >= usecs;
+}
+
+/* wait for LCD with timeout */
+static inline void lcd_wait_write(void)
+{
+    int start = USEC_TIMER;
+
+    do {
+        if ((LCD_BASE & LCD_BUSY) == 0)
+            break;
+    } while (timer_check(start, 1000) == 0);
+}
+
+/* send LCD data */
+static void lcd_send_data(unsigned data)
+{
+    lcd_wait_write();
+    LCD_DATA = (data >> 8) & 0xff;
+
+    lcd_wait_write();
+    LCD_DATA = data & 0xff;
+}
+
+/* send LCD command */
+static void lcd_send_command(unsigned cmd)
+{
+    lcd_wait_write();
+    LCD_CMD = cmd;
+}
+
+/* LCD init */
+void lcd_init_device(void)
+{
+    /* This is from the c200 of bootloader beginning at offset 0xbbf4 */
+    outl(inl(0x70000010) & ~0xfc000000, 0x70000010);
+    outl(inl(0x70000010), 0x70000010);
+
+    DEV_INIT &= ~0x400;
+    udelay(10000);
+    
+    LCD_BASE &= ~0x4;
+    udelay(15);
+
+    LCD_BASE |= 0x4;
+    udelay(10);
+
+    LCD_BASE = 0x4687;
+    udelay(10000);
+
+    lcd_send_command(0x2c);
+    udelay(20000);
+
+    lcd_send_command(0x02);
+    lcd_send_command(0x01);
+    udelay(20000);
+
+    lcd_send_command(0x26);
+    lcd_send_command(0x01);
+    udelay(20000);
+
+    lcd_send_command(0x26);
+    lcd_send_command(0x09);
+    udelay(20000);
+
+    lcd_send_command(0x26);
+    lcd_send_command(0x0b);
+    udelay(20000);
+
+    lcd_send_command(0x26);
+    lcd_send_command(0x0f);
+    udelay(20000);
+
+    lcd_send_command(0x10);
+    lcd_send_command(0x07);
+
+    lcd_send_command(0x20);
+    lcd_send_command(0x03);
+
+    lcd_send_command(0x24);
+    lcd_send_command(0x03);
+
+    lcd_send_command(0x28);
+    lcd_send_command(0x01);
+
+    lcd_send_command(0x2a);
+    lcd_send_command(0x55);
+
+    lcd_send_command(0x30);
+    lcd_send_command(0x10);
+
+    lcd_send_command(0x32);
+    lcd_send_command(0x0e);
+
+    lcd_send_command(0x34);
+    lcd_send_command(0x0d);
+
+    lcd_send_command(0x36);
+    lcd_send_command(0);
+
+    lcd_send_command(0x40);
+    lcd_send_command(0x82);
+
+    lcd_send_command(0x43);                  /* vertical dimensions */
+    lcd_send_command(0x1a);                  /* y1 + 0x1a */
+    lcd_send_command(LCD_HEIGHT - 1 + 0x1a); /* y2 + 0x1a */
+
+    lcd_send_command(0x42);                  /* horizontal dimensions */
+    lcd_send_command(0);                     /* x1 */
+    lcd_send_command(LCD_WIDTH - 1);         /* x2 */
+    udelay(100000);
+
+    lcd_send_command(0x51);
+}
+
+/*** hardware configuration ***/
+int lcd_default_contrast(void)
+{
+    return DEFAULT_CONTRAST_SETTING;
+}
+
+void lcd_set_contrast(int val)
+{
+  /* TODO: Implement lcd_set_contrast() */
+  (void)val;
+}
+
+void lcd_set_invert_display(bool yesno)
+{
+  /* TODO: Implement lcd_set_invert_display() */
+  (void)yesno;
+}
+
+/* turn the display upside down (call lcd_update() afterwards) */
+void lcd_set_flip(bool yesno)
+{
+  /* TODO: Implement lcd_set_flip() */
+  (void)yesno;
+}
+
+/*** update functions ***/
+
+/* Performance function that works with an external buffer
+   note that by and bheight are in 4-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;
+}
+
+/* Performance function to blit a YUV bitmap directly to the LCD */
+void lcd_yuv_blit(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 x0, int y0, int width, int height)
+{
+    unsigned short *addr;
+    int c, r;
+    int x1 = (x0 + width) - 1;
+    int y1 = (y0 + height) - 1;
+
+    if ((x1 <= 0) || (y1 <= 0))
+        return;
+
+    if(y1 >= LCD_HEIGHT)
+        y1 = LCD_HEIGHT - 1;
+
+    lcd_send_command(0x43);
+    lcd_send_command(y0 + 0x1a);
+    lcd_send_command(y1 + 0x1a);
+
+    if(x1 >= LCD_WIDTH)
+        x1 = LCD_WIDTH - 1;
+
+    lcd_send_command(0x42);
+    lcd_send_command(x0);
+    lcd_send_command(x1);
+
+    addr = (unsigned short*)&lcd_framebuffer[y0][x0];
+
+    /* for each row */
+    for (r = 0; r < height; r++) {
+        /* for each column */
+        for (c = 0; c < width; c++) {
+            /* output 1 pixel */
+            lcd_send_data(*(addr++));
+        }
+
+        addr += LCD_WIDTH - width;
+    }
+}
diff --git a/firmware/target/arm/sandisk/sansa-c200/powermgmt-c200.c b/firmware/target/arm/sandisk/sansa-c200/powermgmt-c200.c
new file mode 100644
index 0000000000..1de57cb184
--- /dev/null
+++ b/firmware/target/arm/sandisk/sansa-c200/powermgmt-c200.c
@@ -0,0 +1,58 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id: powermgmt-e200.c 14375 2007-08-17 06:45:18Z amiconn $
+ *
+ * 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 FIXME this is a first linear approach */
+    { 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200 },
+};
+
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
+const unsigned short percent_to_volt_charge[11] =
+{
+    /* Sansa Li Ion 750mAH FIXME*/
+    3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200
+};
+
+/* 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 a282564d19..465457d0e1 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -120,7 +120,7 @@ static void pp_set_cpu_frequency(long frequency)
     while (test_and_set(&boostctrl_mtx.locked, 1)) ;
 #endif
 
-#ifdef SANSA_E200
+#if defined(SANSA_E200) || defined(SANSA_C200)
     i2s_scale_attn_level(CPUFREQ_DEFAULT);
 #endif
 
@@ -183,7 +183,7 @@ static void pp_set_cpu_frequency(long frequency)
     CLCD_CLOCK_SRC;             /* dummy read (to sync the write pipeline??) */
     CLCD_CLOCK_SRC = clcd_clock_src; /* restore saved value */
 
-#ifdef SANSA_E200
+#if defined(SANSA_E200) || defined(SANSA_C200)
     i2s_scale_attn_level(frequency);
 #endif
 
@@ -231,7 +231,7 @@ void system_init(void)
         GPIOK_INT_EN        = 0;
         GPIOL_INT_EN        = 0;
 
-#ifdef SANSA_E200
+#if defined(SANSA_E200) || defined(SANSA_C200)
         /* outl(0x00000000, 0x6000b000); */
         outl(inl(0x6000a000) | 0x80000000, 0x6000a000); /* Init DMA controller? */
 #endif