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

zenxfi2: switch to new button driver

Browse source 
Change-Id: I5c5bc33d0cc08316e4d853e81a5ba4fb9c5b08d9
This commit is contained in:
Amaury Pouly 2014-02-22 20:36:02 +01:00
parent 8660393c9f
commit a750b73352
1 changed files with 12 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

38
firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c
View file

@ -27,6 +27,15 @@
#include "usb.h" #include "usb.h"
#include "touchscreen.h" #include "touchscreen.h"
#include "touchscreen-imx233.h" #include "touchscreen-imx233.h"
#include "button-imx233.h"
struct imx233_button_map_t imx233_button_map[] =
{
IMX233_BUTTON(POWER, GPIO(0, 11), "power", INVERTED),
IMX233_BUTTON(MENU, GPIO(0, 14), "menu", INVERTED),
IMX233_BUTTON_(JACK, GPIO(2, 7), "jack"),
IMX233_BUTTON_(END, END(), "")
};
struct touch_calibration_point struct touch_calibration_point
{ {
@ -69,19 +78,8 @@ void button_init_device(void)
imx233_touchscreen_init(); imx233_touchscreen_init();
imx233_touchscreen_enable(true); imx233_touchscreen_enable(true);
/* generic */
/* power button */ imx233_button_init();
imx233_pinctrl_acquire(0, 11, "power");
imx233_pinctrl_set_function(0, 11, PINCTRL_FUNCTION_GPIO);
imx233_pinctrl_enable_gpio(0, 11, false);
/* select button */
imx233_pinctrl_acquire(0, 14, "select");
imx233_pinctrl_set_function(0, 14, PINCTRL_FUNCTION_GPIO);
imx233_pinctrl_enable_gpio(0, 14, false);
/* jack detect */
imx233_pinctrl_acquire(2, 7, "jack_detect");
imx233_pinctrl_set_function(2, 7, PINCTRL_FUNCTION_GPIO);
imx233_pinctrl_enable_gpio(2, 7, false);
} }
static int touch_to_pixels(int *val_x, int *val_y) static int touch_to_pixels(int *val_x, int *val_y)
@ -123,19 +121,7 @@ static int touchscreen_read_device(int *data)
return touchscreen_to_pixels(x, y, data); return touchscreen_to_pixels(x, y, data);
} }
bool headphones_inserted(void)
{
return imx233_pinctrl_get_gpio(2, 7);
}
int button_read_device(int *data) int button_read_device(int *data)
{ {
int res = 0; return imx233_button_read(touchscreen_read_device(data));
/* B0P11: #power
* B0P14: #select */
if(!imx233_pinctrl_get_gpio(0, 11))
res |= BUTTON_POWER;
if(!imx233_pinctrl_get_gpio(0, 14))
res |= BUTTON_MENU;
return res | touchscreen_read_device(data);
} }