diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2010-01-14 20:16:03 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2010-01-14 20:16:03 +0000 |
commit | b3cba9021f0b5437afbacc286b5e026c84ef7141 (patch) | |
tree | e2d81af292de964188c26c7a5de312732978c949 /firmware/target/arm/s5l8700/meizu-m6sp | |
parent | 75400545be5fbec85517a20ac6a85e1beb7da6ff (diff) | |
download | rockbox-b3cba9021f0b5437afbacc286b5e026c84ef7141.tar.gz rockbox-b3cba9021f0b5437afbacc286b5e026c84ef7141.zip |
Meizu M6SP: add stubs so the meizu m6sp binary compiles and links
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24228 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/s5l8700/meizu-m6sp')
-rw-r--r-- | firmware/target/arm/s5l8700/meizu-m6sp/lcd-m6sp.c | 23 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/meizu-m6sp/nand-target.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/meizu-m6sp/powermgmt-m6sp.c | 64 |
3 files changed, 89 insertions, 0 deletions
diff --git a/firmware/target/arm/s5l8700/meizu-m6sp/lcd-m6sp.c b/firmware/target/arm/s5l8700/meizu-m6sp/lcd-m6sp.c index fa3d5aa7f2..8e6a653f1b 100644 --- a/firmware/target/arm/s5l8700/meizu-m6sp/lcd-m6sp.c +++ b/firmware/target/arm/s5l8700/meizu-m6sp/lcd-m6sp.c | |||
@@ -56,6 +56,7 @@ | |||
56 | #define LCD_TYPE1_ID 0x139 /* id for LCD type S6D0139 */ | 56 | #define LCD_TYPE1_ID 0x139 /* id for LCD type S6D0139 */ |
57 | 57 | ||
58 | static int lcd_type = 0; | 58 | static int lcd_type = 0; |
59 | static bool lcd_is_active = false; | ||
59 | 60 | ||
60 | /* simple and crude delay */ | 61 | /* simple and crude delay */ |
61 | static void lcd_delay(int count) | 62 | static void lcd_delay(int count) |
@@ -357,6 +358,13 @@ void lcd_enable(bool on) | |||
357 | /* disable controller clock */ | 358 | /* disable controller clock */ |
358 | PWRCON |= (1 << 18); | 359 | PWRCON |= (1 << 18); |
359 | } | 360 | } |
361 | |||
362 | lcd_is_active = on; | ||
363 | } | ||
364 | |||
365 | bool lcd_active(void) | ||
366 | { | ||
367 | return lcd_is_active; | ||
360 | } | 368 | } |
361 | 369 | ||
362 | /* initialise the lcd controller inside the s5l8700 */ | 370 | /* initialise the lcd controller inside the s5l8700 */ |
@@ -468,3 +476,18 @@ void lcd_update(void) | |||
468 | lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT); | 476 | lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT); |
469 | } | 477 | } |
470 | 478 | ||
479 | void lcd_blit_yuv(unsigned char * const src[3], | ||
480 | int src_x, int src_y, int stride, | ||
481 | int x, int y, int width, int height) | ||
482 | { | ||
483 | (void)src; | ||
484 | (void)src_x; | ||
485 | (void)src_y; | ||
486 | (void)stride; | ||
487 | (void)x; | ||
488 | (void)y; | ||
489 | (void)width; | ||
490 | (void)height; | ||
491 | /* TODO: not implemented yet */ | ||
492 | } | ||
493 | |||
diff --git a/firmware/target/arm/s5l8700/meizu-m6sp/nand-target.h b/firmware/target/arm/s5l8700/meizu-m6sp/nand-target.h index 67d2220185..dee690e5e6 100644 --- a/firmware/target/arm/s5l8700/meizu-m6sp/nand-target.h +++ b/firmware/target/arm/s5l8700/meizu-m6sp/nand-target.h | |||
@@ -49,6 +49,8 @@ uint32_t nand_block_erase(uint32_t bank, uint32_t page); | |||
49 | const struct nand_device_info_type* nand_get_device_type(uint32_t bank); | 49 | const struct nand_device_info_type* nand_get_device_type(uint32_t bank); |
50 | uint32_t nand_reset(uint32_t bank); | 50 | uint32_t nand_reset(uint32_t bank); |
51 | uint32_t nand_device_init(void); | 51 | uint32_t nand_device_init(void); |
52 | void nand_set_active(void); | ||
53 | long nand_last_activity(void); | ||
52 | void nand_power_up(void); | 54 | void nand_power_up(void); |
53 | void nand_power_down(void); | 55 | void nand_power_down(void); |
54 | 56 | ||
diff --git a/firmware/target/arm/s5l8700/meizu-m6sp/powermgmt-m6sp.c b/firmware/target/arm/s5l8700/meizu-m6sp/powermgmt-m6sp.c new file mode 100644 index 0000000000..86b6e46b4d --- /dev/null +++ b/firmware/target/arm/s5l8700/meizu-m6sp/powermgmt-m6sp.c | |||
@@ -0,0 +1,64 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright © 2008 Rafaël Carré | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | #include "config.h" | ||
23 | #include "powermgmt.h" | ||
24 | #include "adc.h" | ||
25 | #include "adc-target.h" | ||
26 | |||
27 | const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = | ||
28 | { | ||
29 | /* TODO: this is just an initial guess */ | ||
30 | 3400 | ||
31 | }; | ||
32 | |||
33 | const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = | ||
34 | { | ||
35 | /* TODO: this is just an initial guess */ | ||
36 | 3300 | ||
37 | }; | ||
38 | |||
39 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */ | ||
40 | const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = | ||
41 | { | ||
42 | /* TODO: simple uncalibrated curve, linear except for first 10% */ | ||
43 | { 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200 } | ||
44 | }; | ||
45 | |||
46 | #if CONFIG_CHARGING | ||
47 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ | ||
48 | const unsigned short percent_to_volt_charge[11] = | ||
49 | { | ||
50 | /* TODO: simple uncalibrated curve, linear except for first 10% */ | ||
51 | 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200 | ||
52 | }; | ||
53 | #endif /* CONFIG_CHARGING */ | ||
54 | |||
55 | /* ADC should read 0x3ff=6.00V */ | ||
56 | #define BATTERY_SCALE_FACTOR 6000 | ||
57 | /* full-scale ADC readout (2^10) in millivolt */ | ||
58 | |||
59 | |||
60 | /* Returns battery voltage from ADC [millivolts] */ | ||
61 | unsigned int battery_adc_voltage(void) | ||
62 | { | ||
63 | return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 10; | ||
64 | } | ||