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

PDP11: Fix I/O Page DMA to reflect hardware that only worked on Unibus

Browse source
This commit is contained in:
Mark Pizzolato 2018-09-06 13:41:43 -07:00
parent 6dfb0111e8
commit e7a250937a
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
PDP11/pdp11_io.c
View file

@ -255,7 +255,8 @@ int32 Map_ReadB (uint32 ba, int32 bc, uint8 *buf)
{ {
uint32 alim, lim, ma; uint32 alim, lim, ma;
if (ba >= (IOPAGEBASE & BUSMASK)) { /* I/O Page DMA only on Unibus systems */
if (UNIBUS && (ba >= (uint32)(IOPAGEBASE & UNIMASK))) {
int32 value; int32 value;
while (bc) { while (bc) {
@ -296,7 +297,8 @@ int32 Map_ReadW (uint32 ba, int32 bc, uint16 *buf)
{ {
uint32 alim, lim, ma; uint32 alim, lim, ma;
if (ba >= (IOPAGEBASE & BUSMASK)) { /* I/O Page DMA only on Unibus systems */
if (UNIBUS && (ba >= (uint32)(IOPAGEBASE & UNIMASK))) {
int32 value; int32 value;
if ((ba & 1) || (bc & 1)) if ((ba & 1) || (bc & 1))
return bc; return bc;
@ -338,7 +340,8 @@ int32 Map_WriteB (uint32 ba, int32 bc, const uint8 *buf)
{ {
uint32 alim, lim, ma; uint32 alim, lim, ma;
if (ba >= (IOPAGEBASE & BUSMASK)) { /* I/O Page DMA only on Unibus systems */
if (UNIBUS && (ba >= (uint32)(IOPAGEBASE & UNIMASK))) {
while (bc) { while (bc) {
if (iopageCPUReg (ba) || if (iopageCPUReg (ba) ||
(iopageW( ((int32) *buf++) & 0xff, ba, WRITEB) != SCPE_OK)) (iopageW( ((int32) *buf++) & 0xff, ba, WRITEB) != SCPE_OK))
@ -376,7 +379,8 @@ int32 Map_WriteW (uint32 ba, int32 bc, const uint16 *buf)
{ {
uint32 alim, lim, ma; uint32 alim, lim, ma;
if (ba >= (IOPAGEBASE & BUSMASK)) { /* I/O Page DMA only on Unibus systems */
if (UNIBUS && (ba >= (uint32)(IOPAGEBASE & UNIMASK))) {
if ((ba & 1) || (bc & 1)) if ((ba & 1) || (bc & 1))
return bc; return bc;
while (bc) { while (bc) {