aboutsummaryrefslogtreecommitdiff
path: root/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
diff options
context:
space:
mode:
authorDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2012-02-05 16:00:48 +0000
committerDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2012-02-05 16:00:48 +0000
commitb5f2a4e576a677252eb5741fdbdeb641089d9bb0 (patch)
tree802d82c832ca6553c02e19336819cb5959656828 /LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
parent9b0c63fa0a32478a8f5bdd90a9ab4a23a19cb1f0 (diff)
Add new tag for the LUFA-120219-BETA release.LUFA-120219-BETA
git-svn-id: http://lufa-lib.googlecode.com/svn/tags/LUFA-120219-BETA@2033 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'LUFA/Drivers/Board/AVR8/EVK527/Joystick.h')
-rw-r--r--LUFA/Drivers/Board/AVR8/EVK527/Joystick.h21
1 files changed, 15 insertions, 6 deletions
diff --git a/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h b/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
index 19d19ee7..5315c2e0 100644
--- a/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
@@ -1,13 +1,13 @@
/*
LUFA Library
- Copyright (C) Dean Camera, 2011.
+ Copyright (C) Dean Camera, 2012.
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
@@ -91,11 +91,20 @@
#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;
+ PORTF |= JOY_FMASK;
+ PORTC |= JOY_CMASK;
+ }
+
+ static inline void Joystick_Disable(void)
+ {
+ DDRF &= ~JOY_FMASK;
+ DDRC &= ~JOY_CMASK;
+
+ PORTF &= ~JOY_FMASK;
+ PORTC &= ~JOY_CMASK;
}
static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;