Improved handling of internal CCP

Author: MockbaTheBorg

Release/RunCPM.exe

@@ -72,83 +72,76 @@ int lst_open = FALSE;
 #endif
 
 void setup(void) {
-	pinMode(LED, OUTPUT);
-	digitalWrite(LED, LOW);
-	Serial.begin(SERIALSPD);
-	while (!Serial) {	// Wait until serial is connected
-		digitalWrite(LED, HIGH^LEDinv);
-		delay(sDELAY);
-		digitalWrite(LED, LOW^LEDinv);
-		delay(sDELAY);
-	}
+  pinMode(LED, OUTPUT);
+  digitalWrite(LED, LOW);
+  Serial.begin(SERIALSPD);
+  while (!Serial) {	// Wait until serial is connected
+    digitalWrite(LED, HIGH^LEDinv);
+    delay(sDELAY);
+    digitalWrite(LED, LOW^LEDinv);
+    delay(sDELAY);
+  }
 
 #ifdef DEBUGLOG
-	_sys_deletefile((uint8 *)LogName);
+  _sys_deletefile((uint8 *)LogName);
 #endif
 
-	_clrscr();
-	_puts("CP/M 2.2 Emulator v" VERSION " by Marcelo Dantas\r\n");
-	_puts("Arduino read/write support by Krzysztof Klis\r\n");
-	_puts("      Build " __DATE__ " - " __TIME__ "\r\n");
-	_puts("--------------------------------------------\r\n");
-	_puts("CCP: " CCPname "    CCP Address: 0x");
-	_puthex16(CCPaddr);
-	_puts("\r\nBOARD: ");
+  _clrscr();
+  _puts("CP/M 2.2 Emulator v" VERSION " by Marcelo Dantas\r\n");
+  _puts("Arduino read/write support by Krzysztof Klis\r\n");
+  _puts("      Build " __DATE__ " - " __TIME__ "\r\n");
+  _puts("--------------------------------------------\r\n");
+  _puts("CCP: " CCPname "    CCP Address: 0x");
+  _puthex16(CCPaddr);
+  _puts("\r\nBOARD: ");
   _puts(BOARD);
   _puts("\r\n");
 
   _puts("Initializing SD card.\r\n");
   if (SD.begin(SDINIT)) {
-#ifdef CCP_INTERNAL
-		while(true)
-		{
-			_PatchCPM();
-			Status = 0;
-			_ccp();
-			if (Status == 1)
-				break;
-		}
+    if (VersionCCP >= 0x10 || SD.exists(CCPname)) {
+      while (true) {
+        _puts(CCPHEAD);
+        _PatchCPM();
+	Status = 0;
+#ifndef CCP_INTERNAL
+        if (!_RamLoad((char *)CCPname, CCPaddr)) {
+          _puts("Unable to load the CCP.\r\nCPU halted.\r\n");
+          break;
+        }
+        Z80reset();
+        SET_LOW_REGISTER(BC, _RamRead(0x0004));
+        PC = CCPaddr;
+        Z80run();
 #else
-		if (SD.exists(CCPname)) {
-			while (true) {
-				_puts(CCPHEAD);
-				if (_RamLoad((char *)CCPname, CCPaddr)) {
-					_PatchCPM();
-					Z80reset();
-					SET_LOW_REGISTER(BC, _RamRead(0x0004));
-					PC = CCPaddr;
-					Z80run();
-					if (Status == 1)
-  						break;
-				} else {
-					_puts("Unable to load the CCP. CPU halted.\r\n");
-					break;
-				}
+        _ccp();
+#endif
+        if (Status == 1)
+          break;
 #ifdef USE_PUN
-				if (pun_dev)
-					_sys_fflush(pun_dev);
+        if (pun_dev)
+          _sys_fflush(pun_dev);
 #endif
 #ifdef USE_LST
-				if (lst_dev)
-					_sys_fflush(lst_dev);
-#endif
-			}
-		} else {
-			_puts("Unable to load CP/M CCP. CPU halted.\r\n");
-		}
+        if (lst_dev)
+          _sys_fflush(lst_dev);
 #endif
-	} else {
-		_puts("Unable to initialize SD card. CPU halted.\r\n");
-	}
+      }
+    } else {
+      _puts("Unable to load CP/M CCP.\r\nCPU halted.\r\n");
+    }
+  } else {
+    _puts("Unable to initialize SD card.\r\nCPU halted.\r\n");
+  }
 }
 
 void loop(void) {
-	digitalWrite(LED, HIGH^LEDinv);
-	delay(DELAY);
-	digitalWrite(LED, LOW^LEDinv);
-	delay(DELAY);
-	digitalWrite(LED, HIGH^LEDinv);
-	delay(DELAY);
-	digitalWrite(LED, LOW^LEDinv);
-	delay(DELAY * 4);
+  digitalWrite(LED, HIGH^LEDinv);
+  delay(DELAY);
+  digitalWrite(LED, LOW^LEDinv);
+  delay(DELAY);
+  digitalWrite(LED, HIGH^LEDinv);
+  delay(DELAY);
+  digitalWrite(LED, LOW^LEDinv);
+  delay(DELAY * 4);
 }

RunCPM/RunCPM.ino

@@ -528,8 +528,6 @@ void _ccp(void) {
 
 	uint8 i;
 
-	_puts(CCPHEAD);
-
 	sFlag = (uint8)_ccp_bdos(DRV_ALLRESET, 0x0000);
 	_ccp_bdos(DRV_SET, curDrive);
 

RunCPM/ccp.h

@@ -36,7 +36,7 @@
 //
 #ifdef CCP_INTERNAL
 #define CCPname		"INTERNAL v1.5"			// Will use the CCP from ccp.h
-#define VersionCCP	0x15
+#define VersionCCP	0x15              // 0x10 and above reserved for Internal CCP
 #define BatchFCB	(tmpFCB + 36)
 #define CCPaddr		(BDOSjmppage-0x0800)
 #endif

RunCPM/globals.h

@@ -75,39 +75,32 @@ int main(int argc, char *argv[]) {
 	_puts("\r\n");
 
 	while (TRUE) {
-#ifdef CCP_INTERNAL
-		_PatchCPM();
+		_puts(CCPHEAD);
+		_PatchCPM();	// Patches the CP/M entry points and other things in
 		Status = 0;
-		_ccp();
-		if (Status == 1)	// This is set by a call to BIOS 0 - ends CP/M
-			break;
-#else
-		if(! _sys_exists((uint8*)CCPname)) {
-			_puts("\r\nCan't open CCP!\r\n");
-			break;
-		} else {
-			//**********  Boot code  **********//
-			_puts(CCPHEAD);
+		if(VersionCCP >= 0x10 || _sys_exists((uint8*)CCPname)) {
+#ifndef CCP_INTERNAL
 			_RamLoad((uint8*)CCPname, CCPaddr);	// Loads the CCP binary file into memory
-			_PatchCPM();	// Patches the CP/M entry points and other things in
-
-
 			Z80reset();			// Resets the Z80 CPU
 			SET_LOW_REGISTER(BC, _RamRead(0x0004));	// Sets C to the current drive/user
 			PC = CCPaddr;		// Sets CP/M application jump point
 			Z80run();			// Starts simulation
+#else
+			_ccp();
+#endif
 			if (Status == 1)	// This is set by a call to BIOS 0 - ends CP/M
 				break;
-		}
-#endif
 #ifdef USE_PUN
-		if (pun_dev)
-			_sys_fflush(pun_dev);
+			if (pun_dev)
+				_sys_fflush(pun_dev);
 #endif
 #ifdef USE_LST
-		if (lst_dev)
-			_sys_fflush(lst_dev);
+			if (lst_dev)
+				_sys_fflush(lst_dev);
 #endif
+		} else {
+			_puts("Unable to load CP/M CCP.\r\nCPU halted.\r\n");
+		}
 	}
 
 	_console_reset();