Remove changes specific to Joshua's PRP

- Revert type change in Neighborhood microbenchmark
- Remove inputs modified to fix in the available memory on the
  i.MX6DQ PRP test platform
- Change default configuration to build without LITMUS/MC^2/MMDC

6 files changed, 4 insertions, 24 deletions

diff --git a/baseline/source/extra.h b/baseline/source/extra.h
index 81ec146..5e527c6 100644
--- a/baseline/source/extra.h
+++ b/baseline/source/extra.h
@@ -21,9 +21,9 @@
 #include <sys/syscall.h>
 #endif
 
-#define LITMUS 1
-#define MC2 1
-#define MMDC_PROF 1
+#define LITMUS 0
+#define MC2 0
+#define MMDC_PROF 0
 
 #if LITMUS
 #include <litmus.h>
diff --git a/dis/original/Neighborhood/utili.h b/dis/original/Neighborhood/utili.h
index 87a481c..2a8e2a0 100644
--- a/dis/original/Neighborhood/utili.h
+++ b/dis/original/Neighborhood/utili.h
@@ -54,7 +54,7 @@ typedef struct {
   Angeles distLong;
 }Neighborhood;
 
-typedef char Pixel; /* short int;*/
+typedef short int Pixel; /* short int;*/
 
 
 void drawLineSegment(Pixel *image,
diff --git a/dis/original/inputs/Matrix/in0 b/dis/original/inputs/Matrix/in0
deleted file mode 100755
index 73d7fb1..0000000
--- a/dis/original/inputs/Matrix/in0
+++ /dev/null
@@ -1 +0,0 @@
--2 1500 20000 1000 0.002734 
diff --git a/dis/original/inputs/Neighborhood/in0 b/dis/original/inputs/Neighborhood/in0
deleted file mode 100755
index 346f216..0000000
--- a/dis/original/inputs/Neighborhood/in0
+++ /dev/null
@@ -1,2 +0,0 @@
--2 8 5001 7000 10 3000 300 3000
-   
diff --git a/dis/original/inputs/Pointer/in0 b/dis/original/inputs/Pointer/in0
deleted file mode 100755
index ca33182..0000000
--- a/dis/original/inputs/Pointer/in0
+++ /dev/null
@@ -1,13 +0,0 @@
-1485770 15 5120000
- -2 10 
-10 1485760 1485760
-10 1485760 1485760
-10 1485760 1485760
-10 1485760 1485760
-10 1485760 1485760
-10 1485760 1485760
-10 1485760 1485760
-10 1485760 1485760
-10 1485760 1485760
-10 1485760 1485760
-
diff --git a/dis/original/inputs/Update/in0 b/dis/original/inputs/Update/in0
deleted file mode 100755
index 1412ed0..0000000
--- a/dis/original/inputs/Update/in0
+++ /dev/null
@@ -1,4 +0,0 @@
-1048577 15 1000 -2  
-10 1048576 1048576
-
-