diff --git a/firmware/SOURCES b/firmware/SOURCES index 36ee9e4cb4..724f0920cf 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1067,6 +1067,15 @@ target/arm/as3525/as3525-codec.c #endif /* !SIMULATOR */ #endif /* SANSA_M200V2 */ +#ifdef SANSA_FUZE +#ifndef SIMULATOR +target/arm/as3525/sansa-fuze/button-fuze.c +target/arm/as3525/sansa-fuze/lcd-fuze.c +target/arm/as3525/sansa-e200v2/backlight-e200v2.c +target/arm/as3525/as3525-codec.c +#endif /* !SIMULATOR */ +#endif /* SANSA_FUZE */ + #ifdef IAUDIO_7 #ifndef SIMULATOR drivers/nand_id.c diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h new file mode 100644 index 0000000000..d9aac46a14 --- /dev/null +++ b/firmware/export/config-fuze.h @@ -0,0 +1,205 @@ +/* + * 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 43 +#define MODEL_NAME "Sandisk Sansa Fuze" + +#define HW_SAMPR_CAPS (SAMPR_CAP_44) + +/* define this if you have recording possibility */ +#define HAVE_RECORDING + +#define REC_SAMPR_CAPS (SAMPR_CAP_22) +#define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ +#define REC_SAMPR_DEFAULT SAMPR_22 + +/* 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 + +/* 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 220 +#define LCD_HEIGHT 176 +#define LCD_DEPTH 16 /* 65536 colours */ +#define LCD_PIXELFORMAT RGB565 /* rgb565 */ + +#ifndef BOOTLOADER +/* 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 +#endif + +/* 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 SANSA_FUZE_PAD + +/* Define this if you do software codec */ +#define CONFIG_CODEC SWCODEC + +/* There is no hardware tone control */ +#define HAVE_SW_TONE_CONTROLS + +/* 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 real-time clock */ +#ifndef BOOTLOADER +#define CONFIG_RTC RTC_AS3525 +#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 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, but use SI4700 for now */ +#define CONFIG_TUNER SI4700 +/* #define HAVE_TUNER_PWR_CTRL */ + +/* Define this for LCD backlight available */ +#define HAVE_BACKLIGHT +#define HAVE_BACKLIGHT_BRIGHTNESS + +/* define this if the unit uses a scrollwheel for navigation */ +#define HAVE_SCROLLWHEEL +/* 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 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 an AMS AS3525*/ +#define CONFIG_CPU AS3525 + +/* Define this if you want to use the AS2525 i2c interface */ +#define CONFIG_I2C I2C_AS3525 + +/* 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 */ +#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_MULTIVOLUME +#define HAVE_HOTSWAP +#endif + +/* #define USB_IPODSTYLE */ + +/* 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 + +/* Virtual LED (icon) */ +#define CONFIG_LED LED_VIRTUAL + +/* 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 + +#endif /* SIMULATOR */ + +/** Port-specific settings **/ + +/* Main LCD backlight brightness range and defaults */ +#define MIN_BRIGHTNESS_SETTING 1 +#define MAX_BRIGHTNESS_SETTING 12 +#define DEFAULT_BRIGHTNESS_SETTING 6 + +/* Default recording levels */ +#define DEFAULT_REC_MIC_GAIN 23 +#define DEFAULT_REC_LEFT_GAIN 23 +#define DEFAULT_REC_RIGHT_GAIN 23 + +#ifdef E200R_INSTALLER +#define IRAMORIG 0x40004000 +#endif + diff --git a/firmware/export/config.h b/firmware/export/config.h index c12f6ce4d2..0867efda45 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -105,6 +105,7 @@ #define MEIZU_M6SP_PAD 33 #define MEIZU_M3_PAD 34 #define SANSA_CLIP_PAD 35 +#define SANSA_FUZE_PAD 36 /* CONFIG_REMOTE_KEYPAD */ #define H100_REMOTE 1 @@ -150,6 +151,7 @@ #define LCD_ONDAVX747 29 /* as used by the Onda VX747 */ #define LCD_ONDAVX767 30 /* as used by the Onda VX767 */ #define LCD_SSD1303 31 /* as used by the Sansa Clip */ +#define LCD_FUZE 32 /* as used by the Sansa Fuze */ /* LCD_PIXELFORMAT */ #define HORIZONTAL_PACKING 1 @@ -320,6 +322,8 @@ #include "config-e200v2.h" #elif defined(SANSA_M200V2) #include "config-m200v2.h" +#elif defined(SANSA_FUZE) +#include "config-fuze.h" #else /* no known platform */ #endif diff --git a/firmware/target/arm/as3525/sansa-fuze/adc-target.h b/firmware/target/arm/as3525/sansa-fuze/adc-target.h new file mode 100644 index 0000000000..bea0272496 --- /dev/null +++ b/firmware/target/arm/as3525/sansa-fuze/adc-target.h @@ -0,0 +1,24 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 ?? + * + * 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 _ADC_TARGET_H_ +#define _ADC_TARGET_H_ + +#endif /* _ADC_TARGET_H_ */ diff --git a/firmware/target/arm/as3525/sansa-fuze/backlight-fuze.c b/firmware/target/arm/as3525/sansa-fuze/backlight-fuze.c new file mode 100644 index 0000000000..735b85667d --- /dev/null +++ b/firmware/target/arm/as3525/sansa-fuze/backlight-fuze.c @@ -0,0 +1,73 @@ +/*************************************************************************** + * __________ __ ___. + * 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. + * + ****************************************************************************/ +#include "config.h" +#include "backlight-target.h" +#include "system.h" +#include "lcd.h" +#include "backlight.h" +#include "as3525-codec.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 + as3525_codec_write(AS3514_DCDC15, backlight_brightness); +} + +void _backlight_off(void) +{ + as3525_codec_write(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) +{ + GPIOD_PIN(7) = (1<<7); + GPIOD_DIR |= (1<<7); +} + +void _buttonlight_off(void) +{ + GPIOD_PIN(7) = 0; + GPIOD_DIR |= (1<<7); +} diff --git a/firmware/target/arm/as3525/sansa-fuze/backlight-target.h b/firmware/target/arm/as3525/sansa-fuze/backlight-target.h new file mode 100644 index 0000000000..db2cecc07a --- /dev/null +++ b/firmware/target/arm/as3525/sansa-fuze/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); +int __backlight_is_on(void); + +void _buttonlight_on(void); +void _buttonlight_off(void); +#endif diff --git a/firmware/target/arm/as3525/sansa-fuze/button-fuze.c b/firmware/target/arm/as3525/sansa-fuze/button-fuze.c new file mode 100644 index 0000000000..fc2715216c --- /dev/null +++ b/firmware/target/arm/as3525/sansa-fuze/button-fuze.c @@ -0,0 +1,98 @@ +/*************************************************************************** + * __________ __ ___. + * 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. + * + ****************************************************************************/ + +/* Taken from button-h10.c by Barry Wardell and reverse engineering by MrH. */ + +#include "system.h" +#include "button.h" +#include "backlight.h" +#include "powermgmt.h" + +#define WHEEL_REPEAT_INTERVAL 300000 +#define WHEEL_FAST_ON_INTERVAL 20000 +#define WHEEL_FAST_OFF_INTERVAL 60000 +#define WHEELCLICKS_PER_ROTATION 48 /* wheelclicks per full rotation */ + +/* Clickwheel */ +#ifndef BOOTLOADER +static unsigned int old_wheel_value = 0; +static unsigned int wheel_repeat = BUTTON_NONE; +static unsigned int wheel_click_count = 0; +static unsigned int wheel_delta = 0; +static int wheel_fast_mode = 0; +static unsigned long last_wheel_usec = 0; +static unsigned long wheel_velocity = 0; +static long last_wheel_post = 0; +static long next_backlight_on = 0; +/* Buttons */ +static bool hold_button = false; +static bool hold_button_old = false; +#define _button_hold() hold_button +#else +#define _button_hold() false /* FIXME */ +#endif /* BOOTLOADER */ +static int int_btn = BUTTON_NONE; + +void button_init_device(void) +{ +} + +bool button_hold(void) +{ + return _button_hold(); +} + +/* clickwheel */ +#ifndef BOOTLOADER +void clickwheel_int(void) +{ +} +#endif /* BOOTLOADER */ + +/* device buttons */ +void button_int(void) +{ + unsigned char state; + + int_btn = BUTTON_NONE; + +} + +/* + * Get button pressed from hardware + */ +int button_read_device(void) +{ +#ifdef BOOTLOADER + /* Read buttons directly in the bootloader */ + button_int(); +#else + /* light handling */ + if (hold_button != hold_button_old) + { + hold_button_old = hold_button; + backlight_hold_changed(hold_button); + } +#endif /* BOOTLOADER */ + + /* The int_btn variable is set in the button interrupt handler */ + return int_btn; +} diff --git a/firmware/target/arm/as3525/sansa-fuze/button-target.h b/firmware/target/arm/as3525/sansa-fuze/button-target.h new file mode 100644 index 0000000000..c818c602d0 --- /dev/null +++ b/firmware/target/arm/as3525/sansa-fuze/button-target.h @@ -0,0 +1,62 @@ +/*************************************************************************** + * __________ __ ___. + * 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 +#include "config.h" + +#define HAS_BUTTON_HOLD + +bool button_hold(void); +void button_init_device(void); +int button_read_device(void); +#ifndef BOOTLOADER +void clickwheel_int(void); +#endif +void button_int(void); + +/* Sandisk Sansa Fuze button codes */ + +/* TODO: These are just a copy of the E200 */ + +/* 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_SCROLL_BACK 0x00000080 +#define BUTTON_SCROLL_FWD 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/as3525/sansa-fuze/lcd-fuze.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c new file mode 100644 index 0000000000..ff62949dcd --- /dev/null +++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c @@ -0,0 +1,449 @@ +/*************************************************************************** + * __________ __ ___. + * 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" + +static bool display_on = false; /* is the display turned on? */ +static bool display_flipped = false; +static int xoffset = 20; /* needed for flip */ + +/* TODO: Implement this function */ +static void lcd_delay(int x) +{ + /* This is just arbitrary - the OF does something more complex */ + x *= 1024; + while (x--); +} + +static void as3525_dbop_init(void) +{ + CGU_DBOP = (1<<3) | (4-1); + + DBOP_TIMPOL_01 = 0xe167e167; + DBOP_TIMPOL_23 = 0xe167006e; + DBOP_CTRL = 0x41008; + + GPIOB_AFSEL = 0xfc; + GPIOC_AFSEL = 0xff; + + DBOP_TIMPOL_23 = 0x6000e; + DBOP_CTRL = 0x51008; + 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(int cmd) +{ + int x; + + /* Write register */ + DBOP_CTRL &= ~(1<<14); + + DBOP_TIMPOL_23 = 0xa167006e; + + DBOP_DOUT = cmd; + + /* Wait for fifo to empty */ + while ((DBOP_STAT & (1<<10)) == 0); + + /* This loop is unique to the Fuze */ + x = 0; + do { + asm volatile ("nop\n"); + } while (x++ < 4); + + + DBOP_TIMPOL_23 = 0xa167e06f; +} + +void lcd_write_data(const fb_data* p_bytes, int count) +{ + while (count--) + { + DBOP_DOUT = *p_bytes++; + + /* Wait for fifo to empty */ + while ((DBOP_STAT & (1<<10)) == 0); + } +} + +static void lcd_write_reg(int reg, int value) +{ + unsigned short data = value; + + lcd_write_cmd(reg); + lcd_write_data(&data, 1); +} + +/*** hardware configuration ***/ + +void lcd_set_contrast(int val) +{ + (void)val; +} + +void lcd_set_invert_display(bool yesno) +{ + (void)yesno; +} + +static void flip_lcd(bool yesno) +{ + (void)yesno; +} + + +/* turn the display upside down (call lcd_update() afterwards) */ +void lcd_set_flip(bool yesno) +{ + display_flipped = yesno; + xoffset = yesno ? 20 : 0; /* A guess */ + + if (display_on) + flip_lcd(yesno); +} + + +static void _display_on(void) +{ + /* Initialise in the same way as the original firmare */ + + lcd_write_reg(0x07, 0); + lcd_write_reg(0x13, 0); + + lcd_delay(10); + + lcd_write_reg(0x11, 0x3704); + lcd_write_reg(0x14, 0x1a1b); + lcd_write_reg(0x10, 0x3860); + lcd_write_reg(0x13, 0x40); + + lcd_delay(10); + + lcd_write_reg(0x13, 0x60); + + lcd_delay(50); + + lcd_write_reg(0x13, 0x70); + + lcd_delay(40); + + lcd_write_reg(0x01, 277); + lcd_write_reg(0x02, (7<<8)); + lcd_write_reg(0x03, 0x30); + lcd_write_reg(0x08, 0x01); + lcd_write_reg(0x0b, (1<<10)); + lcd_write_reg(0x0c, 0); + + lcd_write_reg(0x30, 0x40); + lcd_write_reg(0x31, 0x0687); + lcd_write_reg(0x32, 0x0306); + lcd_write_reg(0x33, 0x104); + lcd_write_reg(0x34, 0x0585); + lcd_write_reg(0x35, 255+66); + lcd_write_reg(0x36, 0x0687+128); + lcd_write_reg(0x37, 259); + lcd_write_reg(0x38, 0); + lcd_write_reg(0x39, 0); + + lcd_write_reg(0x42, (LCD_WIDTH - 1)); + lcd_write_reg(0x43, 0); + lcd_write_reg(0x44, (LCD_WIDTH - 1)); + lcd_write_reg(0x45, 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(0x07, 0x11); + + lcd_delay(40); + + lcd_write_reg(0x07, 0x17); + + display_on = true; /* must be done before calling lcd_update() */ + lcd_update(); +} + +/* (e.g. 0, 219) */ +static void lcd_window_x(int r0, int r1) +{ + int r2, r3, r4; + + r3 = (LCD_WIDTH - 1); + r2 = (LCD_WIDTH - 1); + + if (r0 < LCD_WIDTH) + r2 = r0; + + if (r1 < LCD_WIDTH) + r3 = r1; + +#if 0 + r1 = 0x1db12; + + [r1] = 1; /* byte */ +#endif + + r3 += xoffset; + + r4 = r2; + + r4 += xoffset; + + r0 = (r3 << 8); + + r0 |= r4; + + r1 = (r0 << 16) >> 16; + + lcd_write_reg(0x46, r1); + + r1 = (r4 << 16) >> 16; + + lcd_write_reg(0x20, r1); + + lcd_write_reg(0x03, 0x30); + +#if 0 + r0 := 0x1e0c4 + r1 := 0x216a8 + + r0 := [r0] + r2 := [r1] + + r0 := (r0 >> 2) << 2; + + if (r0 != r2) { +#endif + lcd_write_reg(0x00, 0x0001); + lcd_write_reg(0x11, 0x3704); + lcd_write_reg(0x14, 0x1a1b); + lcd_write_reg(0x10, 0x3860); + lcd_write_reg(0x13, 0x0070); + lcd_write_reg(0x07, 0x0017); + lcd_write_reg(0x01, 277); + lcd_write_reg(0x02, (7<<8)); + lcd_write_reg(0x08, 0x0001); + lcd_write_reg(0x0b, (1<<10)); + lcd_write_reg(0x0c, 0x0000); + lcd_write_reg(0x30, 0x0040); + lcd_write_reg(0x31, 0x0687); + lcd_write_reg(0x32, 0x0306); + lcd_write_reg(0x33, 260); + lcd_write_reg(0x34, 0x0585); + lcd_write_reg(0x35, 255+66); + lcd_write_reg(0x36, 0x687+128); + lcd_write_reg(0x37, 259); + lcd_write_reg(0x38, 0); + lcd_write_reg(0x39, 0); + lcd_write_reg(0x40, 0); + lcd_write_reg(0x41, 0); + lcd_write_reg(0x42, (LCD_WIDTH - 1)); + lcd_write_reg(0x43, 0); + lcd_write_reg(0x44, (LCD_WIDTH - 1)); + lcd_write_reg(0x45, 0); + lcd_write_reg(0x15, 0); + lcd_write_reg(0x73, 0); +#if 0 + } +#endif +} + +/* - e.g. 0, 175 */ +static void lcd_window_y(int r0, int r1) +{ + int r2, r4; + + r2 = (LCD_HEIGHT - 1); + r4 = (LCD_HEIGHT - 1); + + if (r0 < LCD_HEIGHT) + r4 = r0; + + if (r1 < LCD_HEIGHT) + r2 = r1; + + r1 = (r2 << 16) >> 16; + + lcd_write_reg(0x47, r1); + + r1 = (r4 << 16) >> 16; + + lcd_write_reg(0x48, r1); + + /* ??Start address - (x<<8) | y0 */ + lcd_write_reg(0x21, r1); + + /* Start write to GRAM */ + lcd_write_cmd(0x22); +} + +/* I'm guessing this function is lcd_enable, but it may not be... */ +void lcd_enable(int r0) +{ +#if 0 + r4 = 0x1db12; + [r4] = 1; +#endif + + if (r0 != 0) { + lcd_write_reg(0, 1); + + lcd_delay(10); + + lcd_write_reg(0x10, 0); + lcd_write_reg(0x11, 0x3704); + lcd_write_reg(0x14, 0x1a1b); + lcd_write_reg(0x10, 0x3860); + lcd_write_reg(0x13, 0x40); + + lcd_delay(10); + + lcd_write_reg(0x13, 0x60); + + lcd_delay(50); + + lcd_write_reg(0x13, 112); + + lcd_delay(40); + + lcd_write_reg(0x07, 0x11); + + lcd_delay(40); + + lcd_write_reg(0x07, 0x17); + } else { + lcd_write_reg(0x07, 0x22); + + lcd_delay(40); + + lcd_write_reg(0x07, 0); + + lcd_delay(40); + + lcd_write_reg(0x10, 1); + } + +#if 0 + [r4] = 0; +#endif +} + +void lcd_init_device() +{ + as3525_dbop_init(); + + GPIOA_DIR |= (1<<5); + GPIOA_PIN(5) = 0; + + GPIOA_PIN(3) = (1<<3); + + GPIOA_DIR |= (1<<4) | (1<<3); + + GPIOA_PIN(3) = (1<<3); + + GPIOA_PIN(4) = 0; + + GPIOA_DIR |= (1<<7); + GPIOA_PIN(7) = 0; + + CCU_IO &= ~4; + CCU_IO &= ~8; + + GPIOD_DIR |= (1<<7); + +#if 0 + if (byte[0x21b24] == 0) { + GPIOD_PIN(7) = (1<<7); + GPIOD_DIR |= (1<<7); + } +#endif + + lcd_delay(1); + + GPIOA_PIN(5) = (1<<5); + + lcd_delay(1); + + _display_on(); +} + +/* 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_window_x(0, (LCD_WIDTH - 1)); + + lcd_window_y(0, (LCD_HEIGHT - 1)); + + lcd_write_data((unsigned short *)lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT); + +} + +/* Update a fraction of the display. */ +void lcd_update_rect(int x, int y, int width, int height) +{ + int xmax, ymax; + const unsigned short *ptr; + + if (!display_on) + return; + + xmax = x + width - 1; + if (xmax >= LCD_WIDTH) + xmax = LCD_WIDTH - 1; /* Clip right */ + if (x < 0) + x = 0; /* Clip left */ + if (x >= xmax) + return; /* nothing left to do */ + + ymax = y + height; + if (ymax > LCD_HEIGHT) + ymax = LCD_HEIGHT - 1; /* Clip bottom */ + if (y < 0) + y = 0; /* Clip top */ + if (y >= ymax) + return; /* nothing left to do */ + + + lcd_window_x(x, xmax); + lcd_window_y(y, ymax); + + ptr = (unsigned short *)&lcd_framebuffer[y][x]; + + do + { + lcd_write_data(ptr, width); + ptr += LCD_WIDTH; + } + while (++y < ymax); + + lcd_write_data((unsigned short *)lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT); +} diff --git a/firmware/target/arm/as3525/sansa-fuze/system-target.h b/firmware/target/arm/as3525/sansa-fuze/system-target.h new file mode 100644 index 0000000000..b712d1c124 --- /dev/null +++ b/firmware/target/arm/as3525/sansa-fuze/system-target.h @@ -0,0 +1,28 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 ?? + * + * 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 SYSTEM_TARGET_H +#define SYSTEM_TARGET_H + +#include "system-arm.h" + +#define CPUFREQ_MAX 250000000 + +#endif /* SYSTEM_TARGET_H */ diff --git a/firmware/target/arm/as3525/sansa-fuze/timer-target.h b/firmware/target/arm/as3525/sansa-fuze/timer-target.h new file mode 100644 index 0000000000..b81da57885 --- /dev/null +++ b/firmware/target/arm/as3525/sansa-fuze/timer-target.h @@ -0,0 +1,38 @@ +/*************************************************************************** +* __________ __ ___. +* Open \______ \ ____ ____ | | _\_ |__ _______ ___ +* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / +* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < +* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ +* \/ \/ \/ \/ \/ +* $Id$ +* +* Copyright (C) 2008 ?? +* +* 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 TIMER_TARGET_H +#define TIMER_TARGET_H + +bool __timer_set(long cycles, bool set); +bool __timer_register(void); +void __timer_unregister(void); + +#define __TIMER_SET(cycles, set) \ + __timer_set(cycles, set) + +#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ + int_prio, timer_callback) \ + __timer_register() + +#define __TIMER_UNREGISTER(...) \ + __timer_unregister() + +#endif /* TIMER_TARGET_H */ diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c index e83e5150ae..ff0f892406 100644 --- a/firmware/target/arm/as3525/system-as3525.c +++ b/firmware/target/arm/as3525/system-as3525.c @@ -167,7 +167,7 @@ static void sdram_init(void) MPMC_DYNAMIC_tRRD = 2; MPMC_DYNAMIC_tMRD = 2; -#if defined(SANSA_CLIP) || defined(SANSA_M200V2) +#if defined(SANSA_CLIP) || defined(SANSA_M200V2) || defined(SANSA_FUZE) # define MEMORY_MODEL 0x21 /* 16 bits external bus, low power SDRAM, 16 Mbits = 2 Mbytes */ #elif defined(SANSA_E200V2) diff --git a/tools/configure b/tools/configure index 41bd8c27c0..f657c7387e 100755 --- a/tools/configure +++ b/tools/configure @@ -696,6 +696,7 @@ cat <