summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2011-09-24 11:21:01 +0000
committerBertrik Sikken <bertrik@sikken.nl>2011-09-24 11:21:01 +0000
commitf323300b82aa945dd4cadb20d8d7e23a6602ef49 (patch)
tree11d63f42fd226e98d809a88789a12001619cc647 /firmware
parent1322b58b17201ba70d35e6121ddaa87c0dceaf5b (diff)
downloadrockbox-f323300b82aa945dd4cadb20d8d7e23a6602ef49.tar.gz
rockbox-f323300b82aa945dd4cadb20d8d7e23a6602ef49.tar.bz2
rockbox-f323300b82aa945dd4cadb20d8d7e23a6602ef49.zip
Sansa clipzip: make main build compile (plugins still disabled)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30588 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/SOURCES2
-rw-r--r--firmware/export/config/sansaclipzip.h14
-rw-r--r--firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c6
-rw-r--r--firmware/target/arm/as3525/sansa-clipzip/backlight-target.h2
-rw-r--r--firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c15
-rw-r--r--firmware/target/arm/as3525/sansa-clipzip/powermgmt-clipzip.c50
-rw-r--r--firmware/target/arm/as3525/sd-as3525v2.c3
7 files changed, 81 insertions, 11 deletions
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 <stdbool.h>
+#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