sam4e8e: Move gpio_set_peripheral() definition from gpio.h to internal.h

Use internal.h in a similar way to the internal.h in sam3x8e.  Also,
move the twi pin definitions from internal.h to i2c.c (as they are only
used there).

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 13 insertions, 7 deletions

diff --git a/src/sam4e8e/gpio.c b/src/sam4e8e/gpio.c
index 6f736b65..48695fc9 100644
--- a/src/sam4e8e/gpio.c
+++ b/src/sam4e8e/gpio.c
@@ -4,22 +4,23 @@
 //
 // This file may be distributed under the terms of the GNU GPLv3 license.
 
-#include "gpio.h"
-#include "sam4e.h"
-
 #include "autoconf.h" // CONFIG_CLOCK_FREQ
 #include "board/irq.h" // irq_save
 #include "command.h" // shutdown
+#include "gpio.h" // gpio_out_setup
+#include "internal.h" // gpio_set_peripheral
+#include "sam4e.h" // Pio
 #include "sched.h" // sched_shutdown
 
-#define GPIO(PORT, NUM) (((PORT)-'A') * 32 + (NUM))
-#define GPIO2PORT(PIN) ((PIN) / 32)
-#define GPIO2BIT(PIN) (1<<((PIN) % 32))
-
 static Pio * const digital_regs[] = {
     PIOA, PIOB, PIOC, PIOD, PIOE
 };
 
+
+/****************************************************************
+ * Pin multiplexing
+ ****************************************************************/
+
 void
 gpio_set_peripheral(char bank, const uint32_t bit, char ptype, uint32_t pull_up) {
 
@@ -67,6 +68,11 @@ gpio_set_peripheral(char bank, const uint32_t bit, char ptype, uint32_t pull_up)
     }
 }
 
+
+/****************************************************************
+ * General Purpose Input Output (GPIO) pins
+ ****************************************************************/
+
 struct gpio_out
 gpio_out_setup(uint8_t pin, uint8_t val)
 {