github.com/open-simh.simh
1
0
Fork 0
mirror of https://github.com/open-simh/simh.git synced 2026-05-03 14:49:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ControlFlow' into simv3.8-2-rc2

Browse Source 
Conflicts:
	scp.c
This commit is contained in:
Mark Pizzolato
2011-04-15 09:19:29 -07:00
parent a9fd3dd518 766e7058f1
commit 8eb9caff10
4 changed files with 338 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AltairZ80/altairZ80_sio.c
View File

@@ -149,7 +149,6 @@ extern const t_bool rtc_avail;
extern uint32 PCX;
extern int32 sim_switches;
extern int32 sim_quiet;
extern const char *scp_error_messages[];
extern int32 SR;
extern UNIT cpu_unit;
extern volatile int32 stop_cpu;
@@ -1189,7 +1188,7 @@ static void attachCPM(UNIT *uptr) {
sim_quiet = sim_switches & SWMASK ('Q'); /* -q means quiet */
lastCPMStatus = attach_unit(uptr, cpmCommandLine);
if ((lastCPMStatus != SCPE_OK) && (simh_device.dctrl & VERBOSE_MSG))
printf("SIMH: " ADDRESS_FORMAT " Cannot open '%s' (%s)." NLP, PCX, cpmCommandLine, scp_error_messages[lastCPMStatus - SCPE_BASE]);
printf("SIMH: " ADDRESS_FORMAT " Cannot open '%s' (%s)." NLP, PCX, cpmCommandLine, sim_error_text(lastCPMStatus));
}
/* setClockZSDOSAdr points to 6 byte block in M: YY MM DD HH MM SS in BCD notation */