Commit 95a1aa4c authored by Dean Camera's avatar Dean Camera

Add named macros to the board joystick drivers where a shift is needed to...

Add named macros to the board joystick drivers where a shift is needed to maintain unique joystick direction bits in the returned mask value.
parent b35f93a3
...@@ -65,7 +65,9 @@ ...@@ -65,7 +65,9 @@
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Macros: */ /* Macros: */
#define JOY_FMASK ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7)) #define JOY_FMASK ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7))
#define JOY_CMASK (1 << 6)) #define JOY_CMASK (1 << 6)
#define JOY_PORTC_MASK_SHIFT 3
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
...@@ -80,7 +82,7 @@ ...@@ -80,7 +82,7 @@
#define JOY_UP (1 << 5) #define JOY_UP (1 << 5)
/** Mask for the joystick being pushed in the downward direction. */ /** Mask for the joystick being pushed in the downward direction. */
#define JOY_DOWN ((1 << 6) >> 3) #define JOY_DOWN ((1 << 6) >> JOY_PORTC_MASK_SHIFT)
/** Mask for the joystick being pushed inward. */ /** Mask for the joystick being pushed inward. */
#define JOY_PRESS (1 << 6) #define JOY_PRESS (1 << 6)
...@@ -99,7 +101,7 @@ ...@@ -99,7 +101,7 @@
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Joystick_GetStatus(void) static inline uint8_t Joystick_GetStatus(void)
{ {
return (((uint8_t)~PINF & JOY_FMASK) | (((uint8_t)~PINC & JOY_CMASK) >> 3)); return (((uint8_t)~PINF & JOY_FMASK) | (((uint8_t)~PINC & JOY_CMASK) >> JOY_PORTC_MASK_SHIFT));
} }
#endif #endif
......
...@@ -66,6 +66,8 @@ ...@@ -66,6 +66,8 @@
/* Macros: */ /* Macros: */
#define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7)) #define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7))
#define JOY_EMASK ((1 << 4) | (1 << 5)) #define JOY_EMASK ((1 << 4) | (1 << 5))
#define JOY_PORTE_MASK_SHIFT 1
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
...@@ -80,7 +82,7 @@ ...@@ -80,7 +82,7 @@
#define JOY_UP (1 << 7) #define JOY_UP (1 << 7)
/** Mask for the joystick being pushed in the downward direction. */ /** Mask for the joystick being pushed in the downward direction. */
#define JOY_DOWN ((1 << 5) >> 1) #define JOY_DOWN ((1 << 5) >> JOY_PORTE_MASK_SHIFT)
/** Mask for the joystick being pushed inward. */ /** Mask for the joystick being pushed inward. */
#define JOY_PRESS (1 << 5) #define JOY_PRESS (1 << 5)
...@@ -99,7 +101,7 @@ ...@@ -99,7 +101,7 @@
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Joystick_GetStatus(void) static inline uint8_t Joystick_GetStatus(void)
{ {
return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1)); return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> JOY_PORTE_MASK_SHIFT));
} }
#endif #endif
......
...@@ -66,6 +66,8 @@ ...@@ -66,6 +66,8 @@
/* Macros: */ /* Macros: */
#define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7)) #define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7))
#define JOY_EMASK ((1 << 4) | (1 << 5)) #define JOY_EMASK ((1 << 4) | (1 << 5))
#define JOY_PORTE_MASK_SHIFT 1
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
...@@ -74,13 +76,13 @@ ...@@ -74,13 +76,13 @@
#define JOY_LEFT (1 << 6) #define JOY_LEFT (1 << 6)
/** Mask for the joystick being pushed in the right direction. */ /** Mask for the joystick being pushed in the right direction. */
#define JOY_RIGHT ((1 << 4) >> 1) #define JOY_RIGHT ((1 << 4) >> JOY_PORTE_MASK_SHIFT)
/** Mask for the joystick being pushed in the upward direction. */ /** Mask for the joystick being pushed in the upward direction. */
#define JOY_UP (1 << 7) #define JOY_UP (1 << 7)
/** Mask for the joystick being pushed in the downward direction. */ /** Mask for the joystick being pushed in the downward direction. */
#define JOY_DOWN ((1 << 5) >> 1) #define JOY_DOWN ((1 << 5) >> JOY_PORTE_MASK_SHIFT)
/** Mask for the joystick being pushed inward. */ /** Mask for the joystick being pushed inward. */
#define JOY_PRESS (1 << 5) #define JOY_PRESS (1 << 5)
...@@ -99,7 +101,7 @@ ...@@ -99,7 +101,7 @@
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Joystick_GetStatus(void) static inline uint8_t Joystick_GetStatus(void)
{ {
return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1)); return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> JOY_PORTE_MASK_SHIFT));
} }
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment