10 files changed, 824 insertions, 3 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 894ee07c38..04fdae0f9f 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1296,6 +1296,20 @@ target/arm/as3525/sansa-fuze/powermgmt-fuze.c
 #endif /* !SIMULATOR */
 #endif /* SANSA_FUZE */
 
+#ifdef SANSA_FUZEV2
+#ifndef SIMULATOR
+target/arm/as3525/button-e200v2-fuze.c
+target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c
+target/arm/as3525/lcd-as-e200v2-fuze.S
+target/arm/as3525/backlight-e200v2-fuze.c
+target/arm/as3525/dbop-as3525.c
+#ifndef BOOTLOADER
+target/arm/powermgmt-ascodec.c
+target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c
+#endif /* !BOOTLOADER */
+#endif /* !SIMULATOR */
+#endif /* SANSA_FUZEV2 */
+
 #ifdef IAUDIO_7
 #ifndef SIMULATOR
 drivers/nand_id.c
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 3c70bb6880..c7ddbfc3ef 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -392,6 +392,8 @@ Lyre prototype 1 */
 #include "config/sansam200v4.h"
 #elif defined(SANSA_FUZE)
 #include "config/sansafuze.h"
+#elif defined(SANSA_FUZEV2)
+#include "config/sansafuzev2.h"
 #elif defined(SANSA_C200V2)
 #include "config/sansac200v2.h"
 #elif defined(SANSA_VIEW)
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h
new file mode 100644
index 0000000000..b806354b09
--- /dev/null
+++ b/firmware/export/config/sansafuzev2.h
@@ -0,0 +1,211 @@
+/*
+ * This config file is for the Sandisk Sansa Fuze
+ */
+#define TARGET_TREE /* this target is using the target tree system */
+
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 68
+#define MODEL_NAME   "Sandisk Sansa Fuze v2"
+
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+
+/* define this if you have recording possibility */
+//#define HAVE_RECORDING
+
+//#define REC_SAMPR_CAPS      SAMPR_CAP_ALL
+
+/* Default recording levels */
+#define DEFAULT_REC_MIC_GAIN    23
+#define DEFAULT_REC_LEFT_GAIN   23
+#define DEFAULT_REC_RIGHT_GAIN  23
+
+/* Define bitmask of input sources - recordable bitmask can be defined
+   explicitly if different */
+#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO)
+
+/* 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
+
+#ifndef BOOTLOADER/* define this if you want album art for this target */
+#define HAVE_ALBUMART
+
+/* define this to enable bitmap scaling */
+#define HAVE_BMP_SCALING
+
+/* define this to enable JPEG decoding */
+#define HAVE_JPEG
+
+/* 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
+
+/* 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 HAVE_LCD_SLEEP_SETTING
+*/
+
+/* 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 this if you have a real-time clock */
+#define CONFIG_RTC RTC_AS3514
+
+/* There is no hardware tone control */
+#define HAVE_SW_TONE_CONTROLS
+
+#endif /* !BOOTLOADER */
+
+/* put the lcd frame buffer in IRAM */
+#define IRAM_LCDFRAMEBUFFER //IBSS_ATTR
+
+#define CONFIG_KEYPAD SANSA_FUZE_PAD
+
+/* Define this to enable morse code input */
+#define HAVE_MORSE_INPUT
+
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+
+
+/* LCD dimensions */
+#define LCD_WIDTH  220
+#define LCD_HEIGHT 176
+#define LCD_DEPTH  16   /* 65536 colours */
+#define LCD_PIXELFORMAT RGB565 /* rgb565 */
+
+
+/* We're working on the assumption that the AS3525 has something
+   similar to the AS3514 for audio codec etc */
+#define HAVE_AS3514
+
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+
+/* Some Sansa Fuzes seem to be FAT16 formatted */
+#define HAVE_FAT16SUPPORT
+
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x100000
+
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0x80000
+
+#define AB_REPEAT_ENABLE 1
+
+/* FM Tuner - suspected to be the SI4702 */
+#define CONFIG_TUNER SI4700
+/* #define HAVE_TUNER_PWR_CTRL */
+
+/* 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
+
+/* Which backlight fading type? */
+#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING
+
+/* define this if the unit uses a scrollwheel for navigation */
+#define HAVE_SCROLLWHEEL
+/* define to activate advanced wheel acceleration code */
+#define HAVE_WHEEL_ACCELERATION
+/* define from which rotation speed [degree/sec] on the acceleration starts */
+#define WHEEL_ACCEL_START 540
+/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */
+#define WHEEL_ACCELERATION 1
+
+/* 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 CONFIG_STORAGE STORAGE_SD
+
+#define BATTERY_CAPACITY_DEFAULT 550    /* default battery capacity */
+#define BATTERY_CAPACITY_MIN 550        /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 550        /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 0          /* capacity increment */
+#define BATTERY_TYPES_COUNT  1          /* only one type */
+
+/* Charging implemented in a target-specific algorithm */
+#define CONFIG_CHARGING 0
+
+/* define this if the unit can be powered or charged via USB */
+#define HAVE_USB_POWER
+
+/* Define this if you have an AMS AS3525*/
+#define CONFIG_CPU AS3525
+
+/* Define how much SD sectors are reserved for OF */
+#define AMS_OF_SIZE 0xF000
+
+/* Define this if you want to use the AS2525 i2c interface */
+#define CONFIG_I2C I2C_AS3525
+
+/* define current usage levels (based on battery bench) */
+#define CURRENT_NORMAL     65
+#define CURRENT_BACKLIGHT  30
+#define CURRENT_RECORD     CURRENT_NORMAL
+
+/* Define this to the CPU frequency */
+#define CPU_FREQ      250000000
+
+/* Type of LCD */
+#define CONFIG_LCD LCD_FUZE
+
+/* Offset ( in the firmware file's header ) to the file CRC and data. These are
+   only used when loading the old format rockbox.e200 file */
+#define FIRMWARE_OFFSET_FILE_CRC    0x0
+#define FIRMWARE_OFFSET_FILE_DATA   0x8
+
+#ifndef BOOTLOADER
+#define HAVE_MULTIDRIVE
+#define NUM_DRIVES 2
+#define HAVE_HOTSWAP
+#endif
+
+#ifndef BOOTLOADER
+
+#define USB_HANDLED_BY_OF
+
+/* USB On-the-go */
+#define CONFIG_USBOTG USBOTG_AS3525
+
+/* enable these for the experimental usb stack */
+#define HAVE_USBSTACK
+#define USB_VENDOR_ID 0x0781
+#define USB_PRODUCT_ID 0x7423
+
+#endif /* !BOOTLOADER */
+
+/* Define this if you have adjustable CPU frequency */
+#define HAVE_ADJUSTABLE_CPU_FREQ
+
+#define BOOTFILE_EXT    "sansa"
+#define BOOTFILE        "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
+
+#define ICODE_ATTR_TREMOR_NOT_MDCT
+
+#define INCLUDE_TIMEOUT_API
+
diff --git a/firmware/target/arm/as3525/button-e200v2-fuze.c b/firmware/target/arm/as3525/button-e200v2-fuze.c
index 98c660dd45..2a75fa1e6f 100644
--- a/firmware/target/arm/as3525/button-e200v2-fuze.c
+++ b/firmware/target/arm/as3525/button-e200v2-fuze.c
@@ -28,7 +28,7 @@
 #include "dbop-as3525.h"
 
 
-#ifdef SANSA_FUZE
+#if defined(SANSA_FUZE) || defined(SANSA_FUZEV2)
 #define DBOP_BIT15_BUTTON       BUTTON_HOME
 #define WHEEL_REPEAT_INTERVAL   (HZ/5)
 #define WHEEL_COUNTER_DIV       4
diff --git a/firmware/target/arm/as3525/dbop-as3525.c b/firmware/target/arm/as3525/dbop-as3525.c
index b54ad17a6c..1730290d46 100644
--- a/firmware/target/arm/as3525/dbop-as3525.c
+++ b/firmware/target/arm/as3525/dbop-as3525.c
@@ -24,7 +24,7 @@
 #include "as3525.h"
 #include "dbop-as3525.h"
 
-#if defined(SANSA_FUZE)
+#if defined(SANSA_FUZE) || defined(SANSA_FUZEV2)
 #define DBOP_PRECHARGE 0x80FF
 #elif defined(SANSA_E200V2) || defined(SANSA_C200V2)
 #define DBOP_PRECHARGE 0xF0FF
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h b/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h
new file mode 100644
index 0000000000..2d60ac35c2
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h
@@ -0,0 +1,32 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2006 Barry Wardell
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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);
+#ifdef HAVE_BUTTON_LIGHT
+void _buttonlight_on(void);
+void _buttonlight_off(void);
+#endif
+#endif
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/button-target.h b/firmware/target/arm/as3525/sansa-fuzev2/button-target.h
new file mode 100644
index 0000000000..6dcd37460a
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-fuzev2/button-target.h
@@ -0,0 +1,63 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Barry Wardell
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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
+
+void button_init_device(void);
+bool button_hold(void);
+int button_read_device(void);
+unsigned short button_read_dbop(void);
+/* Sandisk Sansa Fuze button codes */
+
+/* Main unit's buttons */
+#define BUTTON_HOME         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_SCROLL_BACK  0x00000080
+#define BUTTON_SCROLL_FWD   0x00000100
+
+#define BUTTON_HOLD         0x00000400
+
+#define BUTTON_MAIN         (BUTTON_HOME|BUTTON_DOWN|BUTTON_RIGHT|BUTTON_LEFT \
+                            |BUTTON_SELECT|BUTTON_UP|BUTTON_POWER \
+                            |BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD \
+                            |BUTTON_HOLD)
+
+/* 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/as3525/sansa-fuzev2/lcd-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c
new file mode 100644
index 0000000000..bdf1c704e0
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c
@@ -0,0 +1,447 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 by Dave Chapman
+ *
+ * LCD driver for the Sansa Fuze - controller unknown
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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 "file.h"
+#include "debug.h"
+#include "system.h"
+#include "clock-target.h"
+#include "dbop-as3525.h"
+
+/* The controller is unknown, but some registers appear to be the same as the
+   HD66789R */
+static bool display_on = false; /* is the display turned on? */
+
+/* register defines */
+#define R_START_OSC             0x00
+#define R_DRV_OUTPUT_CONTROL    0x01
+#define R_DRV_WAVEFORM_CONTROL  0x02
+#define R_ENTRY_MODE            0x03
+#define R_COMPARE_REG1          0x04
+#define R_COMPARE_REG2          0x05
+
+#define R_DISP_CONTROL1     0x07
+#define R_DISP_CONTROL2     0x08
+#define R_DISP_CONTROL3     0x09
+
+#define R_FRAME_CYCLE_CONTROL 0x0b
+#define R_EXT_DISP_IF_CONTROL 0x0c
+
+#define R_POWER_CONTROL1    0x10
+#define R_POWER_CONTROL2    0x11
+#define R_POWER_CONTROL3    0x12
+#define R_POWER_CONTROL4    0x13
+
+#define R_RAM_ADDR_SET  0x21
+#define R_WRITE_DATA_2_GRAM 0x22
+
+#define R_GAMMA_FINE_ADJ_POS1   0x30
+#define R_GAMMA_FINE_ADJ_POS2   0x31
+#define R_GAMMA_FINE_ADJ_POS3   0x32
+#define R_GAMMA_GRAD_ADJ_POS    0x33
+
+#define R_GAMMA_FINE_ADJ_NEG1   0x34
+#define R_GAMMA_FINE_ADJ_NEG2   0x35
+#define R_GAMMA_FINE_ADJ_NEG3   0x36
+#define R_GAMMA_GRAD_ADJ_NEG    0x37
+
+#define R_GAMMA_AMP_ADJ_RES_POS     0x38
+#define R_GAMMA_AMP_AVG_ADJ_RES_NEG 0x39
+
+#define R_GATE_SCAN_POS         0x40
+#define R_VERT_SCROLL_CONTROL   0x41
+#define R_1ST_SCR_DRV_POS       0x42
+#define R_2ND_SCR_DRV_POS       0x43
+#define R_HORIZ_RAM_ADDR_POS    0x44
+#define R_VERT_RAM_ADDR_POS     0x45
+
+/* Flip Flag */
+#define R_ENTRY_MODE_HORZ_NORMAL 0x7030
+#define R_ENTRY_MODE_HORZ_FLIPPED 0x7000
+static unsigned short r_entry_mode = R_ENTRY_MODE_HORZ_NORMAL;
+#define R_ENTRY_MODE_VERT 0x7038
+#define R_ENTRY_MODE_SOLID_VERT  0x1038
+/* FIXME */
+#define R_ENTRY_MODE_VIDEO_NORMAL 0x7038
+#define R_ENTRY_MODE_VIDEO_FLIPPED 0x7018
+
+/* Reverse Flag */
+#define R_DISP_CONTROL_NORMAL 0x0004
+#define R_DISP_CONTROL_REV    0x0000
+static unsigned short r_disp_control_rev = R_DISP_CONTROL_NORMAL;
+
+static const int xoffset = 20;
+
+static inline void lcd_delay(int x)
+{
+    do {
+        asm volatile ("nop\n");
+    } while (x--);
+}
+
+static void as3525_dbop_init(void)
+{
+    CGU_DBOP = (1<<3) | AS3525_DBOP_DIV;
+
+    DBOP_TIMPOL_01 = 0xe167e167;
+    DBOP_TIMPOL_23 = 0xe167006e;
+
+    /* short count: 16 | output data width: 16 | readstrobe line */
+    DBOP_CTRL = (1<<18|1<<12|1<<3);
+
+    GPIOB_AFSEL = 0xfc;
+    GPIOC_AFSEL = 0xff;
+
+    DBOP_TIMPOL_23 = 0x6000e;
+
+    /* short count: 16|enable write|output data width: 16|read strobe line */
+    DBOP_CTRL = (1<<18|1<<16|1<<12|1<<3);
+    DBOP_TIMPOL_01 = 0x6e167;
+    DBOP_TIMPOL_23 = 0xa167e06f;
+
+    /* TODO: The OF calls some other functions here, but maybe not important */
+}
+
+static void lcd_write_cmd(short cmd)
+{
+    /* Write register */
+    DBOP_TIMPOL_23 = 0xa167006e;
+    dbop_write_data(&cmd, 1);
+
+    lcd_delay(4);
+
+    DBOP_TIMPOL_23 = 0xa167e06f;
+}
+
+static void lcd_write_reg(int reg, int value)
+{
+    int16_t data = value;
+
+    lcd_write_cmd(reg);
+    dbop_write_data(&data, 1);
+}
+
+/*** hardware configuration ***/
+
+void lcd_set_contrast(int val)
+{
+    (void)val;
+}
+
+void lcd_set_invert_display(bool yesno)
+{
+    r_disp_control_rev = yesno ? R_DISP_CONTROL_REV :
+                                 R_DISP_CONTROL_NORMAL;
+
+    if (display_on)
+    {
+        lcd_write_reg(R_DISP_CONTROL1, 0x0013 | r_disp_control_rev);
+    }
+
+}
+
+#ifdef HAVE_LCD_FLIP
+static bool display_flipped = false;
+
+/* turn the display upside down  */
+void lcd_set_flip(bool yesno)
+{
+    display_flipped = yesno;
+
+    r_entry_mode = yesno ? R_ENTRY_MODE_HORZ_FLIPPED :
+                           R_ENTRY_MODE_HORZ_NORMAL;
+}
+#endif
+
+static void _display_on(void)
+{
+    /* Initialise in the same way as the original firmare */
+
+    lcd_write_reg(R_DISP_CONTROL1, 0);
+    lcd_write_reg(R_POWER_CONTROL4, 0);
+
+    lcd_write_reg(R_POWER_CONTROL2, 0x3704);
+    lcd_write_reg(0x14, 0x1a1b);
+    lcd_write_reg(R_POWER_CONTROL1, 0x3860);
+    lcd_write_reg(R_POWER_CONTROL4, 0x40);
+
+    lcd_write_reg(R_POWER_CONTROL4, 0x60);
+
+    lcd_write_reg(R_POWER_CONTROL4, 0x70);
+    lcd_write_reg(R_DRV_OUTPUT_CONTROL, 277);
+    lcd_write_reg(R_DRV_WAVEFORM_CONTROL, (7<<8));
+    lcd_write_reg(R_ENTRY_MODE, r_entry_mode);
+    lcd_write_reg(R_DISP_CONTROL2, 0x01);
+    lcd_write_reg(R_FRAME_CYCLE_CONTROL, (1<<10));
+    lcd_write_reg(R_EXT_DISP_IF_CONTROL, 0);
+
+    lcd_write_reg(R_GAMMA_FINE_ADJ_POS1, 0x40);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_POS2, 0x0687);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_POS3, 0x0306);
+    lcd_write_reg(R_GAMMA_GRAD_ADJ_POS, 0x104);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG1, 0x0585);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG2, 255+66);
+    lcd_write_reg(R_GAMMA_FINE_ADJ_NEG3, 0x0687+128);
+    lcd_write_reg(R_GAMMA_GRAD_ADJ_NEG, 259);
+    lcd_write_reg(R_GAMMA_AMP_ADJ_RES_POS, 0);
+    lcd_write_reg(R_GAMMA_AMP_AVG_ADJ_RES_NEG, 0);
+
+    lcd_write_reg(R_1ST_SCR_DRV_POS, (LCD_WIDTH - 1));
+    lcd_write_reg(R_2ND_SCR_DRV_POS, 0);
+    lcd_write_reg(R_HORIZ_RAM_ADDR_POS, (LCD_WIDTH - 1));
+    lcd_write_reg(R_VERT_RAM_ADDR_POS, 0);
+    lcd_write_reg(0x46, (((LCD_WIDTH - 1) + xoffset) << 8) | xoffset);
+    lcd_write_reg(0x47, (LCD_HEIGHT - 1));
+    lcd_write_reg(0x48, 0x0);
+
+    lcd_write_reg(R_DISP_CONTROL1, 0x11);
+    lcd_write_reg(R_DISP_CONTROL1, 0x13 | r_disp_control_rev);
+
+    display_on = true;  /* must be done before calling lcd_update() */
+    lcd_update();
+}
+
+void lcd_init_device(void)
+{
+    as3525_dbop_init();
+
+    GPIOA_DIR |= (1<<5|1<<4|1<<3);
+    GPIOA_PIN(5) = 0;
+    GPIOA_PIN(3) = (1<<3);
+    GPIOA_PIN(4) = 0;
+    GPIOA_PIN(5) = (1<<5);
+
+    _display_on();
+}
+
+#if defined(HAVE_LCD_ENABLE)
+void lcd_enable(bool on)
+{
+    if (display_on == on)
+        return;
+
+    if(on)
+    {
+        lcd_write_reg(R_START_OSC, 1);
+        lcd_write_reg(R_POWER_CONTROL1, 0);
+        lcd_write_reg(R_POWER_CONTROL2, 0x3704);
+        lcd_write_reg(0x14, 0x1a1b);
+        lcd_write_reg(R_POWER_CONTROL1, 0x3860);
+        lcd_write_reg(R_POWER_CONTROL4, 0x40);
+        lcd_write_reg(R_POWER_CONTROL4, 0x60);
+        lcd_write_reg(R_POWER_CONTROL4, 112);
+        lcd_write_reg(R_DISP_CONTROL1, 0x11);
+        lcd_write_reg(R_DISP_CONTROL1, 0x13 | r_disp_control_rev);
+        display_on = true;
+        lcd_update();      /* Resync display */
+        send_event(LCD_EVENT_ACTIVATION, NULL);
+        sleep(0);
+
+    }
+    else
+    {
+        lcd_write_reg(R_DISP_CONTROL1, 0x22);
+        lcd_write_reg(R_DISP_CONTROL1, 0);
+        lcd_write_reg(R_POWER_CONTROL1, 1);
+        display_on = false;
+    }
+}
+#endif
+
+#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
+bool lcd_active(void)
+{
+    return display_on;
+}
+#endif
+
+/*** update functions ***/
+
+/* FIXME : find the datasheet for this RENESAS controller so we identify the
+ * registers used in windowing code (not present in HD66789R) */
+
+/* Set horizontal window addresses */
+static void lcd_window_x(int xmin, int xmax)
+{
+    xmin += xoffset;
+    xmax += xoffset;
+    lcd_write_reg(R_HORIZ_RAM_ADDR_POS + 2, (xmax << 8) | xmin);
+    lcd_write_reg(R_RAM_ADDR_SET - 1, xmin);
+}
+
+/* Set vertical window addresses */
+static void lcd_window_y(int ymin, int ymax)
+{
+    lcd_write_reg(R_VERT_RAM_ADDR_POS + 2, ymax);
+    lcd_write_reg(R_VERT_RAM_ADDR_POS + 3, ymin);
+    lcd_write_reg(R_RAM_ADDR_SET, ymin);
+}
+
+static unsigned lcd_yuv_options = 0;
+
+void lcd_yuv_set_options(unsigned options)
+{
+    lcd_yuv_options = options;
+}
+
+/* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. */
+extern void lcd_write_yuv420_lines(unsigned char const * const src[3],
+                                   int width,
+                                   int stride);
+extern void lcd_write_yuv420_lines_odither(unsigned char const * const src[3],
+                                   int width,
+                                   int stride,
+                                   int x_screen, /* To align dither pattern */
+                                   int y_screen);
+
+/* Performance function to blit a YUV bitmap directly to the LCD
+ * src_x, src_y, width and height should be even
+ * x, y, width and height have to be within LCD bounds
+ */
+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)
+{
+    unsigned char const * yuv_src[3];
+    off_t z;
+
+    /* Sorry, but width and height must be >= 2 or else */
+    width &= ~1;
+    height >>= 1;
+
+    z = stride*src_y;
+    yuv_src[0] = src[0] + z + src_x;
+    yuv_src[1] = src[1] + (z >> 2) + (src_x >> 1);
+    yuv_src[2] = src[2] + (yuv_src[1] - src[1]);
+
+#ifdef HAVE_LCD_FLIP
+    lcd_write_reg(R_ENTRY_MODE,
+        display_flipped ? R_ENTRY_MODE_VIDEO_FLIPPED : R_ENTRY_MODE_VIDEO_NORMAL
+    );
+#else
+    lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_VIDEO_NORMAL);
+#endif
+
+    lcd_window_x(x, x + width - 1);
+
+    if (lcd_yuv_options & LCD_YUV_DITHER)
+    {
+        do
+        {
+            lcd_window_y(y, y + 1);
+
+            lcd_write_cmd(R_WRITE_DATA_2_GRAM);
+
+            lcd_write_yuv420_lines_odither(yuv_src, width, stride, x, y);
+            yuv_src[0] += stride << 1; /* Skip down two luma lines */
+            yuv_src[1] += stride >> 1; /* Skip down one chroma line */
+            yuv_src[2] += stride >> 1;
+            y += 2;
+        }
+        while (--height > 0);
+    }
+    else
+    {
+        do
+        {
+            lcd_window_y(y, y + 1);
+
+            lcd_write_cmd(R_WRITE_DATA_2_GRAM);
+
+            lcd_write_yuv420_lines(yuv_src, width, stride);
+            yuv_src[0] += stride << 1; /* Skip down two luma lines */
+            yuv_src[1] += stride >> 1; /* Skip down one chroma line */
+            yuv_src[2] += stride >> 1;
+            y += 2;
+        }
+        while (--height > 0);
+    }
+}
+
+/* Update the display.
+   This must be called after all other LCD functions that change the display. */
+void lcd_update(void)
+{
+    if (!display_on)
+        return;
+
+    lcd_write_reg(R_ENTRY_MODE, r_entry_mode);
+
+    lcd_window_x(0, LCD_WIDTH - 1);
+    lcd_window_y(0, LCD_HEIGHT - 1);
+
+    lcd_write_cmd(R_WRITE_DATA_2_GRAM);
+
+    dbop_write_data((fb_data*)lcd_framebuffer, 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 *ptr;
+
+    if (!display_on)
+        return;
+
+    /* nothing to draw? */
+    if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || 
+        (y >= LCD_HEIGHT) || (x + width <= 0) || (y + height <= 0))
+        return;
+
+    if (x < 0)
+    {   /* clip left */
+        width += x;
+        x = 0;
+    }
+    if (y < 0)
+    {   /* clip top */
+        height += y;
+        y = 0;
+    }
+    if (x + width > LCD_WIDTH)
+        width = LCD_WIDTH - x; /* clip right */
+    if (y + height > LCD_HEIGHT)
+        height = LCD_HEIGHT - y; /* clip bottom */
+
+    lcd_write_reg(R_ENTRY_MODE, r_entry_mode);
+
+    /* we need to make x and width even to enable 32bit transfers */
+    width = (width + (x & 1) + 1) & ~1;
+    x &= ~1;
+
+    lcd_window_x(x, x + width - 1);
+    lcd_window_y(y, y + height -1);
+
+    lcd_write_cmd(R_WRITE_DATA_2_GRAM);
+
+    ptr = &lcd_framebuffer[y][x];
+
+    do
+    {
+        dbop_write_data(ptr, width);
+        ptr += LCD_WIDTH;
+    }
+    while (--height > 0);
+}
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c
new file mode 100644
index 0000000000..d0d39912f2
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c
@@ -0,0 +1,52 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright © 2008 Rafaël Carré
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "config.h"
+
+/* The battery manufacturer's website shows discharge curves down to 3.0V,
+   so 'dangerous' and 'shutoff' levels of 3.4V and 3.3V should be safe.
+ */
+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] =
+{
+    /* TODO: simple linear uncalibrated curve */
+    { 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200 }
+};
+
+#if CONFIG_CHARGING
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
+const unsigned short percent_to_volt_charge[11] =
+{
+    /* TODO: simple linear uncalibrated curve */
+    3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200
+};
+#endif /* CONFIG_CHARGING */
+
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c
index db01da426b..16c89b9a7a 100644
--- a/firmware/target/arm/as3525/system-as3525.c
+++ b/firmware/target/arm/as3525/system-as3525.c
@@ -206,7 +206,7 @@ static void sdram_init(void)
 #define MEMORY_MODEL 0x21
 
 #elif defined(SANSA_E200V2) || defined(SANSA_FUZE) || defined(SANSA_CLIPV2) \
-    || defined(SANSA_CLIPPLUS)
+    || defined(SANSA_CLIPPLUS) || defined(SANSA_FUZEV2)
 /* 16 bits external bus, high performance SDRAM, 64 Mbits = 8 Mbytes */
 #define MEMORY_MODEL 0x5