From f323300b82aa945dd4cadb20d8d7e23a6602ef49 Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Sat, 24 Sep 2011 11:21:01 +0000 Subject: [PATCH] Sansa clipzip: make main build compile (plugins still disabled) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30588 a1c6a512-1295-4272-9138-f99709370657 --- apps/bitmaps/native/SOURCES | 2 + apps/bitmaps/native/usblogo.88x24x16.bmp | Bin 0 -> 6390 bytes firmware/SOURCES | 2 - firmware/export/config/sansaclipzip.h | 14 ++--- .../as3525/sansa-clipzip/backlight-clipzip.c | 6 ++- .../as3525/sansa-clipzip/backlight-target.h | 2 +- .../arm/as3525/sansa-clipzip/lcd-clipzip.c | 15 ++++++ .../as3525/sansa-clipzip/powermgmt-clipzip.c | 50 ++++++++++++++++++ firmware/target/arm/as3525/sd-as3525v2.c | 3 ++ tools/configure | 2 +- 10 files changed, 84 insertions(+), 12 deletions(-) create mode 100644 apps/bitmaps/native/usblogo.88x24x16.bmp create mode 100644 firmware/target/arm/as3525/sansa-clipzip/powermgmt-clipzip.c diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES index 1124543802..d910dd5c06 100644 --- a/apps/bitmaps/native/SOURCES +++ b/apps/bitmaps/native/SOURCES @@ -47,6 +47,8 @@ rockboxlogo.640x198x16.bmp usblogo.176x48x16.bmp #elif LCD_WIDTH >= 128 usblogo.128x37x16.bmp +#elif LCD_WIDTH >= 88 +usblogo.88x24x16.bmp #endif #elif LCD_DEPTH > 1 /* greyscale */ #ifdef IPOD_1G2G /* use firewire logo */ diff --git a/apps/bitmaps/native/usblogo.88x24x16.bmp b/apps/bitmaps/native/usblogo.88x24x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f910c8415cae28f21847ec51fb0d307993fed8e5 GIT binary patch literal 6390 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 literal 0 HcmV?d00001 diff --git a/firmware/SOURCES b/firmware/SOURCES index 5295b3512f..367241db08 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1501,8 +1501,6 @@ target/arm/as3525/sansa-clipzip/backlight-clipzip.c #ifndef BOOTLOADER target/arm/powermgmt-ascodec.c target/arm/as3525/sansa-clipzip/powermgmt-clipzip.c -//target/arm/as3525/sansa-clipzip/lcd-as-clip-plus.S -target/arm/as3525/tuner-as3525v2.c #endif /* !BOOTLOADER */ #endif /* !SIMULATOR */ #endif /* SANSA_CLIPZIP */ diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h index 58b19664b8..fcffbce6ab 100644 --- a/firmware/export/config/sansaclipzip.h +++ b/firmware/export/config/sansaclipzip.h @@ -58,19 +58,19 @@ #endif /* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP +//#define HAVE_LCD_FLIP /* define this if you can invert the pixels */ -#define HAVE_LCD_INVERT +//#define HAVE_LCD_INVERT /* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST +//#define HAVE_LCD_CONTRAST -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 50 -#define DEFAULT_CONTRAST_SETTING 30 +//#define MIN_CONTRAST_SETTING 0 +//#define MAX_CONTRAST_SETTING 50 +//#define DEFAULT_CONTRAST_SETTING 30 -#define IRAM_LCDFRAMEBUFFER IDATA_ATTR /* put the lcd frame buffer in IRAM */ +//#define IRAM_LCDFRAMEBUFFER IDATA_ATTR /* put the lcd frame buffer in IRAM */ #define CONFIG_KEYPAD SANSA_CLIP_PAD diff --git a/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c index e2a175b574..758aa875cc 100644 --- a/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c +++ b/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c @@ -19,15 +19,19 @@ * ****************************************************************************/ +#include +#include "config.h" #include "backlight-target.h" #include "lcd.h" #include "as3525v2.h" #include "ascodec-target.h" -void _backlight_init() +bool _backlight_init() { /* GPIO B1 controls backlight */ GPIOB_DIR |= (1 << 1); + + return true; } void _backlight_on(void) diff --git a/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h b/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h index e19334b5c5..da106e4e8f 100644 --- a/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-clipzip/backlight-target.h @@ -21,7 +21,7 @@ #ifndef BACKLIGHT_TARGET_H #define BACKLIGHT_TARGET_H -void _backlight_init(void); +bool _backlight_init(void); void _backlight_on(void); void _backlight_off(void); diff --git a/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c index 2b982be081..bfee2d253e 100644 --- a/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c +++ b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c @@ -401,3 +401,18 @@ void lcd_update(void) lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT); } +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) +{ + /* TODO */ + (void)src; + (void)src_x; + (void)src_y; + (void)stride; + (void)x; + (void)y; + (void)width; + (void)height; +} + diff --git a/firmware/target/arm/as3525/sansa-clipzip/powermgmt-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/powermgmt-clipzip.c new file mode 100644 index 0000000000..5006c58347 --- /dev/null +++ b/firmware/target/arm/as3525/sansa-clipzip/powermgmt-clipzip.c @@ -0,0 +1,50 @@ +/*************************************************************************** + * __________ __ ___. + * 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] = +{ + { 3300, 3653, 3701, 3735, 3768, 3790, 3833, 3900, 3966, 4056, 4140 } +}; + +#if CONFIG_CHARGING +/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ +const unsigned short percent_to_volt_charge[11] = +{ + 3427, 3786, 3842, 3877, 3896, 3924, 3971, 4028, 4084, 4161, 4190 +}; +#endif /* CONFIG_CHARGING */ + diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c index 8134869c1e..7410b19550 100644 --- a/firmware/target/arm/as3525/sd-as3525v2.c +++ b/firmware/target/arm/as3525/sd-as3525v2.c @@ -378,6 +378,9 @@ static inline bool card_detect_target(void) return GPIOA_PIN(2); #elif defined(SANSA_CLIPPLUS) return !(GPIOA_PIN(2)); +#elif defined(SANSA_CLIPZIP) + /* TODO for ClipZip: determine polarity of uSD detect */ + return false; #else #error "microSD pin not defined for your target" #endif diff --git a/tools/configure b/tools/configure index 755c04c159..c3442719c0 100755 --- a/tools/configure +++ b/tools/configure @@ -2541,7 +2541,7 @@ fi output="rockbox.sansa" bootoutput="bootloader-clipzip.sansa" appextra="recorder:gui:radio" - plugins="yes" + plugins="" swcodec="yes" toolset=$scramblebitmaptools t_cpu="arm"