X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Lib%2Fmk20dx.h;h=277cfed9d623446fdd1516eded4b29a098b8d74a;hb=20b62afb9a05a64b1f15c6329866600913775eea;hp=a8433636d3dd1922a86cd99cca47b9833d29e3c2;hpb=8942ab63d50b578f39309b9d9c24d000c3698cec;p=kiibohd-controller.git diff --git a/Lib/mk20dx.h b/Lib/mk20dx.h index a843363..277cfed 100644 --- a/Lib/mk20dx.h +++ b/Lib/mk20dx.h @@ -29,20 +29,22 @@ * SOFTWARE. */ -#ifndef _mk20dx_h_ -#define _mk20dx_h_ +#pragma once // ----- Defines ----- #if (F_CPU == 96000000) - #define F_BUS 48000000 - #define F_MEM 24000000 + #define F_BUS 48000000 + #define F_MEM 24000000 +#elif (F_CPU == 72000000) + #define F_BUS 36000000 + #define F_MEM 24000000 #elif (F_CPU == 48000000) - #define F_BUS 48000000 - #define F_MEM 24000000 + #define F_BUS 48000000 + #define F_MEM 24000000 #elif (F_CPU == 24000000) - #define F_BUS 24000000 - #define F_MEM 24000000 + #define F_BUS 24000000 + #define F_MEM 24000000 #endif @@ -1949,7 +1951,9 @@ typedef struct { #define SCB_CFSR *(volatile uint32_t *)0xE000ED28 // Configurable Fault Status Register #define SCB_HFSR *(volatile uint32_t *)0xE000ED2C // HardFault Status #define SCB_DFSR *(volatile uint32_t *)0xE000ED30 // Debug Fault Status -#define SCB_MMFAR *(volatile uint32_t *)0xE000ED34 // MemManage Fault Address +#define SCB_MMAR *(volatile uint32_t *)0xE000ED34 // MemManage Fault Address +#define SCB_BFAR *(volatile uint32_t *)0xE000ED38 // BusFault Addreses Register +#define SCB_AFSR *(volatile uint32_t *)0xE000ED3C // Auxilary Fault Status Register #define SYST_CSR *(volatile uint32_t *)0xE000E010 // SysTick Control and Status #define SYST_CSR_COUNTFLAG (uint32_t)0x00010000 @@ -2087,5 +2091,3 @@ extern void portd_isr(void); extern void porte_isr(void); extern void software_isr(void); -#endif -