--- cci/d/mem/monitor.c	2019/07/28 12:24:19	1.1.1.1
+++ cci/d/mem/monitor.c	2019/07/28 12:30:16	1.1.1.2
@@ -3,9 +3,9 @@
 #define CRTN      0x0d
 #define EOL       '.'
 #define INTSIZE   8
-#define msg1	"\n**************** Memory Test (V1.1) ****************"
-#define msg2	"\nSUBTEST		TITLE"
-#define msg3	"\n   0		Execute subtest 1 - 6"
+#define msg1	"\n**************** Memory Test (R1.2) ****************"
+#define msg2	"\n  TEST		TITLE"
+#define msg3	"\n   0		Execute tests 1 - 6"
 #define msg4	"\n   1		Marching patterns"
 #define msg5	"\n   2		Unique address"
 #define msg6	"\n   3		Adjacent cell disturbance"
@@ -35,16 +35,21 @@ monitor()
 	memory size as calculated in init.x, also indicate brd type
 	**********************************************************/
 	if (OPTIONS.header) {
-	  	writes(msg1);			
-	  	writes("\n\nMemory size = "); 
-		writed(maxmem); writes(" bytes;");
-		if (OPTIONS.fourmb) {
+	  writes(msg1);			
+	  writes("\n\nMemory size = "); 
+	  writed(maxmem); writes(" bytes;");
+	  if (OPTIONS.mixed)
+		writes(" 20 Mb mixed configuration option selected\n");
+	  else  {
+		if (OPTIONS.fourmb)
 			writes(" 4mb memory board option selected\n");
-			}
-		else 	{
+		else
 			writes(" 1mb memory board option selected\n");
 		}
-	}
+			    }
+	if ( test_no > MAX_TST ) {
+		writes("\n invalid test number: must be 0 or 1-6");
+		gettest(); }
 	if (!OPTIONS.diagmode) {
 		endprog = abend;
 		maxmem = abmax;
@@ -80,14 +85,10 @@ end:		writes("\n\nenter ending memory ad
 		    writeh(maxmem);
 		    goto end;
 		    }	
-		gettest();
-		writes("\n\nenter cycle count : ");count = gethex();
-		if (count == 0xffffffff) nonstop = 1;
-		if (count == 0x0) count = 1;
 		}
 	/***************************************************************
-	If the selected test was greater than MAX_TST then set tstmsk to
-	run all tests.  Otherwise set tstmsk to the selected test.	
+	If the selected test was 0 then set tstmsk to run all tests.
+	Else set tstmsk to the selected test.	
 	***************************************************************/
 	if (!test_no) tstmsk = 1|2|4|8|16|32;		
 		else {
@@ -109,7 +110,7 @@ int valid;
 char c;
 valid = 1;
 while(valid){
-	writes("\n\nenter subtest number or '?' for help : ");
+	writes("\n\nenter test number or '?' for help : ");
 	c = readc();
 	switch(c){
 		case '0':