eryn/kiibohd-controller
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updating AVR abstraction to be compatible with ARM, nearly ready for ARM files

Browse source 
- Very small updates to files, mostly modifying to remove name duplications
This commit is contained in:
Jacob Alexander 2013-01-26 22:30:36 -05:00
parent a31f0e064a
commit 6da1558b78
29 changed files with 64 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/MacroLib.h
View file

@ -24,11 +24,15 @@
// Additional includes should only be added to this file if they should be added to *all* Macro modules.
// ----- Includes -----
#ifndef __MACROLIB_H
#define __MACROLIB_H
// ----- Includes -----
#include <Lib/Interrupts.h>
// ARM
#if defined(_mk20dx128_)
@ -43,7 +47,6 @@
// AVR
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#include <avr/interrupt.h>
#include <util/delay.h>
#endif

9
Lib/MainLib.h
View file

@ -24,10 +24,14 @@
// Additional includes should only be added to this file if they should be added to *all* Scan modules.
#ifndef __MAINLIB_H
#define __MAINLIB_H
// ----- Includes -----
#ifndef __MACROLIB_H
#define __MACROLIB_H
#include <Lib/Interrupts.h>
// ARM
#if defined(_mk20dx128_)
@ -43,7 +47,6 @@
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#include <avr/io.h>
#include <avr/interrupt.h>
#endif

9
Lib/ScanLib.h
View file

@ -24,11 +24,15 @@
// Additional includes should only be added to this file if they should be added to *all* Scan modules.
// ----- Includes -----
#ifndef __SCANLIB_H
#define __SCANLIB_H
// ----- Includes -----
#include <Lib/Interrupts.h>
// ARM
#if defined(_mk20dx128_)
@ -43,7 +47,6 @@
// AVR
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
#include <avr/interrupt.h>
#include <avr/io.h>
#include <util/delay.h>

6
Lib/USBLib.h
View file

@ -24,10 +24,10 @@
// Additional includes should only be added to this file if they should be added to *all* Scan modules.
// ----- Includes -----
#ifndef __USBLIB_H
#define __USBLIB_H
#ifndef __MACROLIB_H
#define __MACROLIB_H
// ----- Includes -----
// ARM
#if defined(_mk20dx128_)