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

diff --git a/LUFA/Drivers/Board/EVK527/Joystick.h b/LUFA/Drivers/Board/EVK527/Joystick.h
index be8f35a..cab4423 100644 (file)
--- a/LUFA/Drivers/Board/EVK527/Joystick.h
+++ b/LUFA/Drivers/Board/EVK527/Joystick.h
@@ -65,7 +65,9 @@
        #if !defined(__DOXYGEN__)
                /* Macros: */
                        #define JOY_FMASK                 ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7))
        #if !defined(__DOXYGEN__)
                /* Macros: */
                        #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
 
        /* Public Interface - May be used in end-application: */
        #endif
 
        /* Public Interface - May be used in end-application: */


@@ -80,7 +82,7 @@
                        #define JOY_UP                    (1 << 5)
 
                        /** Mask for the joystick being pushed in the downward direction. */
                        #define JOY_UP                    (1 << 5)
 
                        /** 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. */
                        #define JOY_PRESS                 (1 << 6)
 
                        /** Mask for the joystick being pushed inward. */
                        #define JOY_PRESS                 (1 << 6)


@@ -99,7 +101,7 @@
                        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) ATTR_WARN_UNUSED_RESULT;
                        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
 

diff --git a/LUFA/Drivers/Board/STK525/Joystick.h b/LUFA/Drivers/Board/STK525/Joystick.h
index c1dd362..c90e7a0 100644 (file)
--- a/LUFA/Drivers/Board/STK525/Joystick.h
+++ b/LUFA/Drivers/Board/STK525/Joystick.h
@@ -66,6 +66,8 @@
                /* Macros: */
                        #define JOY_BMASK                 ((1 << 5) | (1 << 6) | (1 << 7))
                        #define JOY_EMASK                 ((1 << 4) | (1 << 5))
                /* Macros: */
                        #define JOY_BMASK                 ((1 << 5) | (1 << 6) | (1 << 7))
                        #define JOY_EMASK                 ((1 << 4) | (1 << 5))

+                       
+                       #define JOY_PORTE_MASK_SHIFT      1

        #endif
 
        /* Public Interface - May be used in end-application: */
        #endif
 
        /* Public Interface - May be used in end-application: */


@@ -80,7 +82,7 @@
                        #define JOY_UP                    (1 << 7)
 
                        /** Mask for the joystick being pushed in the downward direction. */
                        #define JOY_UP                    (1 << 7)
 
                        /** 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. */
                        #define JOY_PRESS                 (1 << 5)
 
                        /** Mask for the joystick being pushed inward. */
                        #define JOY_PRESS                 (1 << 5)


@@ -99,7 +101,7 @@
                        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) ATTR_WARN_UNUSED_RESULT;
                        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
 

diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/USBKEY/Joystick.h
index 8ca5bc4..b8ae7bc 100644 (file)
--- a/LUFA/Drivers/Board/USBKEY/Joystick.h
+++ b/LUFA/Drivers/Board/USBKEY/Joystick.h
@@ -66,6 +66,8 @@
                /* Macros: */
                        #define JOY_BMASK                 ((1 << 5) | (1 << 6) | (1 << 7))
                        #define JOY_EMASK                 ((1 << 4) | (1 << 5))
                /* Macros: */
                        #define JOY_BMASK                 ((1 << 5) | (1 << 6) | (1 << 7))
                        #define JOY_EMASK                 ((1 << 4) | (1 << 5))

+                       
+                       #define JOY_PORTE_MASK_SHIFT      1

        #endif
 
        /* Public Interface - May be used in end-application: */
        #endif
 
        /* Public Interface - May be used in end-application: */


@@ -74,13 +76,13 @@
                        #define JOY_LEFT                  (1 << 6)
 
                        /** Mask for the joystick being pushed in the right direction. */
                        #define JOY_LEFT                  (1 << 6)
 
                        /** 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. */
                        #define JOY_UP                    (1 << 7)
 
                        /** Mask for the joystick being pushed in the downward direction. */
 
                        /** Mask for the joystick being pushed in the upward direction. */
                        #define JOY_UP                    (1 << 7)
 
                        /** 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. */
                        #define JOY_PRESS                 (1 << 5)
 
                        /** Mask for the joystick being pushed inward. */
                        #define JOY_PRESS                 (1 << 5)


@@ -99,7 +101,7 @@
                        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) ATTR_WARN_UNUSED_RESULT;
                        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