X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Lib%2FInterrupts.h;h=a55dafcedbf27e4508615023512a55f9262d5ff8;hb=5f262ea4b68a07e9b94ce0a49c0f7196e5f32b3b;hp=943fdb9965dc306818e2c2a8dd330ad1e0e8cad5;hpb=c8b4baf652ed7f3ea7b569e50db70aa718b0fdff;p=kiibohd-controller.git diff --git a/Lib/Interrupts.h b/Lib/Interrupts.h index 943fdb9..a55dafc 100644 --- a/Lib/Interrupts.h +++ b/Lib/Interrupts.h @@ -1,15 +1,15 @@ -/* Copyright (C) 2013 by Jacob Alexander - * +/* Copyright (C) 2013-2015 by Jacob Alexander + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -25,13 +25,12 @@ // ----- Includes ----- -#ifndef __INTERRUPTS_H -#define __INTERRUPTS_H +#pragma once // ARM -#if defined(_mk20dx128_) +#if defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) || defined(_mk20dx256vlh7_) -#include +#include // AVR #elif defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) @@ -45,7 +44,7 @@ // ----- Defines ----- // ARM -#if defined(_mk20dx128_) +#if defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) || defined(_mk20dx256vlh7_) // Map the Interrupt Enable/Disable to the AVR names #define cli() __disable_irq() @@ -58,6 +57,3 @@ #endif - -#endif -