diff options
Diffstat (limited to 'firmware/target/arm/imx233/creative-zen')
4 files changed, 37 insertions, 3 deletions
diff --git a/firmware/target/arm/imx233/creative-zen/backlight-zen.c b/firmware/target/arm/imx233/creative-zen/backlight-zen.c index 0d223b52e9..74e1e91a49 100644 --- a/firmware/target/arm/imx233/creative-zen/backlight-zen.c +++ b/firmware/target/arm/imx233/creative-zen/backlight-zen.c | |||
@@ -29,6 +29,9 @@ | |||
29 | 29 | ||
30 | void _backlight_set_brightness(int level) | 30 | void _backlight_set_brightness(int level) |
31 | { | 31 | { |
32 | #ifdef CREATIVE_ZENV | ||
33 | lcd_set_contrast(level); | ||
34 | #else | ||
32 | unsigned val = (level + 200) * level / 1000; | 35 | unsigned val = (level + 200) * level / 1000; |
33 | if(level != 0) | 36 | if(level != 0) |
34 | { | 37 | { |
@@ -39,14 +42,17 @@ void _backlight_set_brightness(int level) | |||
39 | } | 42 | } |
40 | else | 43 | else |
41 | imx233_pinctrl_set_gpio(1, 12, false); | 44 | imx233_pinctrl_set_gpio(1, 12, false); |
45 | #endif | ||
42 | } | 46 | } |
43 | 47 | ||
44 | bool _backlight_init(void) | 48 | bool _backlight_init(void) |
45 | { | 49 | { |
50 | #ifndef CREATIVE_ZENV | ||
46 | imx233_pinctrl_acquire(1, 12, "backlight_enable"); | 51 | imx233_pinctrl_acquire(1, 12, "backlight_enable"); |
47 | imx233_pinctrl_set_function(1, 12, PINCTRL_FUNCTION_GPIO); | 52 | imx233_pinctrl_set_function(1, 12, PINCTRL_FUNCTION_GPIO); |
48 | imx233_pinctrl_enable_gpio(1, 12, true); | 53 | imx233_pinctrl_enable_gpio(1, 12, true); |
49 | imx233_uartdbg_init(BAUD_38400); | 54 | imx233_uartdbg_init(BAUD_38400); |
55 | #endif | ||
50 | return true; | 56 | return true; |
51 | } | 57 | } |
52 | 58 | ||
diff --git a/firmware/target/arm/imx233/creative-zen/button-target.h b/firmware/target/arm/imx233/creative-zen/button-target.h index cddff4d9cc..7974ae42ad 100644 --- a/firmware/target/arm/imx233/creative-zen/button-target.h +++ b/firmware/target/arm/imx233/creative-zen/button-target.h | |||
@@ -47,8 +47,12 @@ bool button_debug_screen(void); | |||
47 | #define BUTTON_TOPLEFT 0x00001000 | 47 | #define BUTTON_TOPLEFT 0x00001000 |
48 | #define BUTTON_TOPRIGHT 0x00002000 | 48 | #define BUTTON_TOPRIGHT 0x00002000 |
49 | #endif | 49 | #endif |
50 | #ifdef CREATIVE_ZENV | ||
51 | #define BUTTON_VOL_UP 0x00004000 | ||
52 | #define BUTTON_VOL_DOWN 0x00008000 | ||
53 | #endif | ||
50 | 54 | ||
51 | #define BUTTON_MAIN 0x00003fff | 55 | #define BUTTON_MAIN 0x0000ffff |
52 | 56 | ||
53 | /* Software power-off */ | 57 | /* Software power-off */ |
54 | #define POWEROFF_BUTTON BUTTON_POWER | 58 | #define POWEROFF_BUTTON BUTTON_POWER |
diff --git a/firmware/target/arm/imx233/creative-zen/button-zen.c b/firmware/target/arm/imx233/creative-zen/button-zen.c index 1997f91357..8f20961a57 100644 --- a/firmware/target/arm/imx233/creative-zen/button-zen.c +++ b/firmware/target/arm/imx233/creative-zen/button-zen.c | |||
@@ -57,6 +57,20 @@ struct imx233_button_lradc_mapping_t imx233_button_lradc_mapping[] = | |||
57 | {2945, BUTTON_PLAYPAUSE}, | 57 | {2945, BUTTON_PLAYPAUSE}, |
58 | {3400, 0}, | 58 | {3400, 0}, |
59 | {0, IMX233_BUTTON_LRADC_END}, | 59 | {0, IMX233_BUTTON_LRADC_END}, |
60 | #elif defined(CREATIVE_ZENV) | ||
61 | {190, IMX233_BUTTON_LRADC_HOLD}, | ||
62 | {250, BUTTON_PLAYPAUSE}, | ||
63 | {530, BUTTON_BACK}, | ||
64 | {785, BUTTON_VOL_UP}, | ||
65 | {1040, BUTTON_VOL_DOWN}, | ||
66 | {1295, BUTTON_MENU}, | ||
67 | {1540, BUTTON_UP}, | ||
68 | {1800, BUTTON_SELECT}, | ||
69 | {2070, BUTTON_LEFT}, | ||
70 | {2315, BUTTON_RIGHT}, | ||
71 | {2550, BUTTON_DOWN}, | ||
72 | {3450, 0}, | ||
73 | {0, IMX233_BUTTON_LRADC_END}, | ||
60 | #elif defined(CREATIVE_ZENMOZAIC) | 74 | #elif defined(CREATIVE_ZENMOZAIC) |
61 | {0, IMX233_BUTTON_LRADC_HOLD}, | 75 | {0, IMX233_BUTTON_LRADC_HOLD}, |
62 | {200, BUTTON_MENU}, | 76 | {200, BUTTON_MENU}, |
@@ -100,7 +114,7 @@ bool headphones_inserted(void) | |||
100 | int button_read_device(void) | 114 | int button_read_device(void) |
101 | { | 115 | { |
102 | int btn = 0; | 116 | int btn = 0; |
103 | if(BF_RD(POWER_STS, PSWITCH) == 1) | 117 | if(imx233_power_read_pswitch() == 1) |
104 | btn |= BUTTON_POWER; | 118 | btn |= BUTTON_POWER; |
105 | return imx233_button_lradc_read(btn); | 119 | return imx233_button_lradc_read(btn); |
106 | } | 120 | } |
diff --git a/firmware/target/arm/imx233/creative-zen/power-zen.c b/firmware/target/arm/imx233/creative-zen/power-zen.c index 2c68325432..c1ad5989c0 100644 --- a/firmware/target/arm/imx233/creative-zen/power-zen.c +++ b/firmware/target/arm/imx233/creative-zen/power-zen.c | |||
@@ -58,4 +58,14 @@ bool tuner_power(bool enable) | |||
58 | bool tuner_powered(void) | 58 | bool tuner_powered(void) |
59 | { | 59 | { |
60 | return tuner_enable; | 60 | return tuner_enable; |
61 | } \ No newline at end of file | 61 | } |
62 | |||
63 | void ide_power_enable(bool on) | ||
64 | { | ||
65 | (void) on; | ||
66 | } | ||
67 | |||
68 | bool ide_powered(void) | ||
69 | { | ||
70 | return true; | ||
71 | } | ||