diff --git a/tools/palm/hwTestSuite/armSideCode/armControl.S b/tools/palm/hwTestSuite/armSideCode/armControl.S
new file mode 100755
index 0000000..bfeff7a
--- /dev/null
+++ b/tools/palm/hwTestSuite/armSideCode/armControl.S
@@ -0,0 +1,18 @@
+
+	.align 4
+	.globl  disableInts
+	.globl  enableInts
+	
+//uint32_t disableInts(void)
+disableInts:
+   MRS R0, CPSR
+   ORR R1, R0, #0xC0
+   MSR CPSR, R1
+   BX LR
+
+//void enableInts(uint32_t ints)
+enableInts:
+   MSR CPSR, R0
+   BX LR
+
+.pool
diff --git a/tools/palm/hwTestSuite/armSideCode/armControl.c b/tools/palm/hwTestSuite/armSideCode/armControl.c
index de92eb1..9a6118b 100644
--- a/tools/palm/hwTestSuite/armSideCode/armControl.c
+++ b/tools/palm/hwTestSuite/armSideCode/armControl.c
@@ -1,10 +1 @@
 #include <stdint.h>
-
-
-uint32_t disableInts(void){
-   //TODO: x
-}
-
-void enableInts(uint32_t ints){
-   //TODO: x
-}
diff --git a/tools/palm/hwTestSuite/cpu.c b/tools/palm/hwTestSuite/cpu.c
index 9af5e3b..8b29169 100644
--- a/tools/palm/hwTestSuite/cpu.c
+++ b/tools/palm/hwTestSuite/cpu.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 
 #include "testSuite.h"
-#include "specs/dragonballVzRegisterSpec.h"
+#include "dbvzRegisterNames.h"
 #include "viewer.h"
 #include "cpu.h"
 
diff --git a/tools/palm/hwTestSuite/testSuite.h b/tools/palm/hwTestSuite/testSuite.h
index b803886..2a2e377 100644
--- a/tools/palm/hwTestSuite/testSuite.h
+++ b/tools/palm/hwTestSuite/testSuite.h
@@ -9,6 +9,7 @@
 /*defines*/
 #define CODE_SECTION(codeSection) __attribute__((section(codeSection)))
 #define ALIGN(size) __attribute__((aligned(size)))
+#define HW_REG_ADDR(x) (0xFFFFF000 | (x))
 
 #define SHARED_DATA_BUFFER_SIZE 1000
 
diff --git a/tools/palm/hwTestSuite/tests.c b/tools/palm/hwTestSuite/tests.c
index f4e34df..33ccbcf 100644
--- a/tools/palm/hwTestSuite/tests.c
+++ b/tools/palm/hwTestSuite/tests.c
@@ -5,8 +5,8 @@
 
 #include "testSuite.h"
 #include "testSuiteConfig.h"
-#include "specs/dragonballVzRegisterSpec.h"
-#include "specs/sed1376RegisterSpec.h"
+#include "dbvzRegisterNames.h"
+#include "sed1376RegisterNames.h"
 #include "debug.h"
 #include "tools.h"
 #include "cpu.h"
diff --git a/tools/palm/hwTestSuite/tools.c b/tools/palm/hwTestSuite/tools.c
index b95e007..1d73724 100644
--- a/tools/palm/hwTestSuite/tools.c
+++ b/tools/palm/hwTestSuite/tools.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <Extensions/ExpansionMgr/VFSMgr.h>
 
-#include "specs/dragonballVzRegisterSpec.h"
+#include "dbvzRegisterNames.h"
 #include "testSuite.h"
 #include "viewer.h"
 #include "debug.h"