Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-07 02:50:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

next: Enhancements [O. Galibert]

Browse Source
This commit is contained in:
Olivier Galibert 2013-11-18 21:05:36 +00:00
parent 671ba32470
commit 834b1ee1b5
3 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/cpu/m68000/m68k_in.c
View File

@ -552,7 +552,7 @@ cpgen 32 . . 1111...000...... .......... . . U U . . U . .
cpscc 32 . . 1111...001...... .......... . . U U . . U . . 4 4 . . .
cptrapcc 32 . . 1111...001111... .......... . . U U . . U . . 4 4 . . .
dbt 16 . . 0101000011001... .......... U U U U U U U 12 12 6 6 6 6 6
dbf 16 . . 0101000111001... .......... U U U U U U U 12 12 6 6 6 6 6
dbf 16 . . 0101000111001... .......... U U U U U U U 12 12 6 4 4 4 4
dbcc 16 . . 0101....11001... .......... U U U U U U U 12 12 6 6 6 6 6
divs 16 . d 1000...111000... .......... U U U U U U U 158 122 56 56 56 56 56
divs 16 . . 1000...111...... A+-DXWLdxI U U U U U U U 158 122 56 56 56 56 56

23
src/mess/drivers/next.c
View File

@ -4,6 +4,8 @@
TODO:
- Find out why we get a segfault in the middle of the install
- Hook up the mouse (not before the system boots though, see the first problem)
- Find why the kernel doesn't manage to change the nvram at boot (readback error)
@ -348,9 +350,13 @@ void next_state::dma_read(int slot, UINT8 &val, bool &eof, bool &err)
eof = false;
switch(slot) {
case 1:
if(fdc && fdc->get_drq())
if(fdc && fdc->get_drq()) {
val = fdc->dma_r();
else
if(eof) {
fdc->tc_w(true);
fdc->tc_w(false);
}
} else
val = scsi->dma_r();
break;
@ -360,6 +366,7 @@ void next_state::dma_read(int slot, UINT8 &val, bool &eof, bool &err)
case 21:
net->rx_dma_r(val, eof);
logerror("dma read net %02x %s\n", val, eof ? "eof" : "");
break;
default:
@ -374,7 +381,14 @@ void next_state::dma_write(int slot, UINT8 data, bool eof, bool &err)
err = false;
switch(slot) {
case 1:
scsi->dma_w(data);
if(fdc && fdc->get_drq()) {
fdc->dma_w(data);
if(eof) {
fdc->tc_w(true);
fdc->tc_w(false);
}
} else
scsi->dma_w(data);
break;
case 4:
@ -422,6 +436,7 @@ void next_state::dma_end(int slot)
ds.state &= ~DMA_SUPDATE;
}
ds.state |= DMA_COMPLETE;
logerror("dma end slot %d irq %d\n", slot, dma_irqs[slot]);
if(dma_irqs[slot] >= 0)
irq_set(dma_irqs[slot], true);
}
@ -952,7 +967,7 @@ static MACHINE_CONFIG_START( next_base, next_state )
// devices
MCFG_NSCSI_BUS_ADD("scsibus")
MCFG_MCCS1850_ADD("rtc", XTAL_32_768kHz,
line_cb_t(), line_cb_t(), line_cb_t())
line_cb_t(), line_cb_t(), line_cb_t())
MCFG_SCC8530_ADD("scc", XTAL_25MHz, line_cb_t(FUNC(next_state::scc_irq), static_cast<next_state *>(owner)))
MCFG_NEXTKBD_ADD("keyboard",
line_cb_t(FUNC(next_state::keyboard_irq), static_cast<next_state *>(owner)),

49
src/mess/machine/mb8795.c
View File

@ -18,7 +18,7 @@ ADDRESS_MAP_END
mb8795_device::mb8795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MB8795, "Fujitsu MB8795", tag, owner, clock, "mb8795", __FILE__),
device_network_interface(mconfig, *this, 10)
device_network_interface(mconfig, *this, 10)
{
}
@ -81,7 +81,7 @@ void mb8795_device::recv_cb(UINT8 *buf, int len)
READ8_MEMBER(mb8795_device::txstat_r)
{
// fprintf(stderr, "mb8795: txstat_r %02x (%08x)\n", txstat, space.device().safe_pc());
// logerror("%s: txstat_r %02x (%08x)\n", tag(), txstat, space.device().safe_pc());
return txstat;
}
@ -89,12 +89,12 @@ WRITE8_MEMBER(mb8795_device::txstat_w)
{
txstat = txstat & (0xf0 | ~data);
check_irq();
fprintf(stderr, "mb8795: txstat_w %02x (%08x)\n", txstat, space.device().safe_pc());
logerror("%s: txstat_w %02x (%08x)\n", tag(), txstat, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::txmask_r)
{
fprintf(stderr, "mb8795: txmask_r %02x (%08x)\n", txmask, space.device().safe_pc());
logerror("%s: txmask_r %02x (%08x)\n", tag(), txmask, space.device().safe_pc());
return txmask;
}
@ -102,12 +102,12 @@ WRITE8_MEMBER(mb8795_device::txmask_w)
{
txmask = data & 0xaf;
check_irq();
fprintf(stderr, "mb8795: txmask_w %02x (%08x)\n", txmask, space.device().safe_pc());
logerror("%s: txmask_w %02x (%08x)\n", tag(), txmask, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxstat_r)
{
fprintf(stderr, "mb8795: rxstat_r %02x (%08x)\n", rxstat, space.device().safe_pc());
logerror("%s: rxstat_r %02x (%08x)\n", tag(), rxstat, space.device().safe_pc());
return rxstat;
}
@ -115,12 +115,12 @@ WRITE8_MEMBER(mb8795_device::rxstat_w)
{
rxstat = rxstat & (0x70 | ~data);
check_irq();
fprintf(stderr, "mb8795: rxstat_w %02x (%08x)\n", rxstat, space.device().safe_pc());
logerror("%s: rxstat_w %02x (%08x)\n", tag(), rxstat, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxmask_r)
{
fprintf(stderr, "mb8795: rxmask_r %02x (%08x)\n", rxmask, space.device().safe_pc());
logerror("%s: rxmask_r %02x (%08x)\n", tag(), rxmask, space.device().safe_pc());
return rxmask;
}
@ -128,31 +128,31 @@ WRITE8_MEMBER(mb8795_device::rxmask_w)
{
rxmask = data & 0x9f;
check_irq();
fprintf(stderr, "mb8795: rxmask_w %02x (%08x)\n", rxmask, space.device().safe_pc());
logerror("%s: rxmask_w %02x (%08x)\n", tag(), rxmask, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::txmode_r)
{
fprintf(stderr, "mb8795: txmode_r %02x (%08x)\n", txmode, space.device().safe_pc());
logerror("%s: txmode_r %02x (%08x)\n", tag(), txmode, space.device().safe_pc());
return txmode;
}
WRITE8_MEMBER(mb8795_device::txmode_w)
{
txmode = data;
fprintf(stderr, "mb8795: txmode_w %02x (%08x)\n", txmode, space.device().safe_pc());
logerror("%s: txmode_w %02x (%08x)\n", tag(), txmode, space.device().safe_pc());
}
READ8_MEMBER(mb8795_device::rxmode_r)
{
fprintf(stderr, "mb8795: rxmode_r %02x (%08x)\n", rxmode, space.device().safe_pc());
logerror("%s: rxmode_r %02x (%08x)\n", tag(), rxmode, space.device().safe_pc());
return rxmode;
}
WRITE8_MEMBER(mb8795_device::rxmode_w)
{
rxmode = data;
fprintf(stderr, "mb8795: rxmode_w %02x (%08x)\n", rxmode, space.device().safe_pc());
logerror("%s: rxmode_w %02x (%08x)\n", tag(), rxmode, space.device().safe_pc());
}
WRITE8_MEMBER(mb8795_device::reset_w)
@ -163,7 +163,7 @@ WRITE8_MEMBER(mb8795_device::reset_w)
READ8_MEMBER(mb8795_device::tdc_lsb_r)
{
fprintf(stderr, "mb8795: tdc_lsb_r %02x (%08x)\n", txcount & 0xff, space.device().safe_pc());
logerror("%s: tdc_lsb_r %02x (%08x)\n", tag(), txcount & 0xff, space.device().safe_pc());
return txcount;
}
@ -172,7 +172,7 @@ READ8_MEMBER(mb8795_device::mac_r)
if(offset < 6)
return mac[offset];
if(offset == 7) {
fprintf(stderr, "mb8795: tdc_msb_r %02x (%08x)\n", txcount >> 8, space.device().safe_pc());
logerror("%s: tdc_msb_r %02x (%08x)\n", tag(), txcount >> 8, space.device().safe_pc());
return (txcount >> 8) & 0x3f;
}
return 0;
@ -204,11 +204,13 @@ void mb8795_device::tx_dma_w(UINT8 data, bool eof)
drq_tx_cb(drq_tx);
if(eof) {
fprintf(stderr, "mb8795: send packet, dest=%02x.%02x.%02x.%02x.%02x.%02x len=%04x\n",
txbuf[0], txbuf[1], txbuf[2], txbuf[3], txbuf[4], txbuf[5],
txlen);
if(!(txmode & EN_TMD_LB_DISABLE))
fprintf(stderr, " -> loopback active\n");
logerror("%s: send packet, dest=%02x.%02x.%02x.%02x.%02x.%02x len=%04x loopback=%s\n", tag(),
txbuf[0], txbuf[1], txbuf[2], txbuf[3], txbuf[4], txbuf[5],
txlen,
txmode & EN_TMD_LB_DISABLE ? "off" : "on");
if(txlen > 1500)
txlen = 1500; // Weird packet send on loopback test in the next
if(!(txmode & EN_TMD_LB_DISABLE)) {
memcpy(rxbuf, txbuf, txlen);
@ -246,9 +248,6 @@ void mb8795_device::rx_dma_r(UINT8 &data, bool &eof)
void mb8795_device::receive()
{
fprintf(stderr, "mb8975: received packet for %02x.%02x.%02x.%02x.%02x.%02x len=%04x, mode=%d\n",
rxbuf[0], rxbuf[1], rxbuf[2], rxbuf[3], rxbuf[4], rxbuf[5],
rxlen, rxmode & 3);
bool keep = false;
switch(rxmode & EN_RMD_WHATRECV) {
case EN_RMD_RECV_NONE:
@ -264,7 +263,9 @@ void mb8795_device::receive()
keep = true;
break;
}
fprintf(stderr, " -> %s\n", keep ? "kept" : "dropped");
logerror("%s: received packet for %02x.%02x.%02x.%02x.%02x.%02x len=%04x, mode=%d -> %s\n", tag(),
rxbuf[0], rxbuf[1], rxbuf[2], rxbuf[3], rxbuf[4], rxbuf[5],
rxlen, rxmode & 3, keep ? "kept" : "dropped");
if(!keep)
rxlen = false;
else {