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

isys8010, isys8020, isys8024, isys8030, imds-225: Coverity identified problems

Browse source 
Corrected disk controller behaviors.
This commit is contained in:
Bill Beech 2017-03-13 16:57:26 -07:00
parent f10f8bc9c5
commit a943737ab4
11 changed files with 6408 additions and 6332 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Intel-Systems/common/i8080.c
View file

@ -1258,7 +1258,7 @@ int32 sim_load (FILE *fileref, CONST char *cptr, CONST char *fnam, int flag)
/* Symbolic output - working /* Symbolic output - working
Inputs: Inputs:
*of = output stream *of = output stream
addr = current PC addr = current PC
*val = pointer to values *val = pointer to values
*uptr = pointer to unit *uptr = pointer to unit

14
Intel-Systems/common/ioc-cont.c
View file

@ -158,13 +158,13 @@ uint8 ioc_cont0(t_bool io, uint8 data)
{ {
if (io == 0) { /* read data port */ if (io == 0) { /* read data port */
if (DEBUG) if (DEBUG)
sim_printf(" ioc_cont0: read data returned %02X PCX=%04X\n", dbb_out, PCX); sim_printf("\n ioc_cont0: read data returned %02X PCX=%04X", dbb_out, PCX);
return dbb_out; return dbb_out;
} else { /* write data port */ } else { /* write data port */
dbb_in = data; dbb_in = data;
dbb_stat |= IBF; dbb_stat |= IBF;
if (DEBUG) if (DEBUG)
sim_printf(" ioc_cont0: write data=%02X port=%02X PCX=%04X\n", dbb_in, port, PCX); sim_printf("\n ioc_cont0: write data=%02X port=%02X PCX=%04X", dbb_in, port, PCX);
return 0; return 0;
} }
} }
@ -177,21 +177,21 @@ uint8 ioc_cont1(t_bool io, uint8 data)
if ((dbb_stat & F0) && (dbb_stat & IBF)) { if ((dbb_stat & F0) && (dbb_stat & IBF)) {
temp = dbb_stat; temp = dbb_stat;
if (DEBUG) if (DEBUG)
sim_printf(" ioc_cont1: DBB status read 1 data=%02X PCX=%04X\n", dbb_stat, PCX); sim_printf("\n ioc_cont1: DBB status read 1 data=%02X PCX=%04X", dbb_stat, PCX);
dbb_stat &= ~IBF; //reset IBF flag dbb_stat &= ~IBF; //reset IBF flag
return temp; return temp;
} }
if ((dbb_stat & F0) && (dbb_stat & OBF)) { if ((dbb_stat & F0) && (dbb_stat & OBF)) {
temp = dbb_stat; temp = dbb_stat;
if (DEBUG) if (DEBUG)
sim_printf(" ioc_cont1: DBB status read 2 data=%02X PCX=%04X\n", dbb_stat, PCX); sim_printf("\n ioc_cont1: DBB status read 2 data=%02X PCX=%04X", dbb_stat, PCX);
dbb_stat &= ~OBF; //reset OBF flag dbb_stat &= ~OBF; //reset OBF flag
return temp; return temp;
} }
if (dbb_stat & F0) { if (dbb_stat & F0) {
temp = dbb_stat; temp = dbb_stat;
if (DEBUG) if (DEBUG)
sim_printf(" ioc_cont1: DBB status read 3 data=%02X PCX=%04X\n", dbb_stat, PCX); sim_printf("\n ioc_cont1: DBB status read 3 data=%02X PCX=%04X", dbb_stat, PCX);
dbb_stat &= ~F0; //reset F0 flag dbb_stat &= ~F0; //reset F0 flag
return temp; return temp;
} }
@ -222,10 +222,10 @@ uint8 ioc_cont1(t_bool io, uint8 data)
dbb_stat |= (F0 | IBF); dbb_stat |= (F0 | IBF);
break; break;
default: default:
sim_printf(" ioc_cont1: Unknown command %02X PCX=%04X\n", dbb_cmd, PCX); sim_printf("\n ioc_cont1: Unknown command %02X PCX=%04X", dbb_cmd, PCX);
} }
if (DEBUG) if (DEBUG)
sim_printf(" ioc_cont1: DBB command write data=%02X PCX=%04X\n", dbb_cmd, PCX); sim_printf("\n ioc_cont1: DBB command write data=%02X PCX=%04X", dbb_cmd, PCX);
return 0; return 0;
} }
} }

69
Intel-Systems/common/isbc201.c
View file

@ -63,15 +63,16 @@
bit 5 - write protect bit 5 - write protect
bit 6 - write error bit 6 - write error
bit 7 - not ready bit 7 - not ready
If result type is 10H If result type is 02H and ready has changed
bit 0 - zero bit 0 - zero
bit 1 - zero bit 1 - zero
bit 2 - zero bit 2 - zero
bit 3 - zero bit 3 - zero
bit 4 - zero bit 4 - drive 2 ready
bit 5 - zero bit 5 - drive 3 ready
bit 6 - drive 0 ready bit 6 - drive 0 ready
bit 7 - drive 1 ready bit 7 - drive 1 ready
else return 0
07FH - Write - Reset diskette system. 07FH - Write - Reset diskette system.
@ -135,7 +136,7 @@
u3 - u3 -
u4 - u4 -
u5 - fdc number u5 - fdc number.
u6 - fdd number. u6 - fdd number.
*/ */
@ -184,7 +185,8 @@
/* external globals */ /* external globals */
extern uint16 port; //port called in dev_table[port] extern uint16 port; //port called in dev_table[port]
extern int32 PCX;
/* external function prototypes */ /* external function prototypes */
@ -224,6 +226,7 @@ typedef struct { //FDC definition
uint16 baseport; //FDC base port uint16 baseport; //FDC base port
uint16 iopb; //FDC IOPB uint16 iopb; //FDC IOPB
uint8 stat; //FDC status uint8 stat; //FDC status
uint8 rdychg; //FDC ready changed
uint8 rtype; //FDC result type uint8 rtype; //FDC result type
uint8 rbyte0; //FDC result byte for type 00 uint8 rbyte0; //FDC result byte for type 00
uint8 rbyte1; //FDC result byte for type 10 uint8 rbyte1; //FDC result byte for type 10
@ -346,10 +349,12 @@ void isbc201_reset1(uint8 fdcnum)
case 0: case 0:
fdc201[fdcnum].stat |= RDY0; //set FDD 0 ready fdc201[fdcnum].stat |= RDY0; //set FDD 0 ready
fdc201[fdcnum].rbyte1 |= RB1RD0; fdc201[fdcnum].rbyte1 |= RB1RD0;
fdc201[fdcnum].rdychg = 0;
break; break;
case 1: case 1:
fdc201[fdcnum].stat |= RDY1; //set FDD 1 ready fdc201[fdcnum].stat |= RDY1; //set FDD 1 ready
fdc201[fdcnum].rbyte1 |= RB1RD1; fdc201[fdcnum].rbyte1 |= RB1RD1;
fdc201[fdcnum].rdychg = 0;
break; break;
} }
sim_printf(" isbc201-%d: Configured, Status=%02X Attached to %s\n", sim_printf(" isbc201-%d: Configured, Status=%02X Attached to %s\n",
@ -384,11 +389,14 @@ t_stat isbc201_attach (UNIT *uptr, CONST char *cptr)
fseek(fp, 0, SEEK_END); /* size disk image */ fseek(fp, 0, SEEK_END); /* size disk image */
flen = ftell(fp); flen = ftell(fp);
fseek(fp, 0, SEEK_SET); fseek(fp, 0, SEEK_SET);
if (flen == -1) {
sim_printf(" isbc201_attach: File error\n");
return SCPE_IOERR;
}
if (fdc201[fdcnum].fdd[fddnum].buf == NULL) { /* no buffer allocated */ if (fdc201[fdcnum].fdd[fddnum].buf == NULL) { /* no buffer allocated */
fdc201[fdcnum].fdd[fddnum].buf = (uint8 *)malloc(flen); fdc201[fdcnum].fdd[fddnum].buf = (uint8 *)malloc(flen);
if (fdc201[fdcnum].fdd[fddnum].buf == NULL) { if (fdc201[fdcnum].fdd[fddnum].buf == NULL) {
sim_printf(" isbc201_attach: Malloc error\n"); sim_printf(" isbc201_attach: Malloc error\n");
fclose(fp);
return SCPE_MEM; return SCPE_MEM;
} }
} }
@ -442,7 +450,8 @@ uint8 isbc201_get_dn(void)
{ {
int i; int i;
for (i=0; i<SBC201_NUM; i++) // for (i=0; i<SBC201_NUM; i++)
for (i=0; i<=SBC201_NUM; i++)
if (port >= fdc201[i].baseport && port <= fdc201[i].baseport + 7) if (port >= fdc201[i].baseport && port <= fdc201[i].baseport + 7)
return i; return i;
sim_printf("isbc201_get_dn: port %04X not in isbc202 device table\n", port); sim_printf("isbc201_get_dn: port %04X not in isbc202 device table\n", port);
@ -462,8 +471,8 @@ uint8 isbc2010(t_bool io, uint8 data)
if ((fdcnum = isbc201_get_dn()) != 0xFF) { if ((fdcnum = isbc201_get_dn()) != 0xFF) {
if (io == 0) { /* read ststus*/ if (io == 0) { /* read ststus*/
if (DEBUG) if (DEBUG)
sim_printf("\n isbc201-%d: returned status=%02X", sim_printf("\n isbc201-%d: 0x78 returned status=%02X PCX=%04X",
fdcnum, fdc201[fdcnum].stat); fdcnum, fdc201[fdcnum].stat, PCX);
return fdc201[fdcnum].stat; return fdc201[fdcnum].stat;
} }
} }
@ -479,13 +488,14 @@ uint8 isbc2011(t_bool io, uint8 data)
fdc201[fdcnum].intff = 0; //clear interrupt FF fdc201[fdcnum].intff = 0; //clear interrupt FF
fdc201[fdcnum].stat &= ~FDCINT; fdc201[fdcnum].stat &= ~FDCINT;
if (DEBUG) if (DEBUG)
sim_printf("\n isbc201-%d: returned rtype=%02X intff=%02X status=%02X", sim_printf("\n isbc201-%d: 0x79 returned rtype=%02X intff=%02X status=%02X PCX=%04X",
fdcnum, fdc201[fdcnum].rtype, fdc201[fdcnum].intff, fdc201[fdcnum].stat); fdcnum, fdc201[fdcnum].rtype, fdc201[fdcnum].intff, fdc201[fdcnum].stat, PCX);
return fdc201[fdcnum].rtype; return fdc201[fdcnum].rtype;
} else { /* write data port */ } else { /* write data port */
fdc201[fdcnum].iopb = data; fdc201[fdcnum].iopb = data;
if (DEBUG) if (DEBUG)
sim_printf("\n isbc201-%d: IOPB low=%02X", fdcnum, data); sim_printf("\n isbc201-%d: 0x79 IOPB low=%02X PCX=%04X",
fdcnum, data, PCX);
} }
} }
return 0; return 0;
@ -501,7 +511,8 @@ uint8 isbc2012(t_bool io, uint8 data)
} else { /* write data port */ } else { /* write data port */
fdc201[fdcnum].iopb |= (data << 8); fdc201[fdcnum].iopb |= (data << 8);
if (DEBUG) if (DEBUG)
sim_printf("\n isbc201-%d: data=%02X IOPB=%04X", fdcnum, data, fdc201[fdcnum].iopb); sim_printf("\n isbc202-%d: 0x7A IOPB=%04X PCX=%04X",
fdcnum, fdc201[fdcnum].iopb, PCX);
isbc201_diskio(fdcnum); isbc201_diskio(fdcnum);
if (fdc201[fdcnum].intff) if (fdc201[fdcnum].intff)
fdc201[fdcnum].stat |= FDCINT; fdc201[fdcnum].stat |= FDCINT;
@ -512,24 +523,28 @@ uint8 isbc2012(t_bool io, uint8 data)
uint8 isbc2013(t_bool io, uint8 data) uint8 isbc2013(t_bool io, uint8 data)
{ {
uint8 fdcnum, rslt; uint8 fdcnum;
if ((fdcnum = isbc201_get_dn()) != 0xFF) { if ((fdcnum = isbc201_get_dn()) != 0xFF) {
if (io == 0) { /* read data port */ if (io == 0) { /* read data port */
switch(fdc201[fdcnum].rtype) { if (fdc201[fdcnum].rtype == 0) {
case 0x00: if (DEBUG)
rslt = fdc201[fdcnum].rbyte0; sim_printf("\n isbc201-%d: 0x7B returned rbyte0=%02X PCX=%04X",
fdc201[fdcnum].rtype = 0x02; //reset error fdcnum, fdc201[fdcnum].rbyte0, PCX);
break; return fdc201[fdcnum].rbyte0;
case 0x02: } else {
rslt = fdc201[fdcnum].rbyte1; if (fdc201[fdcnum].rdychg) {
fdc201[fdcnum].rtype = 0x00; //set error if (DEBUG)
break; sim_printf("\n isbc201-%d: 0x7B returned rbyte1=%02X PCX=%04X",
fdcnum, fdc201[fdcnum].rbyte1, PCX);
return fdc201[fdcnum].rbyte1;
} else {
if (DEBUG)
sim_printf("\n isbc201-%d: 0x7B returned rbytex=%02X PCX=%04X",
fdcnum, 0, PCX);
return 0;
}
} }
if (DEBUG)
sim_printf("\n isbc201-%d: 0x7B returned rtype=%02X result byte=%02X",
fdcnum, fdc201[fdcnum].rtype, rslt);
return rslt;
} else { /* write data port */ } else { /* write data port */
; //stop diskette operation ; //stop diskette operation
} }

58
Intel-Systems/common/isbc202.c
View file

@ -63,7 +63,7 @@
bit 5 - write protect bit 5 - write protect
bit 6 - write error bit 6 - write error
bit 7 - not ready bit 7 - not ready
If result type is 02H If result type is 02H and ready has changed
bit 0 - zero bit 0 - zero
bit 1 - zero bit 1 - zero
bit 2 - zero bit 2 - zero
@ -72,6 +72,7 @@
bit 5 - drive 3 ready bit 5 - drive 3 ready
bit 6 - drive 0 ready bit 6 - drive 0 ready
bit 7 - drive 1 ready bit 7 - drive 1 ready
else return 0
07FH - Write - Reset diskette system. 07FH - Write - Reset diskette system.
@ -125,14 +126,14 @@
u3 - u3 -
u4 - u4 -
u5 - u5 - fdc number.
u6 - fdd number. u6 - fdd number.
*/ */
#include "system_defs.h" /* system header in system dir */ #include "system_defs.h" /* system header in system dir */
#define DEBUG 0 #define DEBUG 0
#define UNIT_V_WPMODE (UNIT_V_UF) /* Write protect */ #define UNIT_V_WPMODE (UNIT_V_UF) /* Write protect */
#define UNIT_WPMODE (1 << UNIT_V_WPMODE) #define UNIT_WPMODE (1 << UNIT_V_WPMODE)
@ -222,6 +223,7 @@ typedef struct { //FDC definition
uint16 baseport; //FDC base port uint16 baseport; //FDC base port
uint16 iopb; //FDC IOPB uint16 iopb; //FDC IOPB
uint8 stat; //FDC status uint8 stat; //FDC status
uint8 rdychg; //FDC ready change
uint8 rtype; //FDC result type uint8 rtype; //FDC result type
uint8 rbyte0; //FDC result byte for type 00 uint8 rbyte0; //FDC result byte for type 00
uint8 rbyte1; //FDC result byte for type 10 uint8 rbyte1; //FDC result byte for type 10
@ -351,18 +353,22 @@ void isbc202_reset1(uint8 fdcnum)
case 0: case 0:
fdc202[fdcnum].stat |= RDY0; //set FDD 0 ready fdc202[fdcnum].stat |= RDY0; //set FDD 0 ready
fdc202[fdcnum].rbyte1 |= RB1RD0; fdc202[fdcnum].rbyte1 |= RB1RD0;
fdc202[fdcnum].rdychg = 0;
break; break;
case 1: case 1:
fdc202[fdcnum].stat |= RDY1; //set FDD 1 ready fdc202[fdcnum].stat |= RDY1; //set FDD 1 ready
fdc202[fdcnum].rbyte1 |= RB1RD1; fdc202[fdcnum].rbyte1 |= RB1RD1;
fdc202[fdcnum].rdychg = 0;
break; break;
case 2: case 2:
fdc202[fdcnum].stat |= RDY2; //set FDD 2 ready fdc202[fdcnum].stat |= RDY2; //set FDD 2 ready
fdc202[fdcnum].rbyte1 |= RB1RD2; fdc202[fdcnum].rbyte1 |= RB1RD2;
fdc202[fdcnum].rdychg = 0;
break; break;
case 3: case 3:
fdc202[fdcnum].stat |= RDY3; //set FDD 3 ready fdc202[fdcnum].stat |= RDY3; //set FDD 3 ready
fdc202[fdcnum].rbyte1 |= RB1RD3; fdc202[fdcnum].rbyte1 |= RB1RD3;
fdc202[fdcnum].rdychg = 0;
break; break;
} }
sim_printf(" SBC202%d: Configured, Status=%02X Attached to %s\n", sim_printf(" SBC202%d: Configured, Status=%02X Attached to %s\n",
@ -397,11 +403,14 @@ t_stat isbc202_attach (UNIT *uptr, CONST char *cptr)
fseek(fp, 0, SEEK_END); /* size disk image */ fseek(fp, 0, SEEK_END); /* size disk image */
flen = ftell(fp); flen = ftell(fp);
fseek(fp, 0, SEEK_SET); fseek(fp, 0, SEEK_SET);
if (flen == -1) {
sim_printf(" isbc202_attach: File error\n");
return SCPE_IOERR;
}
if (fdc202[fdcnum].fdd[fddnum].buf == NULL) { /* no buffer allocated */ if (fdc202[fdcnum].fdd[fddnum].buf == NULL) { /* no buffer allocated */
fdc202[fdcnum].fdd[fddnum].buf = (uint8 *)malloc(flen); fdc202[fdcnum].fdd[fddnum].buf = (uint8 *)malloc(flen);
if (fdc202[fdcnum].fdd[fddnum].buf == NULL) { if (fdc202[fdcnum].fdd[fddnum].buf == NULL) {
sim_printf(" isbc202_attach: Malloc error\n"); sim_printf(" isbc202_attach: Malloc error\n");
fclose(fp);
return SCPE_MEM; return SCPE_MEM;
} }
} }
@ -442,7 +451,6 @@ t_stat isbc202_attach (UNIT *uptr, CONST char *cptr)
fdc202[fdcnum].fdd[fddnum].cyl = 0; fdc202[fdcnum].fdd[fddnum].cyl = 0;
} else } else
sim_printf(" iSBC-202-%d: Not a DD disk image\n", fdcnum); sim_printf(" iSBC-202-%d: Not a DD disk image\n", fdcnum);
sim_printf(" iSBC-202%d: Configured %d bytes, Attached to %s\n", sim_printf(" iSBC-202%d: Configured %d bytes, Attached to %s\n",
fdcnum, uptr->capac, uptr->filename); fdcnum, uptr->capac, uptr->filename);
} }
@ -469,7 +477,8 @@ uint8 isbc202_get_dn(void)
{ {
int i; int i;
for (i=0; i<SBC202_NUM; i++) // for (i=0; i<SBC202_NUM; i++)
for (i=0; i<=SBC202_NUM; i++)
if (port >= fdc202[i].baseport && port <= fdc202[i].baseport + 7) if (port >= fdc202[i].baseport && port <= fdc202[i].baseport + 7)
return i; return i;
sim_printf("isbc202_get_dn: port %04X not in isbc202 device table\n", port); sim_printf("isbc202_get_dn: port %04X not in isbc202 device table\n", port);
@ -485,7 +494,8 @@ uint8 isbc2020(t_bool io, uint8 data)
if ((fdcnum = isbc202_get_dn()) != 0xFF) { if ((fdcnum = isbc202_get_dn()) != 0xFF) {
if (io == 0) { /* read ststus*/ if (io == 0) { /* read ststus*/
if (DEBUG) if (DEBUG)
sim_printf("\n isbc202-%d: 0x78 returned status=%02X PCX=%04X", fdcnum, fdc202[fdcnum].stat, PCX); sim_printf("\n isbc202-%d: 0x78 returned status=%02X PCX=%04X",
fdcnum, fdc202[fdcnum].stat, PCX);
return fdc202[fdcnum].stat; return fdc202[fdcnum].stat;
} }
} }
@ -507,7 +517,8 @@ uint8 isbc2021(t_bool io, uint8 data)
} else { /* write data port */ } else { /* write data port */
fdc202[fdcnum].iopb = data; fdc202[fdcnum].iopb = data;
if (DEBUG) if (DEBUG)
sim_printf("\n isbc202-%d: 0x79 IOPB low=%02X PCX=%04X", fdcnum, data, PCX); sim_printf("\n isbc202-%d: 0x79 IOPB low=%02X PCX=%04X",
fdcnum, data, PCX);
} }
} }
return 0; return 0;
@ -523,7 +534,8 @@ uint8 isbc2022(t_bool io, uint8 data)
} else { /* write data port */ } else { /* write data port */
fdc202[fdcnum].iopb |= (data << 8); fdc202[fdcnum].iopb |= (data << 8);
if (DEBUG) if (DEBUG)
sim_printf("\n isbc202-%d: 0x7A IOPB=%04X PCX=%04X", fdcnum, fdc202[fdcnum].iopb, PCX); sim_printf("\n isbc202-%d: 0x7A IOPB=%04X PCX=%04X",
fdcnum, fdc202[fdcnum].iopb, PCX);
isbc202_diskio(fdcnum); isbc202_diskio(fdcnum);
if (fdc202[fdcnum].intff) if (fdc202[fdcnum].intff)
fdc202[fdcnum].stat |= FDCINT; fdc202[fdcnum].stat |= FDCINT;
@ -534,14 +546,28 @@ uint8 isbc2022(t_bool io, uint8 data)
uint8 isbc2023(t_bool io, uint8 data) uint8 isbc2023(t_bool io, uint8 data)
{ {
uint8 fdcnum, rslt; uint8 fdcnum;
if ((fdcnum = isbc202_get_dn()) != 0xFF) { if ((fdcnum = isbc202_get_dn()) != 0xFF) {
if (io == 0) { /* read data port */ if (io == 0) { /* read data port */
if (DEBUG) if (fdc202[fdcnum].rtype == 0) {
sim_printf("\n isbc202-%d: 0x7B returned rtype=%02X result byte=%02X PCX=%04X", if (DEBUG)
fdcnum, fdc202[fdcnum].rtype, rslt, PCX); sim_printf("\n isbc202-%d: 0x7B returned rbyte0=%02X PCX=%04X",
return rslt; fdcnum, fdc202[fdcnum].rbyte0, PCX);
return fdc202[fdcnum].rbyte0;
} else {
if (fdc202[fdcnum].rdychg) {
if (DEBUG)
sim_printf("\n isbc202-%d: 0x7B returned rbyte1=%02X PCX=%04X",
fdcnum, fdc202[fdcnum].rbyte1, PCX);
return fdc202[fdcnum].rbyte1;
} else {
if (DEBUG)
sim_printf("\n isbc202-%d: 0x7B returned rbytex=%02X PCX=%04X",
fdcnum, 0, PCX);
return 0;
}
}
} else { /* write data port */ } else { /* write data port */
; //stop diskette operation ; //stop diskette operation
} }
@ -588,8 +614,8 @@ void isbc202_diskio(uint8 fdcnum)
fdcnum, fdc202[fdcnum].iopb, fddnum, fdc202[fdcnum].stat); fdcnum, fdc202[fdcnum].iopb, fddnum, fdc202[fdcnum].stat);
sim_printf("\n isbc202-%d: cw=%02X di=%02X nr=%02X ta=%02X sa=%02X ba=%04X", sim_printf("\n isbc202-%d: cw=%02X di=%02X nr=%02X ta=%02X sa=%02X ba=%04X",
fdcnum, cw, di, nr, ta, sa, ba); fdcnum, cw, di, nr, ta, sa, ba);
sim_printf("\n isbc202-%d: maxsec=%02X maxcyl=%02X", // sim_printf("\n isbc202-%d: maxsec=%02X maxcyl=%02X",
fdcnum, fdc202[fdcnum].fdd[fddnum].maxsec, fdc202[fdcnum].fdd[fddnum].maxcyl); // fdcnum, fdc202[fdcnum].fdd[fddnum].maxsec, fdc202[fdcnum].fdd[fddnum].maxcyl);
} }
//check for not ready //check for not ready
switch(fddnum) { switch(fddnum) {

7
Intel-Systems/common/isbc208.c
View file

@ -886,7 +886,7 @@ t_stat isbc208_svc (UNIT *uptr)
i8272_r0 = hed + drv; /* command done - no error */ i8272_r0 = hed + drv; /* command done - no error */
i8272_r1 = 0; i8272_r1 = 0;
i8272_r2 = 0; i8272_r2 = 0;
i8272_msr &= ~(RQM + DIO + CB); /* execution phase done*/ // i8272_msr &= ~(RQM + DIO + CB); /* execution phase done*/
i8272_msr = 0; // force 0 for now, where does 0x07 come from? i8272_msr = 0; // force 0 for now, where does 0x07 come from?
i8272_msr |= RQM; /* enter command phase */ i8272_msr |= RQM; /* enter command phase */
rsp = wsp = 0; /* reset indexes */ rsp = wsp = 0; /* reset indexes */
@ -1069,11 +1069,14 @@ t_stat isbc208_attach (UNIT *uptr, CONST char *cptr)
fseek(fp, 0, SEEK_END); /* size disk image */ fseek(fp, 0, SEEK_END); /* size disk image */
flen = ftell(fp); flen = ftell(fp);
fseek(fp, 0, SEEK_SET); fseek(fp, 0, SEEK_SET);
if (flen == -1) {
sim_printf(" isbc208_attach: File error\n");
return SCPE_IOERR;
}
if (isbc208_buf[uptr->u6] == NULL) { /* no buffer allocated */ if (isbc208_buf[uptr->u6] == NULL) { /* no buffer allocated */
isbc208_buf[uptr->u6] = (uint8 *)malloc(flen); isbc208_buf[uptr->u6] = (uint8 *)malloc(flen);
if (isbc208_buf[uptr->u6] == NULL) { if (isbc208_buf[uptr->u6] == NULL) {
sim_printf(" iSBC208_attach: Malloc error\n"); sim_printf(" iSBC208_attach: Malloc error\n");
fclose(fp);
return SCPE_MEM; return SCPE_MEM;
} }
} }

3
Intel-Systems/common/multibus.c
View file

@ -150,8 +150,7 @@ t_stat multibus_reset(DEVICE *dptr)
isbc202_fdcnum = 0; isbc202_fdcnum = 0;
isbc202_reset(NULL, SBC202_BASE); isbc202_reset(NULL, SBC202_BASE);
zx200a_fdcnum = 0; zx200a_fdcnum = 0;
zx200a_reset(NULL, ZX200A_BASE_DD); zx200a_reset(NULL, ZX200A_BASE);
zx200a_reset(NULL, ZX200A_BASE_SD);
sim_activate (&multibus_unit, multibus_unit.wait); /* activate unit */ sim_activate (&multibus_unit, multibus_unit.wait); /* activate unit */
return SCPE_OK; return SCPE_OK;
} }

113
Intel-Systems/common/zx200a.c
View file

@ -64,7 +64,7 @@
bit 5 - write protect bit 5 - write protect
bit 6 - write error bit 6 - write error
bit 7 - not ready bit 7 - not ready
If result type is 02H If result type is 02H and ready has changed
bit 0 - zero bit 0 - zero
bit 1 - zero bit 1 - zero
bit 2 - zero bit 2 - zero
@ -73,6 +73,7 @@
bit 5 - drive 3 ready bit 5 - drive 3 ready
bit 6 - drive 0 ready bit 6 - drive 0 ready
bit 7 - drive 1 ready bit 7 - drive 1 ready
else return 0
07FH - Write - Reset diskette system. 07FH - Write - Reset diskette system.
@ -126,8 +127,14 @@
u3 - u3 -
u4 - u4 -
u5 - u5 - fdc number.
u6 - fdd number. u6 - fdd number.
The ZX-200A appears to the multibus system as if there were an iSBC-201
installed addressed at 0x88-0x8f and an iSBC-202 installed addressed at
0x78-0x7F. The DD disks are drive 0 - 3. The SD disks are mapped over
DD disks 0 - 1. Thus drive 0 - 1 can be SD or DD, but not both. Drive
2 - 3 are always DD.
*/ */
#include "system_defs.h" /* system header in system dir */ #include "system_defs.h" /* system header in system dir */
@ -188,6 +195,7 @@ extern uint8 multibus_put_mword(uint16 addr, uint16 val);
/* external globals */ /* external globals */
extern uint16 port; //port called in dev_table[port] extern uint16 port; //port called in dev_table[port]
extern int32 PCX;
/* internal function prototypes */ /* internal function prototypes */
@ -204,12 +212,14 @@ void zx200a_diskio(uint8 fdcnum);
/* globals */ /* globals */
int32 zx200a_fdcnum = 0; //actual number of SBC-202 instances + 1 int32 zx200a_fdcnum = 0; //actual number of ZX-200A instances + 1
typedef struct { //FDD definition typedef struct { //FDD definition
uint8 *buf; uint8 *buf;
int t0; int t0;
int rdy; int rdy;
uint8 sec;
uint8 cyl;
uint8 maxsec; uint8 maxsec;
uint8 maxcyl; uint8 maxcyl;
} FDDDEF; } FDDDEF;
@ -218,6 +228,7 @@ typedef struct { //FDC definition
uint16 baseport; //FDC base port uint16 baseport; //FDC base port
uint16 iopb; //FDC IOPB uint16 iopb; //FDC IOPB
uint8 stat; //FDC status uint8 stat; //FDC status
uint8 rdychg; //FDC ready change
uint8 rtype; //FDC result type uint8 rtype; //FDC result type
uint8 rbyte0; //FDC result byte for type 00 uint8 rbyte0; //FDC result byte for type 00
uint8 rbyte1; //FDC result byte for type 10 uint8 rbyte1; //FDC result byte for type 10
@ -278,11 +289,11 @@ DEBTAB zx200a_debug[] = {
/* address width is set to 16 bits to use devices in 8086/8088 implementations */ /* address width is set to 16 bits to use devices in 8086/8088 implementations */
DEVICE zx200a_dev = { DEVICE zx200a_dev = {
"ZX200A", //name "ZX200A", //name
zx200a_unit, //units zx200a_unit, //units
zx200a_reg, //registers zx200a_reg, //registers
NULL, //modifiers zx200a_mod, //modifiers
1, //numunits FDD_NUM, //numunits
16, //aradix 16, //aradix
16, //awidth 16, //awidth
1, //aincr 1, //aincr
@ -290,8 +301,7 @@ DEVICE zx200a_dev = {
8, //dwidth 8, //dwidth
NULL, //examine NULL, //examine
NULL, //deposit NULL, //deposit
// &zx200a_reset, //reset NULL, //reset
NULL, //reset
NULL, //boot NULL, //boot
&zx200a_attach, //attach &zx200a_attach, //attach
NULL, //detach NULL, //detach
@ -324,13 +334,18 @@ t_stat zx200a_reset(DEVICE *dptr, uint16 base)
reg_dev(zx200a2, base + 2, zx200a_fdcnum); reg_dev(zx200a2, base + 2, zx200a_fdcnum);
reg_dev(zx200a3, base + 3, zx200a_fdcnum); reg_dev(zx200a3, base + 3, zx200a_fdcnum);
reg_dev(zx200a7, base + 7, zx200a_fdcnum); reg_dev(zx200a7, base + 7, zx200a_fdcnum);
zx200a_unit[zx200a_fdcnum].u3 = 0x00; /* ipc reset */ reg_dev(zx200a0, base+16, zx200a_fdcnum);
reg_dev(zx200a1, base+16 + 1, zx200a_fdcnum);
reg_dev(zx200a2, base+16 + 2, zx200a_fdcnum);
reg_dev(zx200a3, base+16 + 3, zx200a_fdcnum);
reg_dev(zx200a7, base+16 + 7, zx200a_fdcnum);
zx200a_reset1(zx200a_fdcnum); zx200a_reset1(zx200a_fdcnum);
zx200a_fdcnum++; zx200a_fdcnum++;
} else } else
sim_printf(" - Not Found on Port %02X\n", base); sim_printf(" - Not Found on Port %02X\n", base);
return SCPE_OK; return SCPE_OK;
} }
/* Software reset routine */
void zx200a_reset1(uint8 fdcnum) void zx200a_reset1(uint8 fdcnum)
{ {
@ -344,8 +359,6 @@ void zx200a_reset1(uint8 fdcnum)
zx200a[fdcnum].stat |= FDCPRE | FDCDD; //set the FDC status zx200a[fdcnum].stat |= FDCPRE | FDCDD; //set the FDC status
zx200a[fdcnum].rtype = ROK; zx200a[fdcnum].rtype = ROK;
if (uptr->capac == 0) { /* if not configured */ if (uptr->capac == 0) { /* if not configured */
uptr->capac = 0; /* initialize unit */
uptr->u4 = 0;
uptr->u5 = fdcnum; //fdc device number uptr->u5 = fdcnum; //fdc device number
uptr->u6 = i; /* unit number - only set here! */ uptr->u6 = i; /* unit number - only set here! */
uptr->flags |= UNIT_WPMODE; /* set WP in unit flags */ uptr->flags |= UNIT_WPMODE; /* set WP in unit flags */
@ -355,18 +368,22 @@ void zx200a_reset1(uint8 fdcnum)
case 0: case 0:
zx200a[fdcnum].stat |= RDY0; //set FDD 0 ready zx200a[fdcnum].stat |= RDY0; //set FDD 0 ready
zx200a[fdcnum].rbyte1 |= RB1RD0; zx200a[fdcnum].rbyte1 |= RB1RD0;
zx200a[fdcnum].rdychg = 0;
break; break;
case 1: case 1:
zx200a[fdcnum].stat |= RDY1; //set FDD 1 ready zx200a[fdcnum].stat |= RDY1; //set FDD 1 ready
zx200a[fdcnum].rbyte1 |= RB1RD1; zx200a[fdcnum].rbyte1 |= RB1RD1;
zx200a[fdcnum].rdychg = 0;
break; break;
case 2: case 2:
zx200a[fdcnum].stat |= RDY2; //set FDD 2 ready zx200a[fdcnum].stat |= RDY2; //set FDD 2 ready
zx200a[fdcnum].rbyte1 |= RB1RD2; zx200a[fdcnum].rbyte1 |= RB1RD2;
zx200a[fdcnum].rdychg = 0;
break; break;
case 3: case 3:
zx200a[fdcnum].stat |= RDY3; //set FDD 3 ready zx200a[fdcnum].stat |= RDY3; //set FDD 3 ready
zx200a[fdcnum].rbyte1 |= RB1RD3; zx200a[fdcnum].rbyte1 |= RB1RD3;
zx200a[fdcnum].rdychg = 0;
break; break;
} }
sim_printf(" ZX-200A%d: Configured, Status=%02X Attached to %s\n", sim_printf(" ZX-200A%d: Configured, Status=%02X Attached to %s\n",
@ -401,11 +418,14 @@ t_stat zx200a_attach (UNIT *uptr, CONST char *cptr)
fseek(fp, 0, SEEK_END); /* size disk image */ fseek(fp, 0, SEEK_END); /* size disk image */
flen = ftell(fp); flen = ftell(fp);
fseek(fp, 0, SEEK_SET); fseek(fp, 0, SEEK_SET);
if (flen == -1) {
sim_printf(" zx200a_attach: File error\n");
return SCPE_IOERR;
}
if (zx200a[fdcnum].fdd[fddnum].buf == NULL) { /* no buffer allocated */ if (zx200a[fdcnum].fdd[fddnum].buf == NULL) { /* no buffer allocated */
zx200a[fdcnum].fdd[fddnum].buf = (uint8 *)malloc(flen); zx200a[fdcnum].fdd[fddnum].buf = (uint8 *)malloc(flen);
if (zx200a[fdcnum].fdd[fddnum].buf == NULL) { if (zx200a[fdcnum].fdd[fddnum].buf == NULL) {
sim_printf(" zx200a_attach: Malloc error\n"); sim_printf(" zx200a_attach: Malloc error\n");
fclose(fp);
return SCPE_MEM; return SCPE_MEM;
} }
} }
@ -442,12 +462,16 @@ t_stat zx200a_attach (UNIT *uptr, CONST char *cptr)
if (flen == 256256) { /* 8" 256K SSSD */ if (flen == 256256) { /* 8" 256K SSSD */
zx200a[fdcnum].fdd[fddnum].maxcyl = 77; zx200a[fdcnum].fdd[fddnum].maxcyl = 77;
zx200a[fdcnum].fdd[fddnum].maxsec = 26; zx200a[fdcnum].fdd[fddnum].maxsec = 26;
zx200a[fdcnum].fdd[fddnum].sec = 1;
zx200a[fdcnum].fdd[fddnum].cyl = 0;
} }
else if (flen == 512512) { /* 8" 512K SSDD */ else if (flen == 512512) { /* 8" 512K SSDD */
zx200a[fdcnum].fdd[fddnum].maxcyl = 77; zx200a[fdcnum].fdd[fddnum].maxcyl = 77;
zx200a[fdcnum].fdd[fddnum].maxsec = 52; zx200a[fdcnum].fdd[fddnum].maxsec = 52;
zx200a[fdcnum].fdd[fddnum].sec = 1;
zx200a[fdcnum].fdd[fddnum].cyl = 0;
} else } else
sim_printf(" ZX-200A-%d: Not a known ISIS-II disk image\n", fdcnum); sim_printf(" ZX-200A-%d: Not a known disk image\n", fdcnum);
sim_printf(" ZX-200A-%d: Configured %d bytes, Attached to %s\n", sim_printf(" ZX-200A-%d: Configured %d bytes, Attached to %s\n",
fdcnum, uptr->capac, uptr->filename); fdcnum, uptr->capac, uptr->filename);
} }
@ -475,7 +499,8 @@ uint8 zx200_get_dn(void)
int i; int i;
for (i=0; i<ZX200A_NUM; i++) for (i=0; i<ZX200A_NUM; i++)
if (port >= zx200a[i].baseport && port <= zx200a[i].baseport + 7) if ((port >= zx200a[i].baseport && port <= zx200a[i].baseport + 7) ||
(port >= zx200a[i].baseport+16 && port <= zx200a[i].baseport+16 + 7))
return i; return i;
sim_printf("zx200_get_dn: port %04X not in zx200 device table\n", port); sim_printf("zx200_get_dn: port %04X not in zx200 device table\n", port);
return 0xFF; return 0xFF;
@ -493,7 +518,9 @@ uint8 zx200a0(t_bool io, uint8 data)
if ((fdcnum = zx200_get_dn()) != 0xFF) { if ((fdcnum = zx200_get_dn()) != 0xFF) {
if (io == 0) { /* read ststus*/ if (io == 0) { /* read ststus*/
// sim_printf("\n ZX200A-%d: returned status=%02X", fdcnum, zx200a[fdcnum].stat); if (DEBUG)
sim_printf("\n zx-200a0-%d: 0x78/88 returned status=%02X PCX=%04X",
fdcnum, zx200a[fdcnum].stat, PCX);
return zx200a[fdcnum].stat; return zx200a[fdcnum].stat;
} }
} }
@ -509,13 +536,14 @@ uint8 zx200a1(t_bool io, uint8 data)
zx200a[fdcnum].intff = 0; //clear interrupt FF zx200a[fdcnum].intff = 0; //clear interrupt FF
zx200a[fdcnum].stat &= ~FDCINT; zx200a[fdcnum].stat &= ~FDCINT;
if (DEBUG) if (DEBUG)
sim_printf("\n ZX-200A1-%d: returned rtype=%02X intff=%02X status=%02X", sim_printf("\n zx-200a1-%d: 0x79/89 returned rtype=%02X intff=%02X status=%02X PCX=%04X",
fdcnum, zx200a[fdcnum].rtype, zx200a[fdcnum].intff, zx200a[fdcnum].stat); fdcnum, zx200a[fdcnum].rtype, zx200a[fdcnum].intff, zx200a[fdcnum].stat, PCX);
return zx200a[fdcnum].rtype; return zx200a[fdcnum].rtype;
} else { /* write control port */ } else { /* write control port */
zx200a[fdcnum].iopb = data; zx200a[fdcnum].iopb = data;
if (DEBUG) if (DEBUG)
sim_printf("\n ZX-200A1-%d: IOPB low=%02X", fdcnum, data); sim_printf("\n zx-200a1-%d: 0x79/88 IOPB low=%02X PCX=%04X",
fdcnum, data, PCX);
} }
} }
return 0; return 0;
@ -531,7 +559,8 @@ uint8 zx200a2(t_bool io, uint8 data)
} else { /* write data port */ } else { /* write data port */
zx200a[fdcnum].iopb |= (data << 8); zx200a[fdcnum].iopb |= (data << 8);
if (DEBUG) if (DEBUG)
sim_printf("\n zx200a-%d: IOPB=%04X", fdcnum, zx200a[fdcnum].iopb); sim_printf("\n zx-200a2-%d: 0x7A/8A IOPB=%04X PCX=%04X",
fdcnum, zx200a[fdcnum].iopb, PCX);
zx200a_diskio(fdcnum); zx200a_diskio(fdcnum);
if (zx200a[fdcnum].intff) if (zx200a[fdcnum].intff)
zx200a[fdcnum].stat |= FDCINT; zx200a[fdcnum].stat |= FDCINT;
@ -542,24 +571,28 @@ uint8 zx200a2(t_bool io, uint8 data)
uint8 zx200a3(t_bool io, uint8 data) uint8 zx200a3(t_bool io, uint8 data)
{ {
uint8 fdcnum, rslt; uint8 fdcnum;
if ((fdcnum = zx200_get_dn()) != 0xFF) { if ((fdcnum = zx200_get_dn()) != 0xFF) {
if (io == 0) { /* read data port */ if (io == 0) { /* read data port */
switch(zx200a[fdcnum].rtype) { if (zx200a[fdcnum].rtype == 0) {
case 0x00: if (DEBUG)
rslt = zx200a[fdcnum].rbyte0; sim_printf("\n zx200a3-%d: 0x7B/8B returned rbyte0=%02X PCX=%04X",
zx200a[fdcnum].rtype = 0x02; //reset error fdcnum, zx200a[fdcnum].rbyte0, PCX);
break; return zx200a[fdcnum].rbyte0;
case 0x02: } else {
rslt = zx200a[fdcnum].rbyte1; if (zx200a[fdcnum].rdychg) {
zx200a[fdcnum].rtype = 0x00; //set error if (DEBUG)
break; sim_printf("\n zx200a3-%d: 0x7B/8B returned rbyte1=%02X PCX=%04X",
} fdcnum, zx200a[fdcnum].rbyte1, PCX);
if (DEBUG) return zx200a[fdcnum].rbyte1;
sim_printf("\n zx200a-%d: 0x7B returned rtype=%02X result byte=%02X", } else {
fdcnum, zx200a[fdcnum].rtype, rslt); if (DEBUG)
return rslt; sim_printf("\n zx200a3-%d: 0x7B/8B returned rbytex=%02X PCX=%04X",
fdcnum, 0, PCX);
return 0;
}
}
} else { /* write data port */ } else { /* write data port */
; //stop diskette operation ; //stop diskette operation
} }
@ -607,8 +640,8 @@ void zx200a_diskio(uint8 fdcnum)
fdcnum, zx200a[fdcnum].iopb, fddnum, zx200a[fdcnum].stat); fdcnum, zx200a[fdcnum].iopb, fddnum, zx200a[fdcnum].stat);
sim_printf("\n zx200a-%d: cw=%02X di=%02X nr=%02X ta=%02X sa=%02X ba=%04X", sim_printf("\n zx200a-%d: cw=%02X di=%02X nr=%02X ta=%02X sa=%02X ba=%04X",
fdcnum, cw, di, nr, ta, sa, ba); fdcnum, cw, di, nr, ta, sa, ba);
sim_printf("\n zx200a-%d: maxsec=%02X maxcyl=%02X", // sim_printf("\n zx200a-%d: maxsec=%02X maxcyl=%02X",
fdcnum, zx200a[fdcnum].fdd[fddnum].maxsec, zx200a[fdcnum].fdd[fddnum].maxcyl); // fdcnum, zx200a[fdcnum].fdd[fddnum].maxsec, zx200a[fdcnum].fdd[fddnum].maxcyl);
} }
//check for not ready //check for not ready
switch(fddnum) { switch(fddnum) {
@ -651,12 +684,12 @@ void zx200a_diskio(uint8 fdcnum)
} }
//check for address error //check for address error
if ( if (
((di & 0x07) != 0x03) || ((di & 0x07) != 0x03) && (
(sa > zx200a[fdcnum].fdd[fddnum].maxsec) || (sa > zx200a[fdcnum].fdd[fddnum].maxsec) ||
((sa + nr) > (zx200a[fdcnum].fdd[fddnum].maxsec + 1)) || ((sa + nr) > (zx200a[fdcnum].fdd[fddnum].maxsec + 1)) ||
(sa == 0) || (sa == 0) ||
(ta > zx200a[fdcnum].fdd[fddnum].maxcyl) (ta > zx200a[fdcnum].fdd[fddnum].maxcyl)
) { )) {
if (DEBUG) if (DEBUG)
sim_printf("\n zx200a-%d: maxsec=%02X maxcyl=%02X", sim_printf("\n zx200a-%d: maxsec=%02X maxcyl=%02X",
fdcnum, zx200a[fdcnum].fdd[fddnum].maxsec, zx200a[fdcnum].fdd[fddnum].maxcyl); fdcnum, zx200a[fdcnum].fdd[fddnum].maxsec, zx200a[fdcnum].fdd[fddnum].maxcyl);

8
Intel-Systems/isys8010/system_defs.h
View file

@ -57,9 +57,9 @@
//board definitions for the multibus //board definitions for the multibus
/* set the base I/O address for the iSBC 201 */ /* set the base I/O address for the iSBC 201 */
#define SBC201_BASE 0x78 #define SBC201_BASE 0x88
#define SBC201_INT INT_1 #define SBC201_INT INT_1
#define SBC201_NUM 0 #define SBC201_NUM 1
/* set the base I/O address for the iSBC 202 */ /* set the base I/O address for the iSBC 202 */
#define SBC202_BASE 0x78 #define SBC202_BASE 0x78
@ -72,8 +72,8 @@
#define SBC208_NUM 0 #define SBC208_NUM 0
/* set the base for the zx-200a disk controller */ /* set the base for the zx-200a disk controller */
#define ZX200A_BASE_DD 0x78 #define ZX200A_BASE 0x78
#define ZX200A_BASE_SD 0x88 #define ZX200A_INT INT_1
#define ZX200A_NUM 0 #define ZX200A_NUM 0
/* set the base and size for the iSBC 064 */ /* set the base and size for the iSBC 064 */

4
Intel-Systems/isys8020/system_defs.h
View file

@ -76,8 +76,8 @@
#define SBC208_NUM 0 #define SBC208_NUM 0
/* set the base for the zx-200a disk controller */ /* set the base for the zx-200a disk controller */
#define ZX200A_BASE_DD 0x78 #define ZX200A_BASE 0x78
#define ZX200A_BASE_SD 0x88 #define ZX200A_INT INT_1
#define ZX200A_NUM 0 #define ZX200A_NUM 0
/* set the base and size for the iSBC 064 */ /* set the base and size for the iSBC 064 */

4
Intel-Systems/isys8024/system_defs.h
View file

@ -75,8 +75,8 @@
#define SBC202_NUM 1 #define SBC202_NUM 1
/* set the base for the zx-200a disk controller */ /* set the base for the zx-200a disk controller */
#define ZX200A_BASE_DD 0x78 #define ZX200A_BASE 0x78
#define ZX200A_BASE_SD 0x88 #define ZX200A_INT INT_1
#define ZX200A_NUM 0 #define ZX200A_NUM 0
/* set the base I/O address for the iSBC 208 */ /* set the base I/O address for the iSBC 208 */

4
Intel-Systems/isys8030/system_defs.h
View file

@ -78,8 +78,8 @@
#define SBC202_NUM 1 #define SBC202_NUM 1
/* set the base for the zx-200a disk controller */ /* set the base for the zx-200a disk controller */
#define ZX200A_BASE_DD 0x78 #define ZX200A_BASE 0x78
#define ZX200A_BASE_SD 0x88 #define ZX200A_INT INT_1
#define ZX200A_NUM 0 #define ZX200A_NUM 0
/* set the base I/O address for the iSBC 208 */ /* set the base I/O address for the iSBC 208 */