summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2009-07-12 19:36:27 +0000
committerBertrik Sikken <bertrik@sikken.nl>2009-07-12 19:36:27 +0000
commit92fed35da6541a72ff6c7d09b33db059e6f6dadf (patch)
tree941bc244eff42cb1339cc8c27050ad53b65275cf /firmware/target/arm
parentc133c6a964133200c59b12e1f1c9214f37122189 (diff)
downloadrockbox-92fed35da6541a72ff6c7d09b33db059e6f6dadf.tar.gz
rockbox-92fed35da6541a72ff6c7d09b33db059e6f6dadf.tar.bz2
rockbox-92fed35da6541a72ff6c7d09b33db059e6f6dadf.zip
S5L8700/Meizu: miscellaneous minor fixes, stubs added, keywords set
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21820 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/s5l8700/ata-nand-s5l8700.c23
-rw-r--r--firmware/target/arm/s5l8700/fmradio-i2c-meizu.c2
-rw-r--r--firmware/target/arm/s5l8700/i2c-s5l8700.c5
-rw-r--r--firmware/target/arm/s5l8700/kernel-s5l8700.c2
-rw-r--r--firmware/target/arm/s5l8700/meizu-m3/lcd-m3.c14
-rw-r--r--firmware/target/arm/s5l8700/timer-s5l8700.c2
6 files changed, 39 insertions, 9 deletions
diff --git a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
index 8c66c14db5..ee1e581270 100644
--- a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
+++ b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
@@ -49,12 +49,19 @@ void nand_led(bool onoff)
int nand_read_sectors(IF_MV2(int drive,) unsigned long start, int incount,
void* inbuf)
{
-
+ (void)start;
+ (void)incount;
+ (void)inbuf;
+ return 0;
}
int nand_write_sectors(IF_MV2(int drive,) unsigned long start, int count,
const void* outbuf)
{
+ (void)start;
+ (void)count;
+ (void)outbuf;
+ return 0;
}
void nand_spindown(int seconds)
@@ -82,8 +89,22 @@ int nand_soft_reset(void)
void nand_enable(bool on)
{
+ (void)on;
+}
+
+void nand_get_info(IF_MV2(int drive,) struct storage_info *info)
+{
+ (void)info;
+}
+
+long nand_last_disk_activity(void)
+{
+ return 0;
}
int nand_init(void)
{
+ initialized = true;
+ return 0;
}
+
diff --git a/firmware/target/arm/s5l8700/fmradio-i2c-meizu.c b/firmware/target/arm/s5l8700/fmradio-i2c-meizu.c
index 5a4113a6a5..38c24511cf 100644
--- a/firmware/target/arm/s5l8700/fmradio-i2c-meizu.c
+++ b/firmware/target/arm/s5l8700/fmradio-i2c-meizu.c
@@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/
* $Id$
*
- * Copyright (C) 2008 by Bertrik Sikken
+ * Copyright (C) 2009 by Bertrik Sikken
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/firmware/target/arm/s5l8700/i2c-s5l8700.c b/firmware/target/arm/s5l8700/i2c-s5l8700.c
index b2b2f37e2b..762db9abc2 100644
--- a/firmware/target/arm/s5l8700/i2c-s5l8700.c
+++ b/firmware/target/arm/s5l8700/i2c-s5l8700.c
@@ -33,8 +33,9 @@
* data, pointer to data to be transfered
A return value < 0 indicates an error.
- Known issues:
- * uses polled mode (not interrupt driven), just like the OF
+ Note:
+ * blocks the calling thread for the entire duraton of the i2c transfer but
+ uses wakeup_wait/wakeup_signal to allow other threads to run.
* ACK from slave is not checked, so functions never return an error
*/
diff --git a/firmware/target/arm/s5l8700/kernel-s5l8700.c b/firmware/target/arm/s5l8700/kernel-s5l8700.c
index b905ade0c1..cfa13aab2c 100644
--- a/firmware/target/arm/s5l8700/kernel-s5l8700.c
+++ b/firmware/target/arm/s5l8700/kernel-s5l8700.c
@@ -44,7 +44,7 @@ void tick_start(unsigned int interval_in_ms)
/* configure timer for 10 kHz */
TBCMD = (1 << 1); /* TB_CLR */
- TBPRE = 625; /* prescaler */
+ TBPRE = 624; /* prescaler */
TBCON = (0 << 13) | /* TB_INT1_EN */
(1 << 12) | /* TB_INT0_EN */
(0 << 11) | /* TB_START */
diff --git a/firmware/target/arm/s5l8700/meizu-m3/lcd-m3.c b/firmware/target/arm/s5l8700/meizu-m3/lcd-m3.c
index 01f03d3584..2c52faeb8c 100644
--- a/firmware/target/arm/s5l8700/meizu-m3/lcd-m3.c
+++ b/firmware/target/arm/s5l8700/meizu-m3/lcd-m3.c
@@ -72,7 +72,7 @@ static void lcd_sleep(uint32_t t)
for(i=0;i<t;++i);
}
-static uint8_t lcd_readdata()
+static uint8_t lcd_readdata(void)
{
LCD_RDATA = 0;
lcd_sleep(64);
@@ -87,7 +87,7 @@ static void lcd_writereg(uint32_t reg, uint32_t data)
LCD_WDATA = data & 0xff;
}
-void lcd_on() {
+void lcd_on(void) {
if (lcd_type == 1) {
LCD_WCMD = 0x29;
} else {
@@ -101,7 +101,7 @@ void lcd_on() {
}
}
-void lcd_off() {
+void lcd_off(void) {
/* FIXME wait for DMA to finnish */
if (lcd_type == 1) {
LCD_WCMD = 0x28;
@@ -303,3 +303,11 @@ void lcd_update_rect(int x, int y, int width, int height)
{
lcd_update();
}
+
+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)
+{
+ /* stub */
+}
+
diff --git a/firmware/target/arm/s5l8700/timer-s5l8700.c b/firmware/target/arm/s5l8700/timer-s5l8700.c
index f9bef1c956..3e8e7d7ad4 100644
--- a/firmware/target/arm/s5l8700/timer-s5l8700.c
+++ b/firmware/target/arm/s5l8700/timer-s5l8700.c
@@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/
* $Id$
*
-* Copyright (C) 2008 Rafaël Carré
+* Copyright (C) 2009 Bertrik Sikken
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License