folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'nj7p/swtp6800-v2.1'

Browse source 
Conflicts:
	makefile
	swtp6800/common/bootrom.c
	swtp6800/common/dc-4.c
	swtp6800/common/i2716.c
	swtp6800/common/m6800.c
	swtp6800/common/m6810.c
	swtp6800/common/mp-8m.c
	swtp6800/common/mp-a.c
	swtp6800/common/mp-a2.c
	swtp6800/common/mp-b2.c
	swtp6800/common/mp-s.c
	swtp6800/swtp6800/mp-a2_sys.c
	swtp6800/swtp6800/mp-a_sys.c
	swtp6800/swtp6800/swtp_defs.h
This commit is contained in:
Mark Pizzolato 2012-07-13 15:21:30 -07:00
commit 66edd72ecb
4 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
makefile
View file

@ -839,3 +839,4 @@ swtp6800mp-a2 : ${BIN}swtp6800mp-a2${EXE}
${BIN}swtp6800mp-a2${EXE} : ${SWTP6800MP-A2} ${SIM} ${BIN}swtp6800mp-a2${EXE} : ${SWTP6800MP-A2} ${SIM}
${MKDIRBIN} ${MKDIRBIN}
${CC} ${SWTP6800MP-A2} ${SIM} ${SWTP6800_OPT} $(CC_OUTSPEC) ${LDFLAGS} ${CC} ${SWTP6800MP-A2} ${SIM} ${SWTP6800_OPT} $(CC_OUTSPEC) ${LDFLAGS}

24
swtp6800/common/dc-4.c
View file

@ -551,18 +551,18 @@ int32 fdcdata(int32 io, int32 data)
} }
return 0; return 0;
} else { /* read byte from fdc */ } else { /* read byte from fdc */
if (dsk_unit[cur_dsk].pos < SECSIZ) { /* copy bytes from buffer */ if (dsk_unit[cur_dsk].pos < SECSIZ) { /* copy bytes from buffer */
if (dsk_dev.dctrl & DEBUG_read) if (dsk_dev.dctrl & DEBUG_read)
printf("\nfdcdata: Reading byte %d u3=%02X", dsk_unit[cur_dsk].pos, dsk_unit[cur_dsk].u3); printf("\nfdcdata: Reading byte %d u3=%02X", dsk_unit[cur_dsk].pos, dsk_unit[cur_dsk].u3);
val = *((uint8 *)(dsk_unit[cur_dsk].filebuf) + dsk_unit[cur_dsk].pos) & 0xFF; val = *((uint8 *)(dsk_unit[cur_dsk].filebuf) + dsk_unit[cur_dsk].pos) & 0xFF;
dsk_unit[cur_dsk].pos++; /* step counter */ dsk_unit[cur_dsk].pos++; /* step counter */
if (dsk_unit[cur_dsk].pos == SECSIZ) { /* done? */ if (dsk_unit[cur_dsk].pos == SECSIZ) { /* done? */
dsk_unit[cur_dsk].u3 &= ~(BUSY | DRQ); /* clear flags */ dsk_unit[cur_dsk].u3 &= ~(BUSY | DRQ); /* clear flags */
if (dsk_dev.dctrl & DEBUG_write) if (dsk_dev.dctrl & DEBUG_write)
printf("\nfdcdata: Sector read complete"); printf("\nfdcdata: Sector read complete");
} }
return val; return val;
} else } else
return 0; return 0;
} }
} }

11
swtp6800/common/mp-s.c
View file

@ -1,4 +1,4 @@
/* mp-s.c: SWTP MP-S serial I/O card emulator /* mp-s.c: SWTP MP-S serial I/O card simulator
Copyright (c) 2005-2011, William Beech Copyright (c) 2005-2011, William Beech
@ -188,6 +188,7 @@ int32 sio_reset (DEVICE *dptr)
{ {
sio_unit.buf = 0; // Data buffer sio_unit.buf = 0; // Data buffer
sio_unit.u3 = 0x02; // Status buffer sio_unit.u3 = 0x02; // Status buffer
sio_unit.wait = 10000;
sim_activate (&sio_unit, sio_unit.wait); // activate unit sim_activate (&sio_unit, sio_unit.wait); // activate unit
return SCPE_OK; return SCPE_OK;
} }
@ -198,8 +199,8 @@ int32 ptr_reset (DEVICE *dptr)
{ {
ptr_unit.buf = 0; ptr_unit.buf = 0;
ptr_unit.u3 = 0x02; ptr_unit.u3 = 0x02;
sim_activate (&ptr_unit, ptr_unit.wait); // activate unit // sim_activate (&ptr_unit, ptr_unit.wait); // activate unit
// sim_cancel (&ptr_unit); // deactivate unit sim_cancel (&ptr_unit); // deactivate unit
return SCPE_OK; return SCPE_OK;
} }
@ -209,8 +210,8 @@ int32 ptp_reset (DEVICE *dptr)
{ {
ptp_unit.buf = 0; ptp_unit.buf = 0;
ptp_unit.u3 = 0x02; ptp_unit.u3 = 0x02;
sim_activate (&ptp_unit, ptp_unit.wait); // activate unit // sim_activate (&ptp_unit, ptp_unit.wait); // activate unit
// sim_cancel (&ptp_unit); // deactivate unit sim_cancel (&ptp_unit); // deactivate unit
return SCPE_OK; return SCPE_OK;
} }

2
swtp6800/swtp6800/swtp_defs.h
View file

@ -25,7 +25,7 @@ Copyright (c) 2005-2012, William Beech
*/ */
#include <ctype.h> #include <ctype.h>
#include "sim_defs.h" // simulator defs #include "sim_defs.h" // simulator defs
/* Memory */ /* Memory */