ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed HWB board driver to Buttons driver, to allow for the support of future boards with more than one mounted GPIO button.

Browse source
This commit is contained in:
Dean Camera 2009-05-06 07:50:34 +00:00
parent f11f69fd29
commit 63a8f66d92
25 changed files with 163 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

40
LUFA/Drivers/Board/STK526/HWB.h → LUFA/Drivers/Board/STK526/Buttons.h
View file

@ -30,14 +30,20 @@
/** \file
*
* Board specific HWB driver header for the STK526.
* Board specific Buttons driver header for the STK526.
*
* \note This file should not be included directly. It is automatically included as needed by the HWB driver
* dispatch header located in LUFA/Drivers/Board/HWB.h.
* \note This file should not be included directly. It is automatically included as needed by the Buttons driver
* dispatch header located in LUFA/Drivers/Board/Buttons.h.
*/
#ifndef __HWB_STK526_H__
#define __HWB_STK526_H__
#ifndef __BUTTONS_STK526_H__
#define __BUTTONS_STK526_H__
/* Includes: */
#include <avr/io.h>
#include <stdbool.h>
#include "../../../Common/Common.h"
/* Includes: */
#include <avr/io.h>
@ -51,29 +57,33 @@
#endif
/* Preprocessor Checks: */
#if !defined(INCLUDE_FROM_HWB_H)
#error Do not include this file directly. Include LUFA/Drivers/Board/HWB.h instead.
#if !defined(INCLUDE_FROM_BUTTONS_H)
#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
#endif
/* Public Interface - May be used in end-application: */
/* Macros: */
/** Button mask for the first button on the board. */
#define BUTTONS_BUTTON1 (1 << 2)
/* Inline Functions: */
#if !defined(__DOXYGEN__)
static inline void HWB_Init(void)
static inline void Buttons_Init(void)
{
DDRD &= ~(1 << 7);
PORTD |= (1 << 7);
DDRD &= ~BUTTONS_BUTTON1;
PORTD |= BUTTONS_BUTTON1;
}
static inline bool HWB_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline bool HWB_GetStatus(void)
static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Buttons_GetStatus(void)
{
return (!(PIND & (1 << 7)));
return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
}
#endif
/* Disable C linkage for C++ Compilers: */
#if defined(__cplusplus)
}
#endif
#endif

2
LUFA/Drivers/Board/STK526/Dataflash.h
View file

@ -30,7 +30,7 @@
/** \file
*
* Board specific HWB driver header for the STK525.
* Board specific Dataflash driver header for the STK525.
*
* \note This file should not be included directly. It is automatically included as needed by the dataflash driver
* dispatch header located in LUFA/Drivers/Board/Dataflash.h.