diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-01-23 14:50:31 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-01-23 14:50:31 +0100 |
commit | 016bc2452fba583561f91a8b15a492bf4fdc4d6b (patch) | |
tree | 35995b16f98f1db1512751aaf52b479b5bb03efe /firmware/target/hosted | |
parent | 01525419af228e72b2429e3fd89b7ce82ee782a0 (diff) | |
download | rockbox-016bc2452fba583561f91a8b15a492bf4fdc4d6b.tar.gz rockbox-016bc2452fba583561f91a8b15a492bf4fdc4d6b.zip |
ypr0: Allow dection of multiple button presses at the same time.
Reading from /dev/r0Btn only allowed to read one button at a time. Reading GPIO
directly via ioctl() doesn't have this limitation.
This adds a more complete GPIO list also.
Change-Id: If47b0846472f0817305dbf930731255f875e0269
Author: Lorenzo Miori
Diffstat (limited to 'firmware/target/hosted')
-rw-r--r-- | firmware/target/hosted/ypr0/button-target.h | 2 | ||||
-rw-r--r-- | firmware/target/hosted/ypr0/button-ypr0.c | 95 | ||||
-rw-r--r-- | firmware/target/hosted/ypr0/gpio_ypr0.h | 31 |
3 files changed, 60 insertions, 68 deletions
diff --git a/firmware/target/hosted/ypr0/button-target.h b/firmware/target/hosted/ypr0/button-target.h index d7b95de785..3a3866932a 100644 --- a/firmware/target/hosted/ypr0/button-target.h +++ b/firmware/target/hosted/ypr0/button-target.h | |||
@@ -35,7 +35,7 @@ void button_close_device(void); | |||
35 | #define BUTTON_POWER 0x00000080 | 35 | #define BUTTON_POWER 0x00000080 |
36 | #define BUTTON_SELECT 0x00000100 | 36 | #define BUTTON_SELECT 0x00000100 |
37 | 37 | ||
38 | #define BUTTON_MAIN 0x1FF /* all buttons */ | 38 | #define BUTTON_MAIN (BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT|BUTTON_USER|BUTTON_MENU|BUTTON_BACK|BUTTON_POWER|BUTTON_SELECT) /* all buttons */ |
39 | 39 | ||
40 | /* Software power-off */ | 40 | /* Software power-off */ |
41 | #define POWEROFF_BUTTON BUTTON_POWER | 41 | #define POWEROFF_BUTTON BUTTON_POWER |
diff --git a/firmware/target/hosted/ypr0/button-ypr0.c b/firmware/target/hosted/ypr0/button-ypr0.c index 5953bcebf9..e66ca22737 100644 --- a/firmware/target/hosted/ypr0/button-ypr0.c +++ b/firmware/target/hosted/ypr0/button-ypr0.c | |||
@@ -19,69 +19,47 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include <stdio.h> | ||
23 | #include <unistd.h> | ||
24 | #include <fcntl.h> | ||
25 | #include <stdlib.h> /* EXIT_SUCCESS */ | ||
26 | #include "config.h" | 22 | #include "config.h" |
27 | #include "button.h" | 23 | #include "button.h" |
28 | #include "kernel.h" | 24 | #include "kernel.h" |
29 | #include "system.h" | 25 | #include "system.h" |
30 | #include "button-target.h" | 26 | #include "button-target.h" |
31 | #include <gpio_ypr0.h> /* For headphones sense */ | 27 | #include <gpio_ypr0.h> /* For headphones sense and buttons */ |
32 | 28 | ||
33 | /* R0 physical key codes */ | 29 | int button_read_device(void) |
34 | enum ypr0_buttons { | ||
35 | R0BTN_NONE = BUTTON_NONE, | ||
36 | R0BTN_POWER = 1, | ||
37 | R0BTN_UP, | ||
38 | R0BTN_DOWN, | ||
39 | R0BTN_RIGHT, | ||
40 | R0BTN_LEFT, | ||
41 | R0BTN_CENTRAL, | ||
42 | R0BTN_MENU, | ||
43 | R0BTN_BACK, | ||
44 | R0BTN_3DOTS = 11, | ||
45 | }; | ||
46 | |||
47 | |||
48 | static int r0_btn_fd = 0; | ||
49 | |||
50 | /* Samsung keypad driver doesn't allow multiple key combinations :( */ | ||
51 | static enum ypr0_buttons r0_read_key(void) | ||
52 | { | 30 | { |
53 | unsigned char keys; | 31 | int key = BUTTON_NONE; |
54 | |||
55 | if (r0_btn_fd < 0) | ||
56 | return 0; | ||
57 | |||
58 | if (read(r0_btn_fd, &keys, 1)) | ||
59 | return keys; | ||
60 | 32 | ||
61 | return 0; | 33 | /* Check for all the keys */ |
62 | } | 34 | if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_USER_KEY, 0, 0)) { |
63 | 35 | key |= BUTTON_USER; | |
64 | /* Conversion from physical keypress code to logic key code */ | 36 | } |
65 | static int key_to_button(enum ypr0_buttons keyboard_button) | 37 | if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_CENTRAL_KEY, 0, 0)) { |
66 | { | 38 | key |= BUTTON_SELECT; |
67 | switch (keyboard_button) | 39 | } |
68 | { | 40 | if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_UP_KEY, 0, 0)) { |
69 | default: return BUTTON_NONE; | 41 | key |= BUTTON_UP; |
70 | case R0BTN_POWER: return BUTTON_POWER; | 42 | } |
71 | case R0BTN_UP: return BUTTON_UP; | 43 | if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_DOWN_KEY, 0, 0)) { |
72 | case R0BTN_DOWN: return BUTTON_DOWN; | 44 | key |= BUTTON_DOWN; |
73 | case R0BTN_RIGHT: return BUTTON_RIGHT; | 45 | } |
74 | case R0BTN_LEFT: return BUTTON_LEFT; | 46 | if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_LEFT_KEY, 0, 0)) { |
75 | case R0BTN_CENTRAL: return BUTTON_SELECT; | 47 | key |= BUTTON_LEFT; |
76 | case R0BTN_MENU: return BUTTON_MENU; | 48 | } |
77 | case R0BTN_BACK: return BUTTON_BACK; | 49 | if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_RIGHT_KEY, 0, 0)) { |
78 | case R0BTN_3DOTS: return BUTTON_USER; | 50 | key |= BUTTON_RIGHT; |
51 | } | ||
52 | if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_MENU_KEY, 0, 0)) { | ||
53 | key |= BUTTON_MENU; | ||
54 | } | ||
55 | if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_BACK_KEY, 0, 0)) { | ||
56 | key |= BUTTON_BACK; | ||
57 | } | ||
58 | if (gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_POWER_KEY, 0, 0)) { | ||
59 | key |= BUTTON_POWER; | ||
79 | } | 60 | } |
80 | } | ||
81 | 61 | ||
82 | int button_read_device(void) | 62 | return key; |
83 | { | ||
84 | return key_to_button(r0_read_key()); | ||
85 | } | 63 | } |
86 | 64 | ||
87 | bool headphones_inserted(void) | 65 | bool headphones_inserted(void) |
@@ -90,26 +68,19 @@ bool headphones_inserted(void) | |||
90 | return !gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_HEADPHONE_SENSE, 0, 0); | 68 | return !gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_HEADPHONE_SENSE, 0, 0); |
91 | } | 69 | } |
92 | 70 | ||
93 | /* Open the keypad device: it is offered by r0Btn.ko module */ | ||
94 | void button_init_device(void) | 71 | void button_init_device(void) |
95 | { | 72 | { |
96 | r0_btn_fd = open("/dev/r0Btn", O_RDONLY); | ||
97 | if (r0_btn_fd < 0) | ||
98 | printf("/dev/r0Btn open error!"); | ||
99 | |||
100 | /* Setup GPIO pin for headphone sense, copied from OF */ | 73 | /* Setup GPIO pin for headphone sense, copied from OF */ |
101 | gpio_control(DEV_CTRL_GPIO_SET_MUX, GPIO_HEADPHONE_SENSE, CONFIG_SION, PAD_CTL_47K_PU); | 74 | gpio_control(DEV_CTRL_GPIO_SET_MUX, GPIO_HEADPHONE_SENSE, CONFIG_SION, PAD_CTL_47K_PU); |
102 | gpio_control(DEV_CTRL_GPIO_SET_INPUT, GPIO_HEADPHONE_SENSE, CONFIG_SION, PAD_CTL_47K_PU); | 75 | gpio_control(DEV_CTRL_GPIO_SET_INPUT, GPIO_HEADPHONE_SENSE, CONFIG_SION, PAD_CTL_47K_PU); |
76 | |||
77 | /* No need to initialize any GPIO pin, since this is done loading the r0Btn module */ | ||
103 | } | 78 | } |
104 | 79 | ||
105 | #ifdef BUTTON_DRIVER_CLOSE | 80 | #ifdef BUTTON_DRIVER_CLOSE |
106 | /* I'm not sure it's called at shutdown...give a check! */ | 81 | /* I'm not sure it's called at shutdown...give a check! */ |
107 | void button_close_device(void) | 82 | void button_close_device(void) |
108 | { | 83 | { |
109 | if (r0_btn_fd >= 0) { | ||
110 | close(r0_btn_fd); | ||
111 | printf("/dev/r0Btn closed!"); | ||
112 | } | ||
113 | /* Don't know the precise meaning, but it's done as in the OF, so copied there */ | 84 | /* Don't know the precise meaning, but it's done as in the OF, so copied there */ |
114 | gpio_control(DEV_CTRL_GPIO_UNSET_MUX, GPIO_HEADPHONE_SENSE, CONFIG_SION, 0); | 85 | gpio_control(DEV_CTRL_GPIO_UNSET_MUX, GPIO_HEADPHONE_SENSE, CONFIG_SION, 0); |
115 | } | 86 | } |
diff --git a/firmware/target/hosted/ypr0/gpio_ypr0.h b/firmware/target/hosted/ypr0/gpio_ypr0.h index ddf7100b2f..3c2033baff 100644 --- a/firmware/target/hosted/ypr0/gpio_ypr0.h +++ b/firmware/target/hosted/ypr0/gpio_ypr0.h | |||
@@ -27,11 +27,32 @@ | |||
27 | 27 | ||
28 | /* Some meaningful pins used in the R0 */ | 28 | /* Some meaningful pins used in the R0 */ |
29 | 29 | ||
30 | #define GPIO_HEADPHONE_SENSE GPIO1_5 | 30 | #define GPIO_HEADPHONE_SENSE GPIO1_5 |
31 | //26 | 31 | #define GPIO_EXT_PWR_SENSE GPIO1_26 |
32 | #define GPIO_EXT_PWR_SENSE GPIO1_26 | 32 | #define GPIO_SD_SENSE GPIO2_27 |
33 | //59 | 33 | #define GPIO_AS3543_INTERUPT GPIO1_25 |
34 | #define GPIO_SD_SENSE GPIO2_24 | 34 | #define GPIO_PCB_VER_DETECT GPIO_10 |
35 | /* I2C bus for AS3543 codec */ | ||
36 | #define GPIO_I2C_CLK0 GPIO_1_0 | ||
37 | #define GPIO_I2C_DAT0 GPIO_1_1 | ||
38 | /* I2C bus for the SI4079 FM radio chip */ | ||
39 | #define GPIO_I2C_CLK1 GPIO_2_12 | ||
40 | #define GPIO_I2C_DAT1 GPIO_2_13 | ||
41 | #define GPIO_FM_SEARCH GPIO1_4 | ||
42 | #define GPIO_FM_BUS_EN GPIO2_19 | ||
43 | |||
44 | /* Keypad */ | ||
45 | |||
46 | #define GPIO_BACK_KEY GPIO2_29 | ||
47 | #define GPIO_USER_KEY GPIO2_30 | ||
48 | #define GPIO_MENU_KEY GPIO2_31 | ||
49 | #define GPIO_POWER_KEY GPIO2_16 | ||
50 | #define GPIO_CENTRAL_KEY GPIO3_5 | ||
51 | #define GPIO_UP_KEY GPIO3_9 | ||
52 | #define GPIO_DOWN_KEY GPIO3_8 | ||
53 | #define GPIO_LEFT_KEY GPIO2_28 | ||
54 | #define GPIO_RIGHT_KEY GPIO3_7 | ||
55 | |||
35 | 56 | ||
36 | void gpio_init(void); | 57 | void gpio_init(void); |
37 | void gpio_close(void); | 58 | void gpio_close(void); |