len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-10 21:52:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ypr0: Allow dection of multiple button presses at the same time.

Browse source 
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:
Thomas Martitz 2012-01-23 14:50:31 +01:00
parent 01525419af
commit 016bc2452f
3 changed files with 62 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/target/hosted/ypr0/button-target.h
View file

@ -35,7 +35,7 @@ void button_close_device(void);
#define BUTTON_POWER 0x00000080
#define BUTTON_SELECT 0x00000100
#define BUTTON_MAIN 0x1FF /* all buttons */
#define BUTTON_MAIN (BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT|BUTTON_USER|BUTTON_MENU|BUTTON_BACK|BUTTON_POWER|BUTTON_SELECT) /* all buttons */
/* Software power-off */
#define POWEROFF_BUTTON BUTTON_POWER

99
firmware/target/hosted/ypr0/button-ypr0.c
View file

@ -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);
}

27
firmware/target/hosted/ypr0/gpio_ypr0.h
View file

@ -28,10 +28,31 @@
/* Some meaningful pins used in the R0 */
#define GPIO_HEADPHONE_SENSE GPIO1_5
//26
#define GPIO_EXT_PWR_SENSE GPIO1_26
//59
#define GPIO_SD_SENSE GPIO2_24
#define GPIO_SD_SENSE GPIO2_27
#define GPIO_AS3543_INTERUPT GPIO1_25
#define GPIO_PCB_VER_DETECT GPIO_10
/* I2C bus for AS3543 codec */
#define GPIO_I2C_CLK0 GPIO_1_0
#define GPIO_I2C_DAT0 GPIO_1_1
/* I2C bus for the SI4079 FM radio chip */
#define GPIO_I2C_CLK1 GPIO_2_12
#define GPIO_I2C_DAT1 GPIO_2_13
#define GPIO_FM_SEARCH GPIO1_4
#define GPIO_FM_BUS_EN GPIO2_19
/* Keypad */
#define GPIO_BACK_KEY GPIO2_29
#define GPIO_USER_KEY GPIO2_30
#define GPIO_MENU_KEY GPIO2_31
#define GPIO_POWER_KEY GPIO2_16
#define GPIO_CENTRAL_KEY GPIO3_5
#define GPIO_UP_KEY GPIO3_9
#define GPIO_DOWN_KEY GPIO3_8
#define GPIO_LEFT_KEY GPIO2_28
#define GPIO_RIGHT_KEY GPIO3_7
void gpio_init(void);
void gpio_close(void);