Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-30 21:36:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

STM3210E-EVAL: Don't treat joystick as buttons if the DJOYSTICK driver is enabled

Browse Source
This commit is contained in:
Gregory Nutt
2014-11-28 12:05:08 -06:00
parent 997fa4b749
commit 33cfa5d8ba
4 changed files with 93 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/stm3210e-eval/include/board.h
+21 -11
View File
@@ -179,29 +179,39 @@
* Joystick left -- Connected to PG.14 * Joystick left -- Connected to PG.14
* Joystick right -- Connected to PG.13 * Joystick right -- Connected to PG.13
* Joystick up -- Connected to PG.15 * Joystick up -- Connected to PG.15
*
* The Joystick is treated like the other buttons unless CONFIG_DJOYSTICK
* is defined, then it is assumed that they should be used by the discrete
* joystick driver.
*/ */
#define BUTTON_WAKEUP 0 #define BUTTON_WAKEUP 0
#define BUTTON_TAMPER 1 #define BUTTON_TAMPER 1
#define BUTTON_KEY 2 #define BUTTON_KEY 2
#define JOYSTICK_SEL 3 #ifdef CONFIG_DJOYSTICK
#define JOYSTICK_DOWN 4 # define NUM_BUTTONS 3
#define JOYSTICK_LEFT 5 #else
#define JOYSTICK_RIGHT 6 # define JOYSTICK_SEL 3
#define JOYSTICK_UP 7 # define JOYSTICK_DOWN 4
# define JOYSTICK_LEFT 5
# define JOYSTICK_RIGHT 6
# define JOYSTICK_UP 7
#define NUM_BUTTONS 8 # define NUM_BUTTONS 8
#endif
#define BUTTON_WAKEUP_BIT (1 << BUTTON_WAKEUP) #define BUTTON_WAKEUP_BIT (1 << BUTTON_WAKEUP)
#define BUTTON_TAMPER_BIT (1 << BUTTON_TAMPER) #define BUTTON_TAMPER_BIT (1 << BUTTON_TAMPER)
#define BUTTON_KEY_BIT (1 << BUTTON_KEY) #define BUTTON_KEY_BIT (1 << BUTTON_KEY)
#define JOYSTICK_SEL_BIT (1 << JOYSTICK_SEL) #ifdef CONFIG_DJOYSTICK
#define JOYSTICK_DOWN_BIT (1 << JOYSTICK_DOWN) # define JOYSTICK_SEL_BIT (1 << JOYSTICK_SEL)
#define JOYSTICK_LEFT_BIT (1 << JOYSTICK_LEFT) # define JOYSTICK_DOWN_BIT (1 << JOYSTICK_DOWN)
#define JOYSTICK_RIGHT_BIT (1 << JOYSTICK_RIGHT) # define JOYSTICK_LEFT_BIT (1 << JOYSTICK_LEFT)
#define JOYSTICK_UP_BIT (1 << JOYSTICK_UP) # define JOYSTICK_RIGHT_BIT (1 << JOYSTICK_RIGHT)
# define JOYSTICK_UP_BIT (1 << JOYSTICK_UP)
#endif
/************************************************************************************ /************************************************************************************
* Public Data * Public Data
configs/stm3210e-eval/src/stm3210e-eval.h
+10 -3
View File
@@ -79,9 +79,15 @@
/* BUTTONS -- NOTE that some have EXTI interrupts configured */ /* BUTTONS -- NOTE that some have EXTI interrupts configured */
#define MIN_IRQBUTTON BUTTON_KEY #ifdef CONFIG_DJOYSTICK
#define MAX_IRQBUTTON JOYSTICK_UP # define MIN_IRQBUTTON BUTTON_KEY
#define NUM_IRQBUTTONS (JOYSTICK_UP - BUTTON_KEY + 1) # define MAX_IRQBUTTON BUTTON_KEY
# define NUM_IRQBUTTONS (1)
#else
# define MIN_IRQBUTTON BUTTON_KEY
# define MAX_IRQBUTTON JOYSTICK_UP
# define NUM_IRQBUTTONS (JOYSTICK_UP - BUTTON_KEY + 1)
#endif
#define GPIO_BTN_WAKEUP (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|\ #define GPIO_BTN_WAKEUP (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|\
GPIO_PORTA|GPIO_PIN0) GPIO_PORTA|GPIO_PIN0)
@@ -89,6 +95,7 @@
GPIO_PORTC|GPIO_PIN13) GPIO_PORTC|GPIO_PIN13)
#define GPIO_BTN_KEY (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|\ #define GPIO_BTN_KEY (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|\
GPIO_EXTI|GPIO_PORTG|GPIO_PIN8) GPIO_EXTI|GPIO_PORTG|GPIO_PIN8)
#define GPIO_JOY_SEL (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|\ #define GPIO_JOY_SEL (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|\
GPIO_EXTI|GPIO_PORTG|GPIO_PIN7) GPIO_EXTI|GPIO_PORTG|GPIO_PIN7)
#define GPIO_JOY_DOWN (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|\ #define GPIO_JOY_DOWN (GPIO_INPUT|GPIO_CNF_INFLOAT|GPIO_MODE_INPUT|\
configs/stm3210e-eval/src/stm32_buttons.c
+11 -2
View File
@@ -61,8 +61,16 @@
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint16_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_WAKEUP, GPIO_BTN_TAMPER, GPIO_BTN_KEY, GPIO_JOY_SEL, GPIO_BTN_WAKEUP, GPIO_BTN_TAMPER, GPIO_BTN_KEY,
GPIO_JOY_DOWN, GPIO_JOY_LEFT, GPIO_JOY_RIGHT, GPIO_JOY_UP
/* The Joystick is treated like the other buttons unless CONFIG_DJOYSTICK
* is defined, then it is assumed that they should be used by the discrete
* joystick driver.
*/
#ifndef CONFIG_DJOYSTICK
GPIO_JOY_SEL, GPIO_JOY_DOWN, GPIO_JOY_LEFT, GPIO_JOY_RIGHT, GPIO_JOY_UP
#endif
}; };
/**************************************************************************** /****************************************************************************
@@ -166,6 +174,7 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
{ {
oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler); oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
} }
return oldhandler; return oldhandler;
} }
#endif #endif
configs/stm3210e-eval/src/stm32_pmbuttons.c
+9 -3
View File
@@ -64,7 +64,10 @@
#endif #endif
#define BUTTON_MIN 0 #define BUTTON_MIN 0
#define BUTTON_MAX 7 #ifdef CONFIG_DJOYSTICK
# define BUTTON_MAX 2
# define BUTTON_MAX 7
#endif
#ifndef CONFIG_PM_BUTTONS_MIN #ifndef CONFIG_PM_BUTTONS_MIN
# define CONFIG_PM_BUTTONS_MIN BUTTON_MIN # define CONFIG_PM_BUTTONS_MIN BUTTON_MIN
@@ -76,8 +79,9 @@
#if CONFIG_PM_BUTTONS_MIN > CONFIG_PM_BUTTONS_MAX #if CONFIG_PM_BUTTONS_MIN > CONFIG_PM_BUTTONS_MAX
# error "CONFIG_PM_BUTTONS_MIN > CONFIG_PM_BUTTONS_MAX" # error "CONFIG_PM_BUTTONS_MIN > CONFIG_PM_BUTTONS_MAX"
#endif #endif
#if CONFIG_PM_BUTTONS_MAX > 7
# error "CONFIG_PM_BUTTONS_MAX > 7" #if CONFIG_PM_BUTTONS_MAX > BUTTON_MAX
# error "CONFIG_PM_BUTTONS_MAX > BUTTON_MAX"
#endif #endif
#ifndef CONFIG_ARCH_IRQBUTTONS #ifndef CONFIG_ARCH_IRQBUTTONS
@@ -87,6 +91,7 @@
#ifndef CONFIG_PM_IRQBUTTONS_MIN #ifndef CONFIG_PM_IRQBUTTONS_MIN
# define CONFIG_PM_IRQBUTTONS_MIN CONFIG_PM_BUTTONS_MIN # define CONFIG_PM_IRQBUTTONS_MIN CONFIG_PM_BUTTONS_MIN
#endif #endif
#ifndef CONFIG_PM_IRQBUTTONS_MAX #ifndef CONFIG_PM_IRQBUTTONS_MAX
# define CONFIG_PM_IRQBUTTONS_MAX CONFIG_PM_BUTTONS_MAX # define CONFIG_PM_IRQBUTTONS_MAX CONFIG_PM_BUTTONS_MAX
#endif #endif
@@ -94,6 +99,7 @@
#if CONFIG_PM_IRQBUTTONS_MIN > CONFIG_PM_IRQBUTTONS_MAX #if CONFIG_PM_IRQBUTTONS_MIN > CONFIG_PM_IRQBUTTONS_MAX
# error "CONFIG_PM_IRQBUTTONS_MIN > CONFIG_PM_IRQBUTTONS_MAX" # error "CONFIG_PM_IRQBUTTONS_MIN > CONFIG_PM_IRQBUTTONS_MAX"
#endif #endif
#if CONFIG_PM_IRQBUTTONS_MAX > 7 #if CONFIG_PM_IRQBUTTONS_MAX > 7
# error "CONFIG_PM_IRQBUTTONS_MAX > 7" # error "CONFIG_PM_IRQBUTTONS_MAX > 7"
#endif #endif