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

zen{,xfi,mozaic,xfistyle,v}: switch to the new button driver

Browse source 
Change-Id: I206b16f6374f536ab6d84e84fefc8370a96ef759
This commit is contained in:
Amaury Pouly 2014-02-22 20:33:20 +01:00
parent 82b86d4316
commit a2bfbe9ebc
3 changed files with 106 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

1
firmware/SOURCES
View file

@ -1203,7 +1203,6 @@ target/arm/imx233/creative-zen/button-zen.c
target/arm/imx233/creative-zen/debug-zen.c target/arm/imx233/creative-zen/debug-zen.c
target/arm/imx233/creative-zen/power-zen.c target/arm/imx233/creative-zen/power-zen.c
target/arm/imx233/creative-zen/powermgmt-zen.c target/arm/imx233/creative-zen/powermgmt-zen.c
target/arm/imx233/button-lradc-imx233.c
#endif #endif
#ifdef CREATIVE_ZENXFI2 #ifdef CREATIVE_ZENXFI2

17
firmware/target/arm/imx233/creative-zen/button-target.h
View file

@ -28,23 +28,6 @@ bool button_debug_screen(void);
/* HOLD button */ /* HOLD button */
#if !defined(CREATIVE_ZENXFISTYLE) #if !defined(CREATIVE_ZENXFISTYLE)
#define HAS_BUTTON_HOLD #define HAS_BUTTON_HOLD
#define IMX233_BUTTON_LRADC_HOLD_DET BLH_ADC
#endif
/* VDDIO value */
#if defined(CREATIVE_ZENXFISTYLE)
#define IMX233_BUTTON_LRADC_VDDIO 3660
#elif defined(CREATIVE_ZEN)
#define IMX233_BUTTON_LRADC_VDDIO 3480
#elif defined(CREATIVE_ZENXFI)
#define IMX233_BUTTON_LRADC_VDDIO 3500
#endif
/* LRADC channel */
#if defined(CREATIVE_ZENXFISTYLE)
#define IMX233_BUTTON_LRADC_CHANNEL 2
#else
#define IMX233_BUTTON_LRADC_CHANNEL 0
#endif #endif
/* Main unit's buttons */ /* Main unit's buttons */

218
firmware/target/arm/imx233/creative-zen/button-zen.c
View file

@ -23,137 +23,131 @@
#include "system-target.h" #include "system-target.h"
#include "pinctrl-imx233.h" #include "pinctrl-imx233.h"
#include "power-imx233.h" #include "power-imx233.h"
#include "button-lradc-imx233.h" #include "button-imx233.h"
#if defined(CREATIVE_ZENXFI) || defined(CREATIVE_ZENMOZAIC) #if defined(CREATIVE_ZENXFISTYLE)
#define JACK_DET_BANK 2 #define CHAN 2
#define JACK_DET_PIN 8 #define I_VDDIO 0 /* index in the table */
#define JACK_DET_INVERTED
#elif defined(CREATIVE_ZENXFISTYLE)
#define JACK_DET_BANK 2
#define JACK_DET_PIN 7
#endif
struct imx233_button_lradc_mapping_t imx233_button_lradc_mapping[] = struct imx233_button_map_t imx233_button_map[] =
{ {
#if defined(CREATIVE_ZEN) [I_VDDIO] = IMX233_BUTTON_(VDDIO, VDDIO(3660), "vddio"), /* we need VDDIO for relative */
{200, IMX233_BUTTON_LRADC_HOLD}, IMX233_BUTTON(MENU, LRADC_REL(CHAN, 230, I_VDDIO), "menu"),
{250, BUTTON_MENU}, IMX233_BUTTON(SHORTCUT, LRADC_REL(CHAN, 480, I_VDDIO), "shortcut"),
{520, BUTTON_SHORTCUT}, IMX233_BUTTON(UP, LRADC_REL(CHAN, 690, I_VDDIO), "up"),
{1490, BUTTON_UP}, IMX233_BUTTON(LEFT, LRADC_REL(CHAN, 920, I_VDDIO), "left"),
{1740, BUTTON_SELECT}, IMX233_BUTTON(RIGHT, LRADC_REL(CHAN, 1120, I_VDDIO), "right"),
{2015, BUTTON_LEFT}, IMX233_BUTTON(DOWN, LRADC_REL(CHAN, 1335, I_VDDIO), "down"),
{2255, BUTTON_RIGHT}, IMX233_BUTTON(SELECT, LRADC_REL(CHAN, 1565, I_VDDIO), "select"),
{2485, BUTTON_DOWN}, IMX233_BUTTON(BACK, LRADC_REL(CHAN, 2850, I_VDDIO), "back"),
{2700, BUTTON_BACK}, IMX233_BUTTON(PLAYPAUSE, LRADC_REL(CHAN, 3110, I_VDDIO), "play"),
{2945, BUTTON_PLAYPAUSE}, IMX233_BUTTON_(JACK, GPIO(2, 7), "jack"),
{3400, 0}, IMX233_BUTTON(POWER, GPIO(0, 11), "power", INVERTED),
{0, IMX233_BUTTON_LRADC_END}, IMX233_BUTTON_(END, END(), "")
};
#elif defined(CREATIVE_ZEN)
#define CHAN 0
#define I_VDDIO 0 /* index in the table */
struct imx233_button_map_t imx233_button_map[] =
{
[I_VDDIO] = IMX233_BUTTON_(VDDIO, VDDIO(3480), "vddio"), /* we need VDDIO for relative */
IMX233_BUTTON_(HOLD, LRADC_REL(CHAN, 200, I_VDDIO), "hold"),
IMX233_BUTTON(MENU, LRADC_REL(CHAN, 250, I_VDDIO), "menu"),
IMX233_BUTTON(SHORTCUT, LRADC_REL(CHAN, 520, I_VDDIO), "shortcut"),
IMX233_BUTTON(UP, LRADC_REL(CHAN, 1490, I_VDDIO), "up"),
IMX233_BUTTON(SELECT, LRADC_REL(CHAN, 1740, I_VDDIO), "select"),
IMX233_BUTTON(LEFT, LRADC_REL(CHAN, 2015, I_VDDIO), "left"),
IMX233_BUTTON(RIGHT, LRADC_REL(CHAN, 2255, I_VDDIO), "right"),
IMX233_BUTTON(DOWN, LRADC_REL(CHAN, 2485, I_VDDIO), "down"),
IMX233_BUTTON(BACK, LRADC_REL(CHAN, 2700, I_VDDIO), "back"),
IMX233_BUTTON(PLAYPAUSE, LRADC_REL(CHAN, 2945, I_VDDIO), "play"),
IMX233_BUTTON(POWER, PSWITCH(1), "power"),
IMX233_BUTTON_(END, END(), "")
};
#elif defined(CREATIVE_ZENXFI) #elif defined(CREATIVE_ZENXFI)
{0, IMX233_BUTTON_LRADC_HOLD}, #define CHAN 0
{200, BUTTON_MENU}, #define I_VDDIO 0 /* index in the table */
{445, BUTTON_SHORTCUT},
{645, BUTTON_UP}, struct imx233_button_map_t imx233_button_map[] =
{860, BUTTON_LEFT}, {
{1060, BUTTON_RIGHT}, [I_VDDIO] = IMX233_BUTTON_(VDDIO, VDDIO(3500), "vddio"), /* we need VDDIO for relative */
{1260, BUTTON_DOWN}, IMX233_BUTTON_(HOLD, LRADC_REL(CHAN, 0, I_VDDIO), "hold"),
{1480, BUTTON_SELECT}, IMX233_BUTTON(MENU, LRADC_REL(CHAN, 200, I_VDDIO), "menu"),
{1700, BUTTON_TOPRIGHT}, IMX233_BUTTON(SHORTCUT, LRADC_REL(CHAN, 445, I_VDDIO), "shortcut"),
{1920, BUTTON_BOTTOMLEFT}, IMX233_BUTTON(UP, LRADC_REL(CHAN, 645, I_VDDIO), "up"),
{2145, BUTTON_TOPLEFT}, IMX233_BUTTON(LEFT, LRADC_REL(CHAN, 860, I_VDDIO), "left"),
{2460, BUTTON_BOTTOMRIGHT}, IMX233_BUTTON(RIGHT, LRADC_REL(CHAN, 1060, I_VDDIO), "right"),
{2700, BUTTON_BACK}, IMX233_BUTTON(DOWN, LRADC_REL(CHAN, 1260, I_VDDIO), "down"),
{2945, BUTTON_PLAYPAUSE}, IMX233_BUTTON(SELECT, LRADC_REL(CHAN, 1480, I_VDDIO), "select"),
{3400, 0}, IMX233_BUTTON(TOPRIGHT, LRADC_REL(CHAN, 1700, I_VDDIO), "topright"),
{0, IMX233_BUTTON_LRADC_END}, IMX233_BUTTON(BOTTOMLEFT, LRADC_REL(CHAN, 1920, I_VDDIO), "bottomleft"),
#elif defined(CREATIVE_ZENV) IMX233_BUTTON(TOPLEFT, LRADC_REL(CHAN, 2145, I_VDDIO), "topleft"),
{190, IMX233_BUTTON_LRADC_HOLD}, IMX233_BUTTON(BOTTOMRIGHT, LRADC_REL(CHAN, 2460, I_VDDIO), "bottomright"),
{250, BUTTON_PLAYPAUSE}, IMX233_BUTTON(BACK, LRADC_REL(CHAN, 2700, I_VDDIO), "back"),
{530, BUTTON_BACK}, IMX233_BUTTON(PLAYPAUSE, LRADC_REL(CHAN, 2945, I_VDDIO), "play"),
{785, BUTTON_VOL_UP}, IMX233_BUTTON(POWER, PSWITCH(1), "power"),
{1040, BUTTON_VOL_DOWN}, IMX233_BUTTON_(JACK, GPIO(2, 8), "jack", INVERTED),
{1295, BUTTON_MENU}, IMX233_BUTTON_(END, END(), "")
{1540, BUTTON_UP}, };
{1800, BUTTON_SELECT},
{2070, BUTTON_LEFT},
{2315, BUTTON_RIGHT},
{2550, BUTTON_DOWN},
{3450, 0},
{0, IMX233_BUTTON_LRADC_END},
#elif defined(CREATIVE_ZENMOZAIC) #elif defined(CREATIVE_ZENMOZAIC)
{0, IMX233_BUTTON_LRADC_HOLD}, #define CHAN 0
{200, BUTTON_MENU}, #define I_VDDIO 0 /* index in the table */
{445, BUTTON_SHORTCUT},
{645, BUTTON_UP}, struct imx233_button_map_t imx233_button_map[] =
{860, BUTTON_LEFT}, {
{1060, BUTTON_RIGHT}, [I_VDDIO] = IMX233_BUTTON_(VDDIO, VDDIO(3500), "vddio"), /* we need VDDIO for relative */
{1260, BUTTON_DOWN}, IMX233_BUTTON_(HOLD, LRADC_REL(CHAN, 0, I_VDDIO), "hold"),
{1480, BUTTON_SELECT}, IMX233_BUTTON(MENU, LRADC_REL(CHAN, 200, I_VDDIO), "menu"),
{2700, BUTTON_BACK}, IMX233_BUTTON(SHORTCUT, LRADC_REL(CHAN, 445, I_VDDIO), "shortcut"),
{2945, BUTTON_PLAYPAUSE}, IMX233_BUTTON(UP, LRADC_REL(CHAN, 645, I_VDDIO), "up"),
{3400, 0}, IMX233_BUTTON(LEFT, LRADC_REL(CHAN, 860, I_VDDIO), "left"),
{0, IMX233_BUTTON_LRADC_END}, IMX233_BUTTON(RIGHT, LRADC_REL(CHAN, 1060, I_VDDIO), "right"),
#elif defined(CREATIVE_ZENXFISTYLE) IMX233_BUTTON(DOWN, LRADC_REL(CHAN, 1260, I_VDDIO), "down"),
{230, BUTTON_MENU}, IMX233_BUTTON(SELECT, LRADC_REL(CHAN, 1480, I_VDDIO), "select"),
{480, BUTTON_SHORTCUT}, IMX233_BUTTON(BACK, LRADC_REL(CHAN, 2700, I_VDDIO), "back"),
{690, BUTTON_UP}, IMX233_BUTTON(PLAYPAUSE, LRADC_REL(CHAN, 2945, I_VDDIO), "play"),
{920, BUTTON_LEFT}, IMX233_BUTTON(POWER, PSWITCH(1), "power"),
{1120, BUTTON_RIGHT}, IMX233_BUTTON_(JACK, GPIO(2, 8), "jack"),
{1335, BUTTON_DOWN}, IMX233_BUTTON_(END, END(), "")
{1565, BUTTON_SELECT}, };
{2850, BUTTON_BACK}, #elif defined(CREATIVE_ZENV)
{3110, BUTTON_PLAYPAUSE}, #define CHAN 0
{3620, 0}, #define I_VDDIO 0 /* index in the table */
{0, IMX233_BUTTON_LRADC_END},
struct imx233_button_map_t imx233_button_map[] =
{
[I_VDDIO] = IMX233_BUTTON_(VDDIO, VDDIO(3500), "vddio"), /* we need VDDIO for relative */
IMX233_BUTTON_(HOLD, LRADC_REL(CHAN, 190, I_VDDIO), "hold"),
IMX233_BUTTON(MENU, LRADC_REL(CHAN, 250, I_VDDIO), "play"),
IMX233_BUTTON(MENU, LRADC_REL(CHAN, 530, I_VDDIO), "back"),
IMX233_BUTTON(MENU, LRADC_REL(CHAN, 785, I_VDDIO), "vol_up"),
IMX233_BUTTON(MENU, LRADC_REL(CHAN, 1040, I_VDDIO), "vol_down"),
IMX233_BUTTON(MENU, LRADC_REL(CHAN, 1295, I_VDDIO), "menu"),
IMX233_BUTTON(MENU, LRADC_REL(CHAN, 1540, I_VDDIO), "up"),
IMX233_BUTTON(MENU, LRADC_REL(CHAN, 1800, I_VDDIO), "select"),
IMX233_BUTTON(MENU, LRADC_REL(CHAN, 2070, I_VDDIO), "left"),
IMX233_BUTTON(MENU, LRADC_REL(CHAN, 2315, I_VDDIO), "right"),
IMX233_BUTTON(MENU, LRADC_REL(CHAN, 2550, I_VDDIO), "down"),
IMX233_BUTTON(POWER, PSWITCH(1), "power"),
IMX233_BUTTON_(END, END(), "")
};
#else #else
#error wrong target #error wrong target
#endif #endif
};
void button_init_device(void) void button_init_device(void)
{ {
imx233_button_lradc_init(); imx233_button_init();
#ifdef HAVE_HEADPHONE_DETECTION
imx233_pinctrl_acquire(JACK_DET_BANK, JACK_DET_PIN, "jack_detect");
imx233_pinctrl_set_function(JACK_DET_BANK, JACK_DET_PIN, PINCTRL_FUNCTION_GPIO);
imx233_pinctrl_enable_gpio(JACK_DET_BANK, JACK_DET_PIN, false);
#endif
#ifdef CREATIVE_ZENXFISTYLE
imx233_pinctrl_acquire(0, 11, "power_detect");
imx233_pinctrl_set_function(0, 11, PINCTRL_FUNCTION_GPIO);
imx233_pinctrl_enable_gpio(0, 11, false);
#endif
} }
#ifdef HAS_BUTTON_HOLD
bool button_hold(void)
{
return imx233_button_lradc_hold();
}
#endif
#ifdef HAVE_HEADPHONE_DETECTION
bool headphones_inserted(void)
{
bool det = imx233_pinctrl_get_gpio(JACK_DET_BANK, JACK_DET_PIN);
#ifdef JACK_DET_INVERTED
det = !det;
#endif
return det;
}
#endif
int button_read_device(void) int button_read_device(void)
{ {
int btn = 0; int btn = 0;
#ifdef CREATIVE_ZENXFISTYLE #ifdef CREATIVE_ZENXFISTYLE
/* The ZEN X-Fi Style uses a GPIO because both select and power are wired
* to PSWITCH resulting in slow and unreliable readings */
if(!imx233_pinctrl_get_gpio(0, 11))
btn |= BUTTON_POWER;
#else #else
if(imx233_power_read_pswitch() == 1) if(imx233_power_read_pswitch() == 1)
btn |= BUTTON_POWER; btn |= BUTTON_POWER;
#endif #endif
return imx233_button_lradc_read(btn); return imx233_button_read(btn);
} }