Remove unnecessary mods from the MIPS pull request (kernel and tests folder changes are not required, only the MIPS port folder is necessary).

kernel/atom.h

@@ -116,7 +116,7 @@ extern ATOM_TCB *atomCurrentContext (void);
 extern uint8_t atomThreadCreate (ATOM_TCB *tcb_ptr, uint8_t priority, void (*entry_point)(uint32_t), uint32_t entry_param, void *stack_bottom, uint32_t stack_size, uint8_t stack_check);
 extern uint8_t atomThreadStackCheck (ATOM_TCB *tcb_ptr, uint32_t *used_bytes, uint32_t *free_bytes);
 
-extern ATOM_TCB *archContextSwitch (ATOM_TCB *old_tcb_ptr, ATOM_TCB *new_tcb_ptr);
+extern void archContextSwitch (ATOM_TCB *old_tcb_ptr, ATOM_TCB *new_tcb_ptr);
 extern void archThreadContextInit (ATOM_TCB *tcb_ptr, void *stack_top, void (*entry_point)(uint32_t), uint32_t entry_param);
 extern void archFirstThreadRestore(ATOM_TCB *new_tcb_ptr);
 

kernel/atomkernel.c

@@ -343,7 +343,7 @@ static void atomThreadSwitch(ATOM_TCB *old_tcb, ATOM_TCB *new_tcb)
         curr_tcb = new_tcb;
 
         /* Call the architecture-specific context switch */
-        old_tcb = archContextSwitch (old_tcb, new_tcb);
+        archContextSwitch (old_tcb, new_tcb);
     }
 
     /**

kernel/atomport-template.h

@@ -30,6 +30,7 @@
 #ifndef __ATOM_PORT_H
 #define __ATOM_PORT_H
 
+
 /* Required number of system ticks per second (normally 100 for 10ms tick) */
 #define SYSTEM_TICKS_PER_SEC            100
 

tests/kern2.c

@@ -31,9 +31,6 @@
 #include "atom.h"
 #include "atomtests.h"
 
-#ifdef STAND_ALONE
-#include <printk.h>
-#endif
 
 /**
  * \b test_start

tests/kern3.c

@@ -31,9 +31,6 @@
 #include "atom.h"
 #include "atomtests.h"
 
-#ifdef STAND_ALONE
-#include <printk.h>
-#endif
 
 /* Number of test threads */
 #define NUM_TEST_THREADS      2

tests/kern4.c

@@ -31,9 +31,6 @@
 #include "atom.h"
 #include "atomtests.h"
 
-#ifdef STAND_ALONE
-#include <printk.h>
-#endif
 
 /* Number of test threads */
 #define NUM_TEST_THREADS      4

tests/mutex1.c

@@ -31,6 +31,7 @@
 #include "atommutex.h"
 #include "atomtests.h"
 
+
 /* Number of test threads */
 #define NUM_TEST_THREADS      2
 

tests/mutex3.c

@@ -32,9 +32,6 @@
 #include "atomtests.h"
 #include "atommutex.h"
 
-#ifdef STAND_ALONE
-#include <printk.h>
-#endif
 
 /* Number of test threads */
 #define NUM_TEST_THREADS      4

tests/mutex4.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atommutex.h"

tests/mutex5.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atommutex.h"

tests/mutex6.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atommutex.h"

tests/mutex8.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atommutex.h"
 #include "atomtests.h"

tests/mutex9.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atommutex.h"

tests/queue10.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomqueue.h"
 #include "atomtests.h"

tests/queue2.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomqueue.h"
 #include "atomtests.h"

tests/queue3.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomqueue.h"
 #include "atomtests.h"

tests/queue5.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atomqueue.h"

tests/queue6.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomqueue.h"
 #include "atomtests.h"

tests/queue7.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomqueue.h"
 #include "atomtests.h"

tests/queue8.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atomqueue.h"

tests/queue9.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atomqueue.h"

tests/sem3.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atomsem.h"

tests/sem4.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atomsem.h"

tests/sem5.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atomsem.h"

tests/sem6.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atomsem.h"

tests/sem7.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atomsem.h"

tests/sem8.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"
 #include "atomsem.h"

tests/sem9.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomsem.h"
 #include "atomtests.h"

tests/test-template.c

@@ -31,6 +31,7 @@
 #include "atom.h"
 #include "atomtests.h"
 
+
 /**
  * \b test_start
  *
@@ -52,4 +53,4 @@ uint32_t test_start (void)
     /* Quit */
     return failures;
 
-}
+}

tests/timer2.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtimer.h"
 #include "atomtests.h"

tests/timer4.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtimer.h"
 #include "atomtests.h"
@@ -189,4 +190,4 @@ static void testCallback (POINTER cb_data)
         /* Not called at expected time, don't clear the location */
     }
 
-}
+}

tests/timer5.c

@@ -27,11 +27,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomsem.h"
 #include "atomtimer.h"
 #include "atomtests.h"
 
+
 /* Global test data */
 static volatile int callback_ran_flag;
 

tests/timer6.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtimer.h"
 #include "atomtests.h"
@@ -151,4 +152,4 @@ static void testCallback (POINTER cb_data)
 {
     /* Callback was called */
     *(int *)cb_data = TRUE;
-}
+}

tests/timer7.c

@@ -27,6 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+
 #include "atom.h"
 #include "atomtests.h"