From 92703806fc1c833899dce552fbfd13289d7ff8cd Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Thu, 19 Sep 2013 20:44:18 -0700
Subject: [PATCH] Re-arrange distribution files, merge a2serclk into a2pid

---
 {src => share}/A2PI.PO         | Bin
 {src => share}/a2slideshow.bin | Bin
 {src => share}/a2slideshow.mon |   0
 {src => share}/bintomon.c      |   0
 {src => share}/execfile        |   0
 {src => share}/merlin2text.c   |   0
 {src => share}/text2merlin.c   |   0
 src/{a2serclk.c => gpclk.c}    |  24 +++++++++++++++---------
 8 files changed, 15 insertions(+), 9 deletions(-)
 rename {src => share}/A2PI.PO (100%)
 rename {src => share}/a2slideshow.bin (100%)
 rename {src => share}/a2slideshow.mon (100%)
 rename {src => share}/bintomon.c (100%)
 rename {src => share}/execfile (100%)
 rename {src => share}/merlin2text.c (100%)
 rename {src => share}/text2merlin.c (100%)
 rename src/{a2serclk.c => gpclk.c} (89%)

diff --git a/src/A2PI.PO b/share/A2PI.PO
similarity index 100%
rename from src/A2PI.PO
rename to share/A2PI.PO
diff --git a/src/a2slideshow.bin b/share/a2slideshow.bin
similarity index 100%
rename from src/a2slideshow.bin
rename to share/a2slideshow.bin
diff --git a/src/a2slideshow.mon b/share/a2slideshow.mon
similarity index 100%
rename from src/a2slideshow.mon
rename to share/a2slideshow.mon
diff --git a/src/bintomon.c b/share/bintomon.c
similarity index 100%
rename from src/bintomon.c
rename to share/bintomon.c
diff --git a/src/execfile b/share/execfile
similarity index 100%
rename from src/execfile
rename to share/execfile
diff --git a/src/merlin2text.c b/share/merlin2text.c
similarity index 100%
rename from src/merlin2text.c
rename to share/merlin2text.c
diff --git a/src/text2merlin.c b/share/text2merlin.c
similarity index 100%
rename from src/text2merlin.c
rename to share/text2merlin.c
diff --git a/src/a2serclk.c b/src/gpclk.c
similarity index 89%
rename from src/a2serclk.c
rename to src/gpclk.c
index d548a8c..28e94b7 100755
--- a/src/a2serclk.c
+++ b/src/gpclk.c
@@ -31,10 +31,11 @@
 #define CM_GP0CTL (0x7E101070)
 #define CM_GP0DIV (0x7E101074)
 
+#define IOMAP_LEN	4096
 //
 // Set up a memory regions to access GPIO
 //
-volatile unsigned int *setup_io(reg_base)
+volatile unsigned int *setup_io(int reg_base)
 {
     int  mem_fd;
     void *io_map;
@@ -47,7 +48,7 @@ volatile unsigned int *setup_io(reg_base)
     }
     // mmap IO
     io_map = mmap(NULL,             //Any adddress in our space will do
-		  4096,             //Map length
+		  IOMAP_LEN,       //Map length
 		  PROT_READ|PROT_WRITE,// Enable reading & writting to mapped memory
 		  MAP_SHARED,       //Shared with other processes
 		  mem_fd,           //File to map
@@ -59,13 +60,17 @@ volatile unsigned int *setup_io(reg_base)
 	exit(-1);
     }
     return (volatile unsigned *)io_map;
- }
+}
 
-// I/O access
-volatile unsigned *gpio, *cmgp;
-
-int main(int argc, char **argv)
+void release_io(volatile unsigned int *io_map)
 {
+    munmap((void *)io_map, IOMAP_LEN);
+}
+
+void setserclk(void)
+{
+    // I/O access
+    volatile unsigned *gpio, *cmgp;
     int g,rep;
 
     // Set up gpi pointer for direct register access
@@ -90,7 +95,8 @@ int main(int argc, char **argv)
     // Set GCLK function (ALT0) for GPIO 4 (header pin #7)
     INP_GPIO(4);
     SET_GPIO_ALT(4, 0x00);
-
-    return 0;
+    // Release I/O space
+    release_io(gpio);
+    release_io(cmgp);
 }