Minor documentation improvements.

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

diff --git a/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h b/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h
index 65f3481..8b6935b 100644 (file)
--- a/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/USBKEY/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


@@ -66,7 +66,7 @@
                /* 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
 
                        #define JOY_PORTE_MASK_SHIFT      1
        #endif
 


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

-                               DDRB  &= ~(JOY_BMASK);
-                               DDRE  &= ~(JOY_EMASK);
+                               DDRB  &= ~JOY_BMASK;
+                               DDRE  &= ~JOY_EMASK;
+
+                               PORTB |=  JOY_BMASK;
+                               PORTE |=  JOY_EMASK;
+                       }
+
+                       static inline void Joystick_Disable(void)
+                       {
+                               DDRB  &= ~JOY_BMASK;
+                               DDRE  &= ~JOY_EMASK;

 
 

-                               PORTB |= JOY_BMASK;
-                               PORTE |= JOY_EMASK;
+                               PORTB &= ~JOY_BMASK;
+                               PORTE &= ~JOY_EMASK;

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