Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

heathzenith/h89.cpp: Update memory map to directly use decoder PROMs #13363

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scripts/src/bus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5785,12 +5785,16 @@ if (BUSES["H89BUS"]~=null) then
MAME_DIR .. "src/devices/bus/heathzenith/h89/h_88_5.h",
MAME_DIR .. "src/devices/bus/heathzenith/h89/mms77316_fdc.cpp",
MAME_DIR .. "src/devices/bus/heathzenith/h89/mms77316_fdc.h",
MAME_DIR .. "src/devices/bus/heathzenith/h89/mt_win89.cpp",
MAME_DIR .. "src/devices/bus/heathzenith/h89/mt_win89.h",
MAME_DIR .. "src/devices/bus/heathzenith/h89/sigmasoft_sound.cpp",
MAME_DIR .. "src/devices/bus/heathzenith/h89/sigmasoft_sound.h",
MAME_DIR .. "src/devices/bus/heathzenith/h89/sigmasoft_parallel_port.cpp",
MAME_DIR .. "src/devices/bus/heathzenith/h89/sigmasoft_parallel_port.h",
MAME_DIR .. "src/devices/bus/heathzenith/h89/we_pullup.cpp",
MAME_DIR .. "src/devices/bus/heathzenith/h89/we_pullup.h",
MAME_DIR .. "src/devices/bus/heathzenith/h89/wh_88_16.cpp",
MAME_DIR .. "src/devices/bus/heathzenith/h89/wh_88_16.h",
MAME_DIR .. "src/devices/bus/heathzenith/h89/z_89_11.cpp",
MAME_DIR .. "src/devices/bus/heathzenith/h89/z_89_11.h",
MAME_DIR .. "src/devices/bus/heathzenith/h89/z37_fdc.cpp",
Expand Down
9 changes: 5 additions & 4 deletions src/devices/bus/heathzenith/h89/cdr_fdc_880h.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ void cdr_fdc_880h_device::data_w(u8 val)

void cdr_fdc_880h_device::write(u8 select_lines, u8 offset, u8 data)
{
if (!(select_lines & h89bus_device::H89_CASS))
if (!(select_lines & h89bus_device::H89_IO_CASS))
{
return;
}
Expand Down Expand Up @@ -265,7 +265,7 @@ u8 cdr_fdc_880h_device::data_r()

u8 cdr_fdc_880h_device::read(u8 select_lines, u8 offset)
{
if (!(select_lines & h89bus_device::H89_CASS))
if (!(select_lines & h89bus_device::H89_IO_CASS))
{
return 0;
}
Expand Down Expand Up @@ -394,6 +394,7 @@ void cdr_fdc_880h_device::set_drq(int state)
}

}
}

DEFINE_DEVICE_TYPE_PRIVATE(H89BUS_CDR_FDC_880H, device_h89bus_right_card_interface, cdr_fdc_880h_device, "cdr_fdc_880h", "CDR FDC-880H Soft-sectored Controller");
} // anonymous namespace

DEFINE_DEVICE_TYPE_PRIVATE(H89BUS_CDR_FDC_880H, device_h89bus_right_card_interface, cdr_fdc_880h_device, "h89_cdr_fdc_880h", "CDR FDC-880H Soft-sectored Controller");
6 changes: 4 additions & 2 deletions src/devices/bus/heathzenith/h89/h17_fdc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ class heath_h17_fdc_device : public device_t, public device_h89bus_right_card_in

[[maybe_unused]] void side_select_w(int state);

static constexpr feature_type unemulated_features() { return feature::DISK; }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We conventionally put these at the very top, above the constructor.


protected:
static constexpr u8 MAX_FLOPPY_DRIVES = 3;

Expand Down Expand Up @@ -118,7 +120,7 @@ heath_h17_fdc_device::heath_h17_fdc_device(const machine_config &mconfig, const

void heath_h17_fdc_device::write(u8 select_lines, u8 offset, u8 data)
{
if (!(select_lines & h89bus_device::H89_FLPY))
if (!(select_lines & h89bus_device::H89_IO_FLPY))
{
return;
}
Expand Down Expand Up @@ -250,7 +252,7 @@ void heath_h17_fdc_device::ctrl_w(u8 val)

u8 heath_h17_fdc_device::read(u8 select_lines, u8 offset)
{
if (!(select_lines & h89bus_device::H89_FLPY))
if (!(select_lines & h89bus_device::H89_IO_FLPY))
{
return 0;
}
Expand Down
3 changes: 0 additions & 3 deletions src/devices/bus/heathzenith/h89/h17_fdc.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@

Heathkit H-17 Floppy Disk Controller


Model number: H-88-1

TODO
- Mame core must support hard-sectored disk images.
- used floppy clock bits to clock USRT received clock.
- Add support for a heath hard-sectored disk support (h17disk).

****************************************************************************/

Expand Down
Loading
Loading