diff options
Diffstat (limited to 'firmware/target/arm/imx233/creative-zen/button-zen.c')
-rw-r--r-- | firmware/target/arm/imx233/creative-zen/button-zen.c | 16 |
1 files changed, 15 insertions, 1 deletions
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 | } |