From dc22fa757a1e044fd501a3164bd2a520d7b673fe Mon Sep 17 00:00:00 2001 From: Jacob Alexander Date: Sat, 12 Apr 2014 21:09:35 -0700 Subject: [PATCH] Removing aliased_bitband.h - It's useless :P - Only one line of code ever used it. --- Debug/led/led.c | 5 +++-- Lib/MacroLib.h | 7 +++---- Lib/MainLib.h | 7 +++---- Lib/OutputLib.h | 6 +++--- Lib/ScanLib.h | 7 +++---- Lib/aliased_bitband.h | 37 ------------------------------------- Lib/pin_map.teensy3 | 4 ++-- 7 files changed, 17 insertions(+), 56 deletions(-) delete mode 100644 Lib/aliased_bitband.h diff --git a/Debug/led/led.c b/Debug/led/led.c index 4ecff2a..97a97d7 100644 --- a/Debug/led/led.c +++ b/Debug/led/led.c @@ -44,10 +44,11 @@ inline void init_errorLED() // ARM #elif defined(_mk20dx128_) || defined(_mk20dx256_) + // Enable pin + GPIOC_PDDR |= (1<<5); + // Setup pin - Pin 11 -> C5 - See Lib/pin_map.teensy3 for more details on pins PORTC_PCR5 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1); - // Enable pin - GPIO_BITBAND_MODREG( GPIOC_PDOR, 5 ) = 1; #endif } diff --git a/Lib/MacroLib.h b/Lib/MacroLib.h index bc433da..cce75b1 100644 --- a/Lib/MacroLib.h +++ b/Lib/MacroLib.h @@ -1,15 +1,15 @@ /* Copyright (C) 2013-2014 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 @@ -37,7 +37,6 @@ #if defined(_mk20dx128_) || defined(_mk20dx256_) #include -#include #include #endif diff --git a/Lib/MainLib.h b/Lib/MainLib.h index 05d3999..507b4d2 100644 --- a/Lib/MainLib.h +++ b/Lib/MainLib.h @@ -1,15 +1,15 @@ /* Copyright (C) 2013-2014 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 @@ -37,7 +37,6 @@ #if defined(_mk20dx128_) || defined(_mk20dx256_) #include -#include #endif diff --git a/Lib/OutputLib.h b/Lib/OutputLib.h index 594260f..d495e0c 100644 --- a/Lib/OutputLib.h +++ b/Lib/OutputLib.h @@ -1,15 +1,15 @@ /* Copyright (C) 2013-2014 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 diff --git a/Lib/ScanLib.h b/Lib/ScanLib.h index bff0ae7..f8de054 100644 --- a/Lib/ScanLib.h +++ b/Lib/ScanLib.h @@ -1,15 +1,15 @@ /* Copyright (C) 2013-2014 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 @@ -37,7 +37,6 @@ #if defined(_mk20dx128_) || defined(_mk20dx256_) #include -#include #include #endif diff --git a/Lib/aliased_bitband.h b/Lib/aliased_bitband.h deleted file mode 100644 index 44e8859..0000000 --- a/Lib/aliased_bitband.h +++ /dev/null @@ -1,37 +0,0 @@ - -#ifndef __aliased_bitband_h -#define __aliased_bitband_h - - -// Aliased Regions for single bit (0th) register access - -// Chapter 4: Memory Map (Table 4-1) - - - -// TODO -// - Not all tested, and not all sections added - - - -// 0x2200 0000 - 0x23FF FFFF - Aliased to SRAM_U bitband -// TODO - - - -// 0x4200 0000 - 0x43FF FFFF - Aliased to AIPS and GPIO bitband -#define GPIO_BITBAND_ADDR(reg, bit) (((uint32_t)&(reg) - 0x40000000) * 32 + (bit) * 4 + 0x42000000) -#define GPIO_BITBAND_PTR(reg, bit) ((uint32_t *)GPIO_BITBAND_ADDR((reg), (bit))) - -// XXX - Only MODREG is tested to work... -#define GPIO_BITBAND_OUTREG(reg, bit) *((uint32_t *)GPIO_BITBAND_ADDR((reg), (bit)) + 0) -#define GPIO_BITBAND_SETREG(reg, bit) *((uint32_t *)GPIO_BITBAND_ADDR((reg), (bit)) + 32) -#define GPIO_BITBAND_CLRREG(reg, bit) *((uint32_t *)GPIO_BITBAND_ADDR((reg), (bit)) + 64) -#define GPIO_BITBAND_TOGREG(reg, bit) *((uint32_t *)GPIO_BITBAND_ADDR((reg), (bit)) + 96) -#define GPIO_BITBAND_INPREG(reg, bit) *((uint32_t *)GPIO_BITBAND_ADDR((reg), (bit)) + 128) -#define GPIO_BITBAND_MODREG(reg, bit) *((uint32_t *)GPIO_BITBAND_ADDR((reg), (bit)) + 160) - - - -#endif - diff --git a/Lib/pin_map.teensy3 b/Lib/pin_map.teensy3 index 922eeb4..e440a5f 100644 --- a/Lib/pin_map.teensy3 +++ b/Lib/pin_map.teensy3 @@ -1,12 +1,12 @@ // Pin Arduino // 0 B16 RXD // 1 B17 TXD -// 2 D0 +// 2 D0 // 3 A12 FTM1_CH0 // 4 A13 FTM1_CH1 // 5 D7 FTM0_CH7 OC0B/T1 // 6 D4 FTM0_CH4 OC0A -// 7 D2 +// 7 D2 // 8 D3 ICP1 // 9 C3 FTM0_CH2 OC1A // 10 C4 FTM0_CH3 SS/OC1B