mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-11-10 21:52:28 -05:00
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
This commit is contained in:
parent
01525419af
commit
016bc2452f
3 changed files with 62 additions and 70 deletions
|
|
@ -19,69 +19,47 @@
|
|||
*
|
||||
****************************************************************************/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h> /* EXIT_SUCCESS */
|
||||
#include "config.h"
|
||||
#include "button.h"
|
||||
#include "kernel.h"
|
||||
#include "system.h"
|
||||
#include "button-target.h"
|
||||
#include <gpio_ypr0.h> /* For headphones sense */
|
||||
|
||||
/* R0 physical key codes */
|
||||
enum ypr0_buttons {
|
||||
R0BTN_NONE = BUTTON_NONE,
|
||||
R0BTN_POWER = 1,
|
||||
R0BTN_UP,
|
||||
R0BTN_DOWN,
|
||||
R0BTN_RIGHT,
|
||||
R0BTN_LEFT,
|
||||
R0BTN_CENTRAL,
|
||||
R0BTN_MENU,
|
||||
R0BTN_BACK,
|
||||
R0BTN_3DOTS = 11,
|
||||
};
|
||||
|
||||
|
||||
static int r0_btn_fd = 0;
|
||||
|
||||
/* Samsung keypad driver doesn't allow multiple key combinations :( */
|
||||
static enum ypr0_buttons r0_read_key(void)
|
||||
{
|
||||
unsigned char keys;
|
||||
|
||||
if (r0_btn_fd < 0)
|
||||
return 0;
|
||||
|
||||
if (read(r0_btn_fd, &keys, 1))
|
||||
return keys;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Conversion from physical keypress code to logic key code */
|
||||
static int key_to_button(enum ypr0_buttons keyboard_button)
|
||||
{
|
||||
switch (keyboard_button)
|
||||
{
|
||||
default: return BUTTON_NONE;
|
||||
case R0BTN_POWER: return BUTTON_POWER;
|
||||
case R0BTN_UP: return BUTTON_UP;
|
||||
case R0BTN_DOWN: return BUTTON_DOWN;
|
||||
case R0BTN_RIGHT: return BUTTON_RIGHT;
|
||||
case R0BTN_LEFT: return BUTTON_LEFT;
|
||||
case R0BTN_CENTRAL: return BUTTON_SELECT;
|
||||
case R0BTN_MENU: return BUTTON_MENU;
|
||||
case R0BTN_BACK: return BUTTON_BACK;
|
||||
case R0BTN_3DOTS: return BUTTON_USER;
|
||||
}
|
||||
}
|
||||
#include <gpio_ypr0.h> /* For headphones sense and buttons */
|
||||
|
||||
int button_read_device(void)
|
||||
{
|
||||
return key_to_button(r0_read_key());
|
||||
int key = BUTTON_NONE;
|
||||
|
||||
/* Check for all the keys */
|
||||
if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_USER_KEY, 0, 0)) {
|
||||
key |= BUTTON_USER;
|
||||
}
|
||||
if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_CENTRAL_KEY, 0, 0)) {
|
||||
key |= BUTTON_SELECT;
|
||||
}
|
||||
if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_UP_KEY, 0, 0)) {
|
||||
key |= BUTTON_UP;
|
||||
}
|
||||
if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_DOWN_KEY, 0, 0)) {
|
||||
key |= BUTTON_DOWN;
|
||||
}
|
||||
if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_LEFT_KEY, 0, 0)) {
|
||||
key |= BUTTON_LEFT;
|
||||
}
|
||||
if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_RIGHT_KEY, 0, 0)) {
|
||||
key |= BUTTON_RIGHT;
|
||||
}
|
||||
if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_MENU_KEY, 0, 0)) {
|
||||
key |= BUTTON_MENU;
|
||||
}
|
||||
if (!gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_BACK_KEY, 0, 0)) {
|
||||
key |= BUTTON_BACK;
|
||||
}
|
||||
if (gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_POWER_KEY, 0, 0)) {
|
||||
key |= BUTTON_POWER;
|
||||
}
|
||||
|
||||
return key;
|
||||
}
|
||||
|
||||
bool headphones_inserted(void)
|
||||
|
|
@ -90,26 +68,19 @@ bool headphones_inserted(void)
|
|||
return !gpio_control(DEV_CTRL_GPIO_IS_HIGH, GPIO_HEADPHONE_SENSE, 0, 0);
|
||||
}
|
||||
|
||||
/* Open the keypad device: it is offered by r0Btn.ko module */
|
||||
void button_init_device(void)
|
||||
{
|
||||
r0_btn_fd = open("/dev/r0Btn", O_RDONLY);
|
||||
if (r0_btn_fd < 0)
|
||||
printf("/dev/r0Btn open error!");
|
||||
|
||||
/* Setup GPIO pin for headphone sense, copied from OF */
|
||||
gpio_control(DEV_CTRL_GPIO_SET_MUX, GPIO_HEADPHONE_SENSE, CONFIG_SION, PAD_CTL_47K_PU);
|
||||
gpio_control(DEV_CTRL_GPIO_SET_INPUT, GPIO_HEADPHONE_SENSE, CONFIG_SION, PAD_CTL_47K_PU);
|
||||
|
||||
/* No need to initialize any GPIO pin, since this is done loading the r0Btn module */
|
||||
}
|
||||
|
||||
#ifdef BUTTON_DRIVER_CLOSE
|
||||
/* I'm not sure it's called at shutdown...give a check! */
|
||||
void button_close_device(void)
|
||||
{
|
||||
if (r0_btn_fd >= 0) {
|
||||
close(r0_btn_fd);
|
||||
printf("/dev/r0Btn closed!");
|
||||
}
|
||||
/* Don't know the precise meaning, but it's done as in the OF, so copied there */
|
||||
gpio_control(DEV_CTRL_GPIO_UNSET_MUX, GPIO_HEADPHONE_SENSE, CONFIG_SION, 0);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue