diff --git a/src/energenie/drv/build_rpi b/src/energenie/drv/build_rpi
index 428b10d..dd89023 100755
--- a/src/energenie/drv/build_rpi
+++ b/src/energenie/drv/build_rpi
@@ -3,41 +3,41 @@
# build file for Raspberry Pi use
# build gpio_test
-gcc gpio_test.c gpio.c
+gcc gpio_test.c gpio_rpi.c
mv a.out gpio_test
chmod u+x gpio_test
# build spis_test (soft SPI tester)
-gcc spi_test.c spis_rpi.c gpio.c
+gcc spi_test.c spis_rpi.c gpio_rpi.c
mv a.out spis_test
chmod u+x spis_test
# build spih_test (hard SPI tester)
-gcc spi_test.c spih_rpi.c gpio.c
+gcc spi_test.c spih_rpi.c gpio_rpi.c
mv a.out spih_test
chmod u+x spish_test
# build hrf69_test
-## gcc hrf69_test.c hrf69.c spis_rpi.c gpio.c
+## gcc hrf69_test.c hrf69.c spis_rpi.c gpio_rpi.c
## mv a.out hrf69_test
## chmod u+x hrf69_test
# build radio_test
-## gcc radio_test.c radio.c hrf69.c spis_rpi.c gpio.c
+## gcc radio_test.c radio.c hrf69.c spis_rpi.c gpio_rpi.c
## mv a.out radio_test
## chmod u+x radio_test
# build spi .so library on Raspberry Pi
-gcc -Wall -shared -o spi_rpi.so -fPIC spis_rpi.c gpio.c
+gcc -Wall -shared -o spi_rpi.so -fPIC spis_rpi.c gpio_rpi.c
# nm -D spi_rpi.so
cp spi_rpi.so ..
# radio spi .so library on Raspberry Pi
-## gcc -Wall -shared -o radio_rpi.so -fPIC radio.c hrf69.c spis_rpi.c gpio.c
+## gcc -Wall -shared -o radio_rpi.so -fPIC radio.c hrf69.c spis_rpi.c gpio_rpi.c
## nm -D radio_rpi.so
## cp radio_rpi.so ..
diff --git a/src/energenie/drv/gpio.c b/src/energenie/drv/gpio.c
deleted file mode 100644
index 7d9a144..0000000
--- a/src/energenie/drv/gpio.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* gpio.c D.J.Whale 8/07/2014
- *
- * A very simple interface to the GPIO port on the Raspberry Pi.
- */
-
-/***** INCLUDES *****/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <time.h>
-
-#include "gpio.h"
-
-
-/***** CONFIGURATION *****/
-
-/* uncomment to make this a simulated driver */
-//#define GPIO_SIMULATED
-
-
-/***** CONSTANTS *****/
-
-#define BCM2708_PERI_BASE 0x20000000
-//#define GPIO_BASE (BCM2708_PERI_BASE + 0x200000) /* GPIO controller */
-#define GPIO_BASE_OFFSET 0x200000
-
-#define PAGE_SIZE (4*1024)
-#define BLOCK_SIZE (4*1024)
-
-
-/***** VARIABLES *****/
-
-static int mem_fd;
-static void *gpio_map;
-
-static volatile unsigned *gpio;
-
-
-/****** MACROS *****/
-
-#define INP_GPIO(g) *(gpio+((g)/10)) &= ~(7<<(((g)%10)*3))
-#define OUT_GPIO(g) *(gpio+((g)/10)) |= (1<<(((g)%10)*3))
-#define SET_GPIO_ALT(g,a) *(gpio+(((g)/10))) |= (((a)<=3?(a)+4:(a)==4?3:2)<<(((g)%10)*3))
-
-#define GPIO_SET *(gpio+7) // sets bits which are 1 ignores bits which are 0
-#define GPIO_CLR *(gpio+10) // clears bits which are 1 ignores bits which are 0
-
-#define GPIO_READ(g) ((*(gpio+13)&(1<<g)) != 0)
-
-#define GPIO_HIGH(g) GPIO_SET = (1<<(g))
-#define GPIO_LOW(g) GPIO_CLR = (1<<(g))
-
-
-void gpio_init()
-{
-#ifndef GPIO_SIMULATED
-
- uint32_t peri_base = BCM2708_PERI_BASE; /* default if device tree not found */
- uint32_t gpio_base;
- FILE* fp;
-
- /* for RPi2, get peri-base from device tree */
- if ((fp = fopen("/proc/device-tree/soc/ranges", "rb")) != NULL)
- {
- unsigned char buf[4];
-
- fseek(fp, 4, SEEK_SET);
- if (fread(buf, 1, sizeof(buf), fp) == sizeof(buf))
- {
- peri_base = buf[0]<<24 | buf[1]<<16 | buf[2]<<8 | buf[3];
- }
- fclose(fp);
- }
-
- gpio_base = peri_base + GPIO_BASE_OFFSET;
-
-
- /* open /dev/mem */
- if ((mem_fd = open("/dev/mem", O_RDWR|O_SYNC) ) < 0)
- {
- printf("can't open /dev/mem \n");
- exit(-1); //TODO return a result code
- }
-
- /* mmap GPIO */
- gpio_map = mmap(
- NULL, //Any adddress in our space will do
- BLOCK_SIZE, //Map length
- PROT_READ|PROT_WRITE,// Enable reading & writting to mapped memory
- MAP_SHARED, //Shared with other processes
- mem_fd, //File to map
- gpio_base //Offset to GPIO peripheral
- );
-
- close(mem_fd); //No need to keep mem_fd open after mmap
-
- if (gpio_map == MAP_FAILED)
- {
- printf("mmap error %d\n", (int)gpio_map);//errno also set!
- exit(-1); //TODO return a result code
- }
-
- // Always use volatile pointer!
- gpio = (volatile unsigned *)gpio_map;
-#endif
-}
-
-
-void gpio_setin(int g)
-{
-#ifndef GPIO_SIMULATED
- INP_GPIO(g);
-#else
- printf("gpio:in:%d\n", g);
-#endif
-}
-
-
-void gpio_setout(int g)
-{
-#ifndef GPIO_SIMULATED
- /* always INP_GPIO before OUT_GPIO */
- //INP_GPIO(g); #### this causes glitching
- OUT_GPIO(g);
-#else
- printf("gpio:out:%d\n", g);
-#endif
-}
-
-
-void gpio_high(int g)
-{
-#ifndef GPIO_SIMULATED
- GPIO_HIGH(g);
-#else
- printf("gpio:high:%d\n", g);
-#endif
-}
-
-
-void gpio_low(int g)
-{
-#ifndef GPIO_SIMULATED
- GPIO_LOW(g);
-#else
- printf("gpio:low:%d\n", g);
-#endif
-}
-
-
-void gpio_write(int g, int v)
-{
-#ifndef GPIO_SIMULATED
- if (v != 0)
- {
- GPIO_HIGH(g);
- }
- else
- {
- GPIO_LOW(g);
- }
-#else
- printf("gpio:write:%d=%d\n", g, v);
-#endif
-}
-
-
-int gpio_read(int g)
-{
-#ifndef GPIO_SIMULATED
- return GPIO_READ(g);
-#else
- return 0; /* always low in simulation */
-#endif
-}
-
-
-/***** END OF FILE *****/
diff --git a/src/energenie/drv/gpio_rpi.c b/src/energenie/drv/gpio_rpi.c
new file mode 100644
index 0000000..7d9a144
--- /dev/null
+++ b/src/energenie/drv/gpio_rpi.c
@@ -0,0 +1,182 @@
+/* gpio.c D.J.Whale 8/07/2014
+ *
+ * A very simple interface to the GPIO port on the Raspberry Pi.
+ */
+
+/***** INCLUDES *****/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "gpio.h"
+
+
+/***** CONFIGURATION *****/
+
+/* uncomment to make this a simulated driver */
+//#define GPIO_SIMULATED
+
+
+/***** CONSTANTS *****/
+
+#define BCM2708_PERI_BASE 0x20000000
+//#define GPIO_BASE (BCM2708_PERI_BASE + 0x200000) /* GPIO controller */
+#define GPIO_BASE_OFFSET 0x200000
+
+#define PAGE_SIZE (4*1024)
+#define BLOCK_SIZE (4*1024)
+
+
+/***** VARIABLES *****/
+
+static int mem_fd;
+static void *gpio_map;
+
+static volatile unsigned *gpio;
+
+
+/****** MACROS *****/
+
+#define INP_GPIO(g) *(gpio+((g)/10)) &= ~(7<<(((g)%10)*3))
+#define OUT_GPIO(g) *(gpio+((g)/10)) |= (1<<(((g)%10)*3))
+#define SET_GPIO_ALT(g,a) *(gpio+(((g)/10))) |= (((a)<=3?(a)+4:(a)==4?3:2)<<(((g)%10)*3))
+
+#define GPIO_SET *(gpio+7) // sets bits which are 1 ignores bits which are 0
+#define GPIO_CLR *(gpio+10) // clears bits which are 1 ignores bits which are 0
+
+#define GPIO_READ(g) ((*(gpio+13)&(1<<g)) != 0)
+
+#define GPIO_HIGH(g) GPIO_SET = (1<<(g))
+#define GPIO_LOW(g) GPIO_CLR = (1<<(g))
+
+
+void gpio_init()
+{
+#ifndef GPIO_SIMULATED
+
+ uint32_t peri_base = BCM2708_PERI_BASE; /* default if device tree not found */
+ uint32_t gpio_base;
+ FILE* fp;
+
+ /* for RPi2, get peri-base from device tree */
+ if ((fp = fopen("/proc/device-tree/soc/ranges", "rb")) != NULL)
+ {
+ unsigned char buf[4];
+
+ fseek(fp, 4, SEEK_SET);
+ if (fread(buf, 1, sizeof(buf), fp) == sizeof(buf))
+ {
+ peri_base = buf[0]<<24 | buf[1]<<16 | buf[2]<<8 | buf[3];
+ }
+ fclose(fp);
+ }
+
+ gpio_base = peri_base + GPIO_BASE_OFFSET;
+
+
+ /* open /dev/mem */
+ if ((mem_fd = open("/dev/mem", O_RDWR|O_SYNC) ) < 0)
+ {
+ printf("can't open /dev/mem \n");
+ exit(-1); //TODO return a result code
+ }
+
+ /* mmap GPIO */
+ gpio_map = mmap(
+ NULL, //Any adddress in our space will do
+ BLOCK_SIZE, //Map length
+ PROT_READ|PROT_WRITE,// Enable reading & writting to mapped memory
+ MAP_SHARED, //Shared with other processes
+ mem_fd, //File to map
+ gpio_base //Offset to GPIO peripheral
+ );
+
+ close(mem_fd); //No need to keep mem_fd open after mmap
+
+ if (gpio_map == MAP_FAILED)
+ {
+ printf("mmap error %d\n", (int)gpio_map);//errno also set!
+ exit(-1); //TODO return a result code
+ }
+
+ // Always use volatile pointer!
+ gpio = (volatile unsigned *)gpio_map;
+#endif
+}
+
+
+void gpio_setin(int g)
+{
+#ifndef GPIO_SIMULATED
+ INP_GPIO(g);
+#else
+ printf("gpio:in:%d\n", g);
+#endif
+}
+
+
+void gpio_setout(int g)
+{
+#ifndef GPIO_SIMULATED
+ /* always INP_GPIO before OUT_GPIO */
+ //INP_GPIO(g); #### this causes glitching
+ OUT_GPIO(g);
+#else
+ printf("gpio:out:%d\n", g);
+#endif
+}
+
+
+void gpio_high(int g)
+{
+#ifndef GPIO_SIMULATED
+ GPIO_HIGH(g);
+#else
+ printf("gpio:high:%d\n", g);
+#endif
+}
+
+
+void gpio_low(int g)
+{
+#ifndef GPIO_SIMULATED
+ GPIO_LOW(g);
+#else
+ printf("gpio:low:%d\n", g);
+#endif
+}
+
+
+void gpio_write(int g, int v)
+{
+#ifndef GPIO_SIMULATED
+ if (v != 0)
+ {
+ GPIO_HIGH(g);
+ }
+ else
+ {
+ GPIO_LOW(g);
+ }
+#else
+ printf("gpio:write:%d=%d\n", g, v);
+#endif
+}
+
+
+int gpio_read(int g)
+{
+#ifndef GPIO_SIMULATED
+ return GPIO_READ(g);
+#else
+ return 0; /* always low in simulation */
+#endif
+}
+
+
+/***** END OF FILE *****/