renaming some functions

git-svn-id: https://svn.spreadspace.org/mur.sat@531 7de4ea59-55d0-425e-a1af-a3118ea81d4c

1 files changed, 21 insertions, 16 deletions

diff --git a/tools/idm-ringbuffer/ringbuffer.c b/tools/idm-ringbuffer/ringbuffer.c
index 2fc028e..f012c26 100644
--- a/tools/idm-ringbuffer/ringbuffer.c
+++ b/tools/idm-ringbuffer/ringbuffer.c
@@ -11,7 +11,7 @@
  *
  *
  *  Copyright (C) 2012 Christian Pointner <equinox@mur.at>
- *                     Markus Grüneis <gimpf@gimpf.org>
+ *                     Markus Grüneis <gimpf@gimpf.org>
  *
  *  This file is part of mur.sat.
  *
@@ -48,15 +48,21 @@ char picRam[RAM_SIZE] = { 0 };
 char* bufferStart = &(picRam[BUFFER_START]);
 char* bufferEnd = &(picRam[BUFFER_END - 1]);
 
+char spiData = 0;
+char *writePtr, *readPtr;
+BOOL overrun, underrun, cmd_read;
+
 
 /* ##### Code under Test  ##### */
 
-char* writePtr = 0;
-char* readPtr = 0;
-BOOL overrun = FALSE;
-BOOL underrun = TRUE;
-BOOL cmd_read = FALSE;
-char spiData = 0;
+void init()
+{
+  writePtr = bufferStart;
+  readPtr = bufferStart;
+  overrun = FALSE;
+  underrun = TRUE;
+  cmd_read = FALSE;
+}
 
 void incrementWriteIdx()
 {
@@ -93,7 +99,7 @@ void endRead()
   incrementReadIdx();
 }
 
-void storeSample()
+void timer2Interrupt()
 {
   static char value = 0;
   if (!overrun) {
@@ -102,7 +108,7 @@ void storeSample()
   }
 }
 
-void triggerByteTransferred()
+void sspInterrupt()
 {
   if (cmd_read && spiData == 0) {
     endRead();
@@ -136,14 +142,13 @@ void debugPrint(char cmd) {
 
 int main()
 {
-  writePtr = bufferStart;
-  readPtr = bufferStart;
-  
   struct termios t;
   tcgetattr(STDIN_FILENO, &t);
   t.c_lflag &= ~(ICANON | ECHO);
   tcsetattr(STDIN_FILENO, TCSANOW, &t);
-  
+
+  init();
+
   int key;
   debugPrint(' '); 
   for(;;) {
@@ -154,9 +159,9 @@ int main()
     case 'q': return 0;
     case '\r':
     case '\n': break;
-    case '+': storeSample(); debugPrint(key); break;
-    case '0': spiData = 0; triggerByteTransferred(); debugPrint(key); break;
-    default: spiData = key; triggerByteTransferred(); debugPrint(key); break;
+    case '+': timer2Interrupt(); debugPrint(key); break;
+    case '0': spiData = 0; sspInterrupt(); debugPrint(key); break;
+    default: spiData = key; sspInterrupt(); debugPrint(key); break;
     }
   }