Use immediate variable expansion in the second-deepest level makefile scripts to...

[pub/USBasp.git] / LUFA / Drivers / Board / AVR8 / EVK527 / Joystick.h

diff --git a/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h b/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
index 6965301..b264f47 100644 (file)
--- a/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -42,6 +42,11 @@
  *
  *  Board specific joystick driver header for the Atmel EVK527.
  *
  *
  *  Board specific joystick driver header for the Atmel EVK527.
  *

+ *  <table>
+ *    <tr><th>Left Port Pin</th><th>Up Port Pin</th><th>Right Port Pin</th><th>Down Port Pin</th><th>Press Port Pin</th></tr>
+ *    <tr><td>PORTF.4</td><td>PORTF.5</td><td>PORTF.7</td><td>PORTC.6</td><td>PORTF.6</td></tr>
+ *  </table>
+ *

  *  @{
  */
 
  *  @{
  */
 


@@ -66,7 +71,7 @@
                /* Macros: */
                        #define JOY_FMASK                 ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7))
                        #define JOY_CMASK                 (1 << 6)
                /* Macros: */
                        #define JOY_FMASK                 ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7))
                        #define JOY_CMASK                 (1 << 6)

-                       
+

                        #define JOY_PORTC_MASK_SHIFT      3
        #endif
 
                        #define JOY_PORTC_MASK_SHIFT      3
        #endif
 


@@ -91,11 +96,20 @@
                #if !defined(__DOXYGEN__)
                        static inline void Joystick_Init(void)
                        {
                #if !defined(__DOXYGEN__)
                        static inline void Joystick_Init(void)
                        {

-                               DDRF  &= ~(JOY_FMASK);
-                               DDRC  &= ~(JOY_CMASK);
+                               DDRF  &= ~JOY_FMASK;
+                               DDRC  &= ~JOY_CMASK;
+
+                               PORTF |=  JOY_FMASK;
+                               PORTC |=  JOY_CMASK;
+                       }
+
+                       static inline void Joystick_Disable(void)
+                       {
+                               DDRF  &= ~JOY_FMASK;
+                               DDRC  &= ~JOY_CMASK;

 
 

-                               PORTF |= JOY_FMASK;
-                               PORTC |= JOY_CMASK;
+                               PORTF &= ~JOY_FMASK;
+                               PORTC &= ~JOY_CMASK;

                        }
 
                        static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
                        }
 
                        static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;