From 8b8931fb4938242495e7d0932dba6ccf77e61ab5 Mon Sep 17 00:00:00 2001 From: Sergey Svishchev Date: Thu, 15 Mar 2018 16:37:59 +0300 Subject: ms0515: unbreak memory maps; update floppy format definition to match one used by OS (nw) --- src/lib/formats/ms0515_dsk.cpp | 4 ++-- src/mame/drivers/ms0515.cpp | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/lib/formats/ms0515_dsk.cpp b/src/lib/formats/ms0515_dsk.cpp index c8254f36680..d16e8dbbf73 100644 --- a/src/lib/formats/ms0515_dsk.cpp +++ b/src/lib/formats/ms0515_dsk.cpp @@ -39,7 +39,7 @@ const ms0515_format::format ms0515_format::formats[] = { 10, 80, 1, 512, {}, 1, {}, - 80, 30, 22 + 50, 22, 30 }, { floppy_image::FF_525, floppy_image::DSDD, floppy_image::MFM, @@ -47,7 +47,7 @@ const ms0515_format::format ms0515_format::formats[] = { 10, 80, 2, 512, {}, 1, {}, - 80, 30, 22 + 50, 22, 30 }, {} }; diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp index 1af747dd64d..89439de0dcf 100644 --- a/src/mame/drivers/ms0515.cpp +++ b/src/mame/drivers/ms0515.cpp @@ -7,7 +7,9 @@ To do: - softlist . sound - - 512K memory expansion + - overscan color + - serial printer + - ?? 512K memory expansion - ?? refresh rate change - ?? parallel printer - ?? cassette (only with Version A firmware) @@ -143,8 +145,8 @@ void ms0515_state::ms0515_mem(address_map &map) map(0177400, 0177437).w(this, FUNC(ms0515_state::ms0515_bank_w)); // Register for RAM expansion - map(0176720, 0176720).r(m_i8251kbd, FUNC(i8251_device::data_r)); - map(0176722, 0176722).rw(m_i8251kbd, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); + map(0177440, 0177440).r(m_i8251kbd, FUNC(i8251_device::data_r)); + map(0177442, 0177442).rw(m_i8251kbd, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); map(0177460, 0177460).w(m_i8251kbd, FUNC(i8251_device::data_w)); map(0177462, 0177462).w(m_i8251kbd, FUNC(i8251_device::control_w)); @@ -166,8 +168,8 @@ void ms0515_state::ms0515_mem(address_map &map) map(0177700, 0177700).r(m_i8251line, FUNC(i8251_device::data_r)); map(0177702, 0177702).rw(m_i8251line, FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); - map(0177704, 0177704).w(m_i8251line, FUNC(i8251_device::data_w)); - map(0177706, 0177706).w(m_i8251line, FUNC(i8251_device::control_w)); + map(0177720, 0177720).w(m_i8251line, FUNC(i8251_device::data_w)); + map(0177722, 0177722).w(m_i8251line, FUNC(i8251_device::control_w)); map(0177770, 0177771).rw(this, FUNC(ms0515_state::ms0515_halt_r), FUNC(ms0515_state::ms0515_halt_w)); // read/write -- halt and system timer } -- cgit v1.2.3