di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Removing aliased_bitband.h

Browse Source 
- It's useless :P
- Only one line of code ever used it.
This commit is contained in:
Jacob Alexander 2014-04-12 21:09:35 -07:00
parent bf529f697e
commit dc22fa757a
7 changed files with 17 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Debug/led/led.c
View File

@ -44,10 +44,11 @@ inline void init_errorLED()
// ARM // ARM
#elif defined(_mk20dx128_) || defined(_mk20dx256_) #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 // 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); PORTC_PCR5 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
// Enable pin
GPIO_BITBAND_MODREG( GPIOC_PDOR, 5 ) = 1;
#endif #endif
} }

7
Lib/MacroLib.h
View File

@ -1,15 +1,15 @@
/* Copyright (C) 2013-2014 by Jacob Alexander /* Copyright (C) 2013-2014 by Jacob Alexander
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is * copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions: * furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be included in * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. * all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@ -37,7 +37,6 @@
#if defined(_mk20dx128_) || defined(_mk20dx256_) #if defined(_mk20dx128_) || defined(_mk20dx256_)
#include <Lib/mk20dx.h> #include <Lib/mk20dx.h>
#include <Lib/aliased_bitband.h>
#include <Lib/delay.h> #include <Lib/delay.h>
#endif #endif

7
Lib/MainLib.h
View File

@ -1,15 +1,15 @@
/* Copyright (C) 2013-2014 by Jacob Alexander /* Copyright (C) 2013-2014 by Jacob Alexander
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is * copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions: * furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be included in * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. * all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@ -37,7 +37,6 @@
#if defined(_mk20dx128_) || defined(_mk20dx256_) #if defined(_mk20dx128_) || defined(_mk20dx256_)
#include <Lib/mk20dx.h> #include <Lib/mk20dx.h>
#include <Lib/aliased_bitband.h>
#endif #endif

6
Lib/OutputLib.h
View File

@ -1,15 +1,15 @@
/* Copyright (C) 2013-2014 by Jacob Alexander /* Copyright (C) 2013-2014 by Jacob Alexander
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is * copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions: * furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be included in * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. * all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

7
Lib/ScanLib.h
View File

@ -1,15 +1,15 @@
/* Copyright (C) 2013-2014 by Jacob Alexander /* Copyright (C) 2013-2014 by Jacob Alexander
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is * copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions: * furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be included in * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. * all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@ -37,7 +37,6 @@
#if defined(_mk20dx128_) || defined(_mk20dx256_) #if defined(_mk20dx128_) || defined(_mk20dx256_)
#include <Lib/mk20dx.h> #include <Lib/mk20dx.h>
#include <Lib/aliased_bitband.h>
#include <Lib/delay.h> #include <Lib/delay.h>
#endif #endif

37
Lib/aliased_bitband.h
View File

@ -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

4
Lib/pin_map.teensy3
View File

@ -1,12 +1,12 @@
// Pin Arduino // Pin Arduino
// 0 B16 RXD // 0 B16 RXD
// 1 B17 TXD // 1 B17 TXD
// 2 D0 // 2 D0
// 3 A12 FTM1_CH0 // 3 A12 FTM1_CH0
// 4 A13 FTM1_CH1 // 4 A13 FTM1_CH1
// 5 D7 FTM0_CH7 OC0B/T1 // 5 D7 FTM0_CH7 OC0B/T1
// 6 D4 FTM0_CH4 OC0A // 6 D4 FTM0_CH4 OC0A
// 7 D2 // 7 D2
// 8 D3 ICP1 // 8 D3 ICP1
// 9 C3 FTM0_CH2 OC1A // 9 C3 FTM0_CH2 OC1A
// 10 C4 FTM0_CH3 SS/OC1B // 10 C4 FTM0_CH3 SS/OC1B