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

Added boot from console floppy support to the VAX780 simulator (Changed console floppy device name from RXC to CS)

Browse source
This commit is contained in:
Mark Pizzolato 2013-04-11 08:45:07 -07:00
parent 798d1239f1
commit e0225c336a
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
VAX/vax780_defs.h
View file

@ -389,6 +389,7 @@ typedef struct {
#define BOOT_RL 2
#define BOOT_UDA 17
#define BOOT_TK 18
#define BOOT_CS 64
/* Function prototypes for virtual memory interface */

10
VAX/vax780_sbi.c
View file

@ -123,6 +123,7 @@ static struct boot_dev boot_tab[] = {
{ "RQC", BOOT_UDA, 1 << 24 },
{ "RQD", BOOT_UDA, 1 << 24 },
{ "TQ", BOOT_TK, 1 << 24 },
{ "CS", BOOT_CS, 0 },
{ NULL }
};
@ -652,6 +653,7 @@ t_stat vax780_boot_parse (int32 flag, char *ptr)
char gbuf[CBUFSIZE];
char *slptr, *regptr;
int32 i, r5v, unitno;
uint32 ba;
DEVICE *dptr;
UNIT *uptr;
DIB *dibp;
@ -669,7 +671,9 @@ if ((dptr == NULL) || (uptr == NULL))
return SCPE_ARG;
dibp = (DIB *) dptr->ctxt; /* get DIB */
if (dibp == NULL)
return SCPE_ARG;
ba = 0;
else
ba = dibp->ba;
unitno = (int32) (uptr - dptr->units);
r5v = 0;
if ((strncmp (regptr, "/R5:", 4) == 0) ||
@ -694,12 +698,12 @@ for (i = 0; boot_tab[i].name != NULL; i++) {
if (strcmp (dptr->name, boot_tab[i].name) == 0) {
R[0] = boot_tab[i].code;
if (dptr->flags & DEV_MBUS) {
R[1] = dibp->ba + TR_MBA0;
R[1] = ba + TR_MBA0;
R[2] = unitno;
}
else {
R[1] = TR_UBA;
R[2] = boot_tab[i].let | (dibp->ba & UBADDRMASK);
R[2] = boot_tab[i].let | (ba & UBADDRMASK);
}
R[3] = unitno;
R[4] = 0;

4
VAX/vax780_stddev.c
View file

@ -25,7 +25,7 @@
tti console input
tto console output
rx console floppy
cs console floppy
todr TODR clock
tmr interval timer
@ -405,7 +405,7 @@ MTAB fl_mod[] = {
};
DEVICE fl_dev = {
"RXC", &fl_unit, fl_reg, fl_mod,
"CS", &fl_unit, fl_reg, fl_mod,
1, DEV_RDX, 20, 1, DEV_RDX, 8,
NULL, NULL, &fl_reset,
NULL, NULL, NULL,