summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/machine/mc6843.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mess/machine/mc6843.c')
-rw-r--r--src/mess/machine/mc6843.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mess/machine/mc6843.c b/src/mess/machine/mc6843.c
index f196456d45e..8773bfaeed9 100644
--- a/src/mess/machine/mc6843.c
+++ b/src/mess/machine/mc6843.c
@@ -427,7 +427,7 @@ READ8_DEVICE_HANDLER ( mc6843_r )
int cmd = mc6843->CMR & 0x0f;
LOG(( "%f $%04x mc6843_r: data input cmd=%s(%i), pos=%i/%i, GCR=%i, ",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ),
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ),
mc6843_cmd[cmd], cmd, mc6843->data_idx,
mc6843->data_size, mc6843->GCR ));
@@ -480,7 +480,7 @@ READ8_DEVICE_HANDLER ( mc6843_r )
{
/* XXX TODO: other read modes */
data = mc6843->data[0];
- logerror( "$%04x mc6843 read in unsupported command mode %i\n", device->machine().firstcpu->pcbase( ), cmd );
+ logerror( "$%04x mc6843 read in unsupported command mode %i\n", space.machine().firstcpu->pcbase( ), cmd );
}
LOG(( "data=%02X\n", data ));
@@ -491,14 +491,14 @@ READ8_DEVICE_HANDLER ( mc6843_r )
case 1: /* Current-Track Address Register (CTAR) */
data = mc6843->CTAR;
LOG(( "%f $%04x mc6843_r: read CTAR %i (actual=%i)\n",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), data,
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), data,
floppy_drive_get_current_track( mc6843_floppy_image( device ) ) ));
break;
case 2: /* Interrupt Status Register (ISR) */
data = mc6843->ISR;
LOG(( "%f $%04x mc6843_r: read ISR %02X: cmd=%scomplete settle=%scomplete sense-rq=%i STRB=%i\n",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), data,
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), data,
(data & 1) ? "" : "not-" , (data & 2) ? "" : "not-",
(data >> 2) & 1, (data >> 3) & 1 ));
@@ -524,7 +524,7 @@ READ8_DEVICE_HANDLER ( mc6843_r )
data = mc6843->STRA;
LOG(( "%f $%04x mc6843_r: read STRA %02X: data-rq=%i del-dta=%i ready=%i t0=%i wp=%i trk-dif=%i idx=%i busy=%i\n",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), data,
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), data,
data & 1, (data >> 1) & 1, (data >> 2) & 1, (data >> 3) & 1,
(data >> 4) & 1, (data >> 5) & 1, (data >> 6) & 1, (data >> 7) & 1 ));
break;
@@ -533,7 +533,7 @@ READ8_DEVICE_HANDLER ( mc6843_r )
case 4: /* Status Register B (STRB) */
data = mc6843->STRB;
LOG(( "%f $%04x mc6843_r: read STRB %02X: data-err=%i CRC-err=%i dta--mrk-err=%i sect-mrk-err=%i seek-err=%i fi=%i wr-err=%i hard-err=%i\n",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), data,
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), data,
data & 1, (data >> 1) & 1, (data >> 2) & 1, (data >> 3) & 1,
(data >> 4) & 1, (data >> 5) & 1, (data >> 6) & 1, (data >> 7) & 1 ));
@@ -545,12 +545,12 @@ READ8_DEVICE_HANDLER ( mc6843_r )
case 7: /* Logical-Track Address Register (LTAR) */
data = mc6843->LTAR;
LOG(( "%f $%04x mc6843_r: read LTAR %i (actual=%i)\n",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), data,
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), data,
floppy_drive_get_current_track( mc6843_floppy_image( device ) ) ));
break;
default:
- logerror( "$%04x mc6843 invalid read offset %i\n", device->machine().firstcpu->pcbase( ), offset );
+ logerror( "$%04x mc6843 invalid read offset %i\n", space.machine().firstcpu->pcbase( ), offset );
}
return data;
@@ -567,7 +567,7 @@ WRITE8_DEVICE_HANDLER ( mc6843_w )
int FWF = (mc6843->CMR >> 4) & 1;
LOG(( "%f $%04x mc6843_w: data output cmd=%s(%i), pos=%i/%i, GCR=%i, data=%02X\n",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ),
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ),
mc6843_cmd[cmd], cmd, mc6843->data_idx,
mc6843->data_size, mc6843->GCR, data ));
@@ -584,7 +584,7 @@ WRITE8_DEVICE_HANDLER ( mc6843_w )
/* end of sector write */
device_t* img = mc6843_floppy_image( device );
- LOG(( "%f $%04x mc6843_w: write sector %i\n", device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), mc6843->data_id ));
+ LOG(( "%f $%04x mc6843_w: write sector %i\n", space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), mc6843->data_id ));
floppy_drive_write_sector_data(
img, mc6843->side, mc6843->data_id,
@@ -648,7 +648,7 @@ WRITE8_DEVICE_HANDLER ( mc6843_w )
UINT8 track = mc6843->data[1];
UINT8 sector = mc6843->data[3];
UINT8 filler = 0xe5; /* standard Thomson filler */
- LOG(( "%f $%04x mc6843_w: address id detected track=%i sector=%i\n", device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), track, sector));
+ LOG(( "%f $%04x mc6843_w: address id detected track=%i sector=%i\n", space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), track, sector));
floppy_drive_format_sector( img, mc6843->side, sector, track, 0, sector, 0, filler );
}
else
@@ -670,7 +670,7 @@ WRITE8_DEVICE_HANDLER ( mc6843_w )
else
{
/* XXX TODO: other write modes */
- logerror( "$%04x mc6843 write %02X in unsupported command mode %i (FWF=%i)\n", device->machine().firstcpu->pcbase( ), data, cmd, FWF );
+ logerror( "$%04x mc6843 write %02X in unsupported command mode %i (FWF=%i)\n", space.machine().firstcpu->pcbase( ), data, cmd, FWF );
}
break;
}
@@ -678,7 +678,7 @@ WRITE8_DEVICE_HANDLER ( mc6843_w )
case 1: /* Current-Track Address Register (CTAR) */
mc6843->CTAR = data & 0x7f;
LOG(( "%f $%04x mc6843_w: set CTAR to %i %02X (actual=%i) \n",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), mc6843->CTAR, data,
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), mc6843->CTAR, data,
floppy_drive_get_current_track( mc6843_floppy_image( device ) ) ));
break;
@@ -687,7 +687,7 @@ WRITE8_DEVICE_HANDLER ( mc6843_w )
int cmd = data & 15;
LOG(( "%f $%04x mc6843_w: set CMR to $%02X: cmd=%s(%i) FWF=%i DMA=%i ISR3-intr=%i fun-intr=%i\n",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ),
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ),
data, mc6843_cmd[cmd], cmd, (data >> 4) & 1, (data >> 5) & 1,
(data >> 6) & 1, (data >> 7) & 1 ));
@@ -734,36 +734,36 @@ WRITE8_DEVICE_HANDLER ( mc6843_w )
/* assume CLK freq = 1MHz (IBM 3740 compatibility) */
LOG(( "%f $%04x mc6843_w: set SUR to $%02X: head settling time=%fms, track-to-track seek time=%f\n",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ),
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ),
data, 4.096 * (data & 15), 1.024 * ((data >> 4) & 15) ));
break;
case 4: /* Sector Address Register (SAR) */
mc6843->SAR = data & 0x1f;
- LOG(( "%f $%04x mc6843_w: set SAR to %i (%02X)\n", device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), mc6843->SAR, data ));
+ LOG(( "%f $%04x mc6843_w: set SAR to %i (%02X)\n", space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), mc6843->SAR, data ));
break;
case 5: /* General Count Register (GCR) */
mc6843->GCR = data & 0x7f;
- LOG(( "%f $%04x mc6843_w: set GCR to %i (%02X)\n", device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), mc6843->GCR, data ));
+ LOG(( "%f $%04x mc6843_w: set GCR to %i (%02X)\n", space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), mc6843->GCR, data ));
break;
case 6: /* CRC Control Register (CCR) */
mc6843->CCR = data & 3;
LOG(( "%f $%04x mc6843_w: set CCR to %02X: CRC=%s shift=%i\n",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), data,
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), data,
(data & 1) ? "enabled" : "disabled", (data >> 1) & 1 ));
break;
case 7: /* Logical-Track Address Register (LTAR) */
mc6843->LTAR = data & 0x7f;
LOG(( "%f $%04x mc6843_w: set LTAR to %i %02X (actual=%i)\n",
- device->machine().time().as_double(), device->machine().firstcpu->pcbase( ), mc6843->LTAR, data,
+ space.machine().time().as_double(), space.machine().firstcpu->pcbase( ), mc6843->LTAR, data,
floppy_drive_get_current_track( mc6843_floppy_image( device ) ) ));
break;
default:
- logerror( "$%04x mc6843 invalid write offset %i (data=$%02X)\n", device->machine().firstcpu->pcbase( ), offset, data );
+ logerror( "$%04x mc6843 invalid write offset %i (data=$%02X)\n", space.machine().firstcpu->pcbase( ), offset, data );
}
}