diff options
-rw-r--r-- | src/devices/bus/pci/ymp21.cpp | 22 | ||||
-rw-r--r-- | src/devices/bus/pci/ymp21.h | 6 | ||||
-rw-r--r-- | src/mame/yamaha/ymmu100.cpp | 6 |
3 files changed, 24 insertions, 10 deletions
diff --git a/src/devices/bus/pci/ymp21.cpp b/src/devices/bus/pci/ymp21.cpp index 802ae062e04..25ee0be9eff 100644 --- a/src/devices/bus/pci/ymp21.cpp +++ b/src/devices/bus/pci/ymp21.cpp @@ -27,7 +27,8 @@ void ymp21_device::device_reset() void ymp21_device::map(address_map &map) { - map(0x3e000, 0x3e003).rw(FUNC(ymp21_device::uart_r), FUNC(ymp21_device::uart_w)); + map(0x3e000, 0x3e000).rw(FUNC(ymp21_device::uart_status_r), FUNC(ymp21_device::uart_ctrl_w)).select(2); + map(0x3e001, 0x3e001).rw(FUNC(ymp21_device::uart_data_r), FUNC(ymp21_device::uart_data_w)).select(2); map(0x3f000, 0x3f07f).w(FUNC(ymp21_device::mailbox_w)).select(0x00700); map(0x3f080, 0x3f083).rw(FUNC(ymp21_device::mailbox_size_r), FUNC(ymp21_device::mailbox_size_w)).select(0x00700); @@ -38,14 +39,25 @@ void ymp21_device::map(address_map &map) map(0x3ff10, 0x3ff13).w(FUNC(ymp21_device::port0_w)); } -void ymp21_device::uart_w(offs_t offset, u8 data) +void ymp21_device::uart_data_w(offs_t offset, u8 data) { - logerror("uart_w %d, %02x\n", offset, data); + logerror("uart_data_w %d, %02x\n", offset, data); } -u8 ymp21_device::uart_r(offs_t offset) +u8 ymp21_device::uart_data_r(offs_t offset) { - logerror("uart_r %d\n", offset); + logerror("uart_data_r %d\n", offset); + return 0; +} + +void ymp21_device::uart_ctrl_w(offs_t offset, u8 data) +{ + logerror("uart_ctrl_w %d, %02x\n", offset, data); +} + +u8 ymp21_device::uart_status_r(offs_t offset) +{ + logerror("uart_status_r %d\n", offset); return 0; } diff --git a/src/devices/bus/pci/ymp21.h b/src/devices/bus/pci/ymp21.h index 0e8eebb09f9..7e9afa7ee51 100644 --- a/src/devices/bus/pci/ymp21.h +++ b/src/devices/bus/pci/ymp21.h @@ -23,8 +23,10 @@ private: void map(address_map &map); - void uart_w(offs_t offset, u8 data); - u8 uart_r(offs_t offset); + void uart_data_w(offs_t offset, u8 data); + u8 uart_data_r(offs_t offset); + void uart_ctrl_w(offs_t offset, u8 data); + u8 uart_status_r(offs_t offset); void port0_w(u32 data); u32 port0_r(); diff --git a/src/mame/yamaha/ymmu100.cpp b/src/mame/yamaha/ymmu100.cpp index 64af4fb9320..d1972ce6275 100644 --- a/src/mame/yamaha/ymmu100.cpp +++ b/src/mame/yamaha/ymmu100.cpp @@ -730,7 +730,7 @@ ROM_START( mu100 ) ROM_DEFAULT_BIOS("v111") ROM_SYSTEM_BIOS( 0, "v111", "xu50720 (v1.11, Aug. 3, 1999)" ) ROM_LOAD16_WORD_SWAP_BIOS( 0, "xu50720.ic11", 0x000000, 0x200000, CRC(1126a8a4) SHA1(e90b8bd9d14297da26ba12f4d9a4f2d22cd7d34a) ) - ROM_SYSTEM_BIOS( 1, "v106", "xt714h0 (v1.06, Oct. 19, 1997)" ) + ROM_SYSTEM_BIOS( 1, "v106", "xt714h0 (v1.06, Oct. 14, 1997)" ) ROM_LOAD16_WORD_SWAP_BIOS( 1, "xt714h0.ic11", 0x000000, 0x200000, CRC(aa96ab38) SHA1(ec39eeab55d7d55b4f6d2b4b4cac2a01f98db8a0) ) ROM_SYSTEM_BIOS( 2, "v105", "xt71420 (v1.05, Sep. 19, 1997)" ) ROM_LOAD16_WORD_SWAP_BIOS( 2, "xt71420.ic11", 0x000000, 0x200000, CRC(0e5b3bae) SHA1(3148c5bd59a3d00809d3ab1921216215fe2582c5) ) @@ -738,8 +738,8 @@ ROM_START( mu100 ) ROM_LOAD16_WORD_SWAP_BIOS( 3, "xt714e0.ic11", 0x000000, 0x200000, CRC(2d8cf9fc) SHA1(a81f988a315efe92106f1e7d407cd3626c4f843f) ) ROM_REGION32_LE( 0x1800000, "swp30", ROMREGION_ERASE00 ) - ROM_LOAD32_WORD( "sx518b0.ic34", 0x0000000, 0x400000, CRC(2550d44f) SHA1(fd3cce228c7d389a2fde25c808a5b26080588cba) ) - ROM_LOAD32_WORD( "sx743b0.ic35", 0x0000002, 0x400000, CRC(a9109a6c) SHA1(a67bb49378a38a2d809bd717d286e18bc6496db0) ) + ROM_LOAD32_WORD( "xs518b0.ic34", 0x0000000, 0x400000, CRC(2550d44f) SHA1(fd3cce228c7d389a2fde25c808a5b26080588cba) ) + ROM_LOAD32_WORD( "xs743b0.ic35", 0x0000002, 0x400000, CRC(a9109a6c) SHA1(a67bb49378a38a2d809bd717d286e18bc6496db0) ) ROM_LOAD32_WORD( "xt445a0-828.ic36", 0x0800000, 0x200000, CRC(225c2280) SHA1(23b5e046fd2e2ac01af3e6dc6357c5c6547b286b) ) ROM_LOAD32_WORD( "xt461a0-829.ic37", 0x0800002, 0x200000, CRC(a1d138a3) SHA1(46a7a7225cd7e1818ba551325d2af5ac1bf5b2bf) ) ROM_LOAD32_WORD( "xt462a0.ic39", 0x1000000, 0x400000, CRC(2e82cbd4) SHA1(d1f0e2713bf2cca9156c562e23fcce4fa5d7cfb3) ) |