mirror of
https://github.com/holub/mame
synced 2025-04-16 13:34:55 +03:00
mac: Move macprtb and macpb100 to their own driver. [R. Belmont]
This commit is contained in:
arbee
parent
9836069924
commit
1f3aee34aa
@ -1754,6 +1754,7 @@ files {
|
||||
MAME_DIR .. "src/mame/drivers/lwriter.cpp",
|
||||
MAME_DIR .. "src/mame/drivers/mac128.cpp",
|
||||
MAME_DIR .. "src/mame/drivers/macquadra700.cpp",
|
||||
MAME_DIR .. "src/mame/drivers/macprtb.cpp",
|
||||
MAME_DIR .. "src/mame/drivers/mac.cpp",
|
||||
MAME_DIR .. "src/mame/includes/mac.h",
|
||||
MAME_DIR .. "src/mame/machine/egret.cpp",
|
||||
|
||||
@ -422,11 +422,6 @@ void mac_state::mac_rbv_w(offs_t offset, uint8_t data)
|
||||
}
|
||||
}
|
||||
|
||||
// Portable/PB100 video
|
||||
VIDEO_START_MEMBER(mac_state,macprtb)
|
||||
{
|
||||
}
|
||||
|
||||
uint16_t mac_state::mac_config_r()
|
||||
{
|
||||
return 0xffff; // returns nonzero if no PDS RAM expansion, 0 if present
|
||||
@ -548,50 +543,10 @@ void mac_state::mac_gsc_w(uint8_t data)
|
||||
{
|
||||
}
|
||||
|
||||
uint8_t mac_state::mac_5396_r(offs_t offset)
|
||||
{
|
||||
if (offset < 0x100)
|
||||
{
|
||||
return m_539x_1->read(offset>>4);
|
||||
}
|
||||
else // pseudo-DMA: read from the FIFO
|
||||
{
|
||||
return m_539x_1->read(2);
|
||||
}
|
||||
|
||||
// never executed
|
||||
//return 0;
|
||||
}
|
||||
|
||||
void mac_state::mac_5396_w(offs_t offset, uint8_t data)
|
||||
{
|
||||
if (offset < 0x100)
|
||||
{
|
||||
m_539x_1->write(offset>>4, data);
|
||||
}
|
||||
else // pseudo-DMA: write to the FIFO
|
||||
{
|
||||
m_539x_1->write(2, data);
|
||||
}
|
||||
}
|
||||
|
||||
/***************************************************************************
|
||||
ADDRESS MAPS
|
||||
***************************************************************************/
|
||||
|
||||
void mac_state::macprtb_map(address_map &map)
|
||||
{
|
||||
map(0x900000, 0x93ffff).rom().region("bootrom", 0).mirror(0x0c0000);
|
||||
map(0xf60000, 0xf6ffff).rw(FUNC(mac_state::mac_iwm_r), FUNC(mac_state::mac_iwm_w));
|
||||
map(0xf70000, 0xf7ffff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w));
|
||||
map(0xf90000, 0xf9ffff).rw(FUNC(mac_state::macplus_scsi_r), FUNC(mac_state::macplus_scsi_w));
|
||||
map(0xfa8000, 0xfaffff).ram().share("vram16"); // VRAM
|
||||
map(0xfb0000, 0xfbffff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write));
|
||||
map(0xfc0000, 0xfcffff).r(FUNC(mac_state::mac_config_r));
|
||||
map(0xfd0000, 0xfdffff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w));
|
||||
map(0xfffff0, 0xffffff).rw(FUNC(mac_state::mac_autovector_r), FUNC(mac_state::mac_autovector_w));
|
||||
}
|
||||
|
||||
void mac_state::maclc_map(address_map &map)
|
||||
{
|
||||
map.global_mask(0x80ffffff); // V8 uses bit 31 and 23-0 for address decoding only
|
||||
@ -1019,43 +974,6 @@ template <typename T> void mac_state::add_nubus_pds(machine_config &config, cons
|
||||
NUBUS_SLOT(config, slot_tag, "pds", std::forward<T>(opts), nullptr);
|
||||
}
|
||||
|
||||
void mac_state::macprtb(machine_config &config)
|
||||
{
|
||||
/* basic machine hardware */
|
||||
M68000(config, m_maincpu, C15M);
|
||||
m_maincpu->set_addrmap(AS_PROGRAM, &mac_state::macprtb_map);
|
||||
m_maincpu->set_dasm_override(FUNC(mac_state::mac_dasm_override));
|
||||
|
||||
config.set_maximum_quantum(attotime::from_hz(60));
|
||||
|
||||
add_pb1xx_screen(config);
|
||||
m_screen->set_screen_update(FUNC(mac_state::screen_update_macprtb));
|
||||
|
||||
PALETTE(config, m_palette, palette_device::MONOCHROME_INVERTED);
|
||||
|
||||
MCFG_VIDEO_START_OVERRIDE(mac_state,macprtb)
|
||||
|
||||
/* devices */
|
||||
add_base_devices(config);
|
||||
add_scsi(config);
|
||||
add_asc(config, asc_device::asc_type::ASC);
|
||||
|
||||
MACADB(config, m_macadb, C15M);
|
||||
m_macadb->set_pmu_mode(true);
|
||||
m_macadb->set_pmu_is_via1(true);
|
||||
|
||||
VIA6522(config, m_via1, 783360);
|
||||
m_via1->readpa_handler().set(FUNC(mac_state::mac_via_in_a_pmu));
|
||||
m_via1->readpb_handler().set(FUNC(mac_state::mac_via_in_b_pmu));
|
||||
m_via1->writepa_handler().set(FUNC(mac_state::mac_via_out_a_pmu));
|
||||
m_via1->writepb_handler().set(FUNC(mac_state::mac_via_out_b_pmu));
|
||||
m_via1->irq_handler().set(FUNC(mac_state::mac_via_irq));
|
||||
|
||||
RAM(config, m_ram);
|
||||
m_ram->set_default_size("1M");
|
||||
m_ram->set_extra_options("1M,3M,5M,7M,9M");
|
||||
}
|
||||
|
||||
void mac_state::macii(machine_config &config, bool cpu, asc_device::asc_type asc_type, bool nubus, bool nubus_bank1, bool nubus_bank2)
|
||||
{
|
||||
if (cpu)
|
||||
@ -1312,8 +1230,6 @@ void mac_state::macpb140(machine_config &config)
|
||||
|
||||
PALETTE(config, m_palette, palette_device::MONOCHROME_INVERTED);
|
||||
|
||||
MCFG_VIDEO_START_OVERRIDE(mac_state,macprtb)
|
||||
|
||||
add_asc(config, asc_device::asc_type::ASC);
|
||||
add_scsi(config);
|
||||
add_base_devices(config, false, true);
|
||||
@ -1360,8 +1276,6 @@ void mac_state::macpb160(machine_config &config)
|
||||
|
||||
PALETTE(config, m_palette, FUNC(mac_state::macgsc_palette), 16);
|
||||
|
||||
MCFG_VIDEO_START_OVERRIDE(mac_state,macprtb)
|
||||
|
||||
add_asc(config, asc_device::asc_type::ASC);
|
||||
add_scsi(config);
|
||||
add_base_devices(config, false, true);
|
||||
@ -1638,22 +1552,6 @@ ROM_START( pmac6100 )
|
||||
ROM_LOAD( "9feb69b3.rom", 0x000000, 0x400000, CRC(a43fadbc) SHA1(6fac1c4e920a077c077b03902fef9199d5e8f2c3) )
|
||||
ROM_END
|
||||
|
||||
ROM_START( macprtb )
|
||||
ROM_REGION16_BE(0x40000, "bootrom", 0)
|
||||
ROM_LOAD16_WORD( "93ca3846.rom", 0x000000, 0x040000, CRC(497348f8) SHA1(79b468b33fc53f11e87e2e4b195aac981bf0c0a6) )
|
||||
|
||||
ROM_REGION(0x1800, "pmu", 0)
|
||||
ROM_LOAD( "pmuv1.bin", 0x000000, 0x001800, CRC(01dae148) SHA1(29d2fca7426c31f2b9334832ed3d257974a61bb1) )
|
||||
ROM_END
|
||||
|
||||
ROM_START( macpb100 )
|
||||
ROM_REGION16_BE(0x40000, "bootrom", 0)
|
||||
ROM_LOAD16_WORD( "96645f9c.rom", 0x000000, 0x040000, CRC(29ac7ee9) SHA1(7f3acf40b1f63612de2314a2e9fcfeafca0711fc) )
|
||||
|
||||
ROM_REGION(0x1800, "pmu", 0)
|
||||
ROM_LOAD( "pmuv1.bin", 0x000000, 0x001800, CRC(01dae148) SHA1(29d2fca7426c31f2b9334832ed3d257974a61bb1) )
|
||||
ROM_END
|
||||
|
||||
ROM_START( macpb140 )
|
||||
ROM_REGION32_BE(0x100000, "bootrom", 0)
|
||||
ROM_LOAD( "420dbff3.rom", 0x000000, 0x100000, CRC(88ea2081) SHA1(7a8ee468d16e64f2ad10cb8d1a45e6f07cc9e212) )
|
||||
@ -1733,14 +1631,12 @@ COMP( 1987, macii, 0, 0, macii, macadb, mac_state, init_maci
|
||||
COMP( 1987, maciihmu, macii, 0, maciihmu, macadb, mac_state, init_macii, "Apple Computer", "Macintosh II (w/o 68851 MMU)", MACHINE_NOT_WORKING )
|
||||
COMP( 1988, mac2fdhd, 0, 0, macii, macadb, mac_state, init_maciifdhd, "Apple Computer", "Macintosh II (FDHD)", MACHINE_NOT_WORKING )
|
||||
COMP( 1988, maciix, mac2fdhd, 0, maciix, macadb, mac_state, init_maciix, "Apple Computer", "Macintosh IIx", MACHINE_NOT_WORKING )
|
||||
COMP( 1989, macprtb, 0, 0, macprtb, macadb, mac_state, init_macprtb, "Apple Computer", "Macintosh Portable", MACHINE_NOT_WORKING )
|
||||
COMP( 1989, macse30, mac2fdhd, 0, macse30, macadb, mac_state, init_macse30, "Apple Computer", "Macintosh SE/30", MACHINE_NOT_WORKING )
|
||||
COMP( 1989, maciicx, mac2fdhd, 0, maciicx, macadb, mac_state, init_maciicx, "Apple Computer", "Macintosh IIcx", MACHINE_NOT_WORKING )
|
||||
COMP( 1989, maciici, 0, 0, maciici, maciici, mac_state, init_maciici, "Apple Computer", "Macintosh IIci", MACHINE_NOT_WORKING )
|
||||
COMP( 1990, maciifx, 0, 0, maciifx, macadb, mac_state, init_maciifx, "Apple Computer", "Macintosh IIfx", MACHINE_NOT_WORKING )
|
||||
COMP( 1990, maclc, 0, 0, maclc, maciici, mac_state, init_maclc, "Apple Computer", "Macintosh LC", MACHINE_IMPERFECT_SOUND )
|
||||
COMP( 1990, maciisi, 0, 0, maciisi, maciici, mac_state, init_maciisi, "Apple Computer", "Macintosh IIsi", MACHINE_NOT_WORKING )
|
||||
COMP( 1991, macpb100, 0, 0, macprtb, macadb, mac_state, init_macprtb, "Apple Computer", "Macintosh PowerBook 100", MACHINE_NOT_WORKING )
|
||||
COMP( 1991, macpb140, 0, 0, macpb140, macadb, mac_state, init_macpb140, "Apple Computer", "Macintosh PowerBook 140", MACHINE_NOT_WORKING )
|
||||
COMP( 1991, macpb170, macpb140, 0, macpb170, macadb, mac_state, init_macpb140, "Apple Computer", "Macintosh PowerBook 170", MACHINE_NOT_WORKING )
|
||||
COMP( 1991, macclas2, 0, 0, macclas2, macadb, mac_state, init_macclassic2, "Apple Computer", "Macintosh Classic II", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND )
|
||||
|
||||
483
src/mame/drivers/macprtb.cpp
Normal file
483
src/mame/drivers/macprtb.cpp
Normal file
@ -0,0 +1,483 @@
|
||||
// license:BSD-3-Clause
|
||||
// copyright-holders:R. Belmont
|
||||
/****************************************************************************
|
||||
|
||||
drivers/macprtb.cpp
|
||||
Mac Portable / PowerBook 100 emulation
|
||||
By R. Belmont
|
||||
|
||||
These are electrically identical 68000 machines in very different form factors.
|
||||
The Mac Portable came in a large, heavy, "luggable" form factor and didn't enjoy
|
||||
much success.
|
||||
|
||||
The PowerBook 100 was much smaller and lighter, the result of
|
||||
Apple partnering with Sony to redesign the Portable motherboard to fit into
|
||||
a much smaller case. The PowerBook 100 pioneered the modern convention of
|
||||
having the pointing device nearest the user with the keyboard pushed back
|
||||
towards the hinge.
|
||||
|
||||
These are sort of an intermediate step between the SE and Mac II in terms
|
||||
of functional layout: ASC and SWIM are present, but there's only 1 VIA
|
||||
and an M50753 microcontroller "PMU" handles power management, ADB, and
|
||||
clock/PRAM.
|
||||
|
||||
****************************************************************************/
|
||||
|
||||
#include "emu.h"
|
||||
|
||||
#include "machine/macrtc.h"
|
||||
#include "cpu/m68000/m68000.h"
|
||||
#include "machine/6522via.h"
|
||||
#include "machine/applefdc.h"
|
||||
#include "machine/ram.h"
|
||||
#include "machine/sonydriv.h"
|
||||
#include "machine/swim.h"
|
||||
#include "machine/timer.h"
|
||||
#include "machine/z80scc.h"
|
||||
#include "machine/macadb.h"
|
||||
#include "machine/ncr5380.h"
|
||||
#include "bus/scsi/scsi.h"
|
||||
#include "bus/scsi/scsihd.h"
|
||||
#include "sound/asc.h"
|
||||
#include "formats/ap_dsk35.h"
|
||||
|
||||
#include "emupal.h"
|
||||
#include "screen.h"
|
||||
#include "softlist.h"
|
||||
#include "speaker.h"
|
||||
|
||||
#define C7M (7833600)
|
||||
#define C15M (C7M*2)
|
||||
#define C32M (C15M*2)
|
||||
|
||||
class macportable_state : public driver_device
|
||||
{
|
||||
public:
|
||||
macportable_state(const machine_config &mconfig, device_type type, const char *tag) :
|
||||
driver_device(mconfig, type, tag),
|
||||
m_maincpu(*this, "maincpu"),
|
||||
m_via1(*this, "via1"),
|
||||
m_macadb(*this, "macadb"),
|
||||
m_ncr5380(*this, "ncr5380"),
|
||||
m_ram(*this, RAM_TAG),
|
||||
m_iwm(*this, "fdc"),
|
||||
m_screen(*this, "screen"),
|
||||
m_asc(*this, "asc"),
|
||||
m_scc(*this, "scc"),
|
||||
m_vram(*this, "vram")
|
||||
{
|
||||
}
|
||||
|
||||
void macprtb(machine_config &config);
|
||||
void macprtb_map(address_map &map);
|
||||
|
||||
void init_macprtb();
|
||||
|
||||
private:
|
||||
required_device<m68000_device> m_maincpu;
|
||||
required_device<via6522_device> m_via1;
|
||||
required_device<macadb_device> m_macadb;
|
||||
required_device<ncr5380_device> m_ncr5380;
|
||||
required_device<ram_device> m_ram;
|
||||
required_device<applefdc_base_device> m_iwm;
|
||||
required_device<screen_device> m_screen;
|
||||
required_device<asc_device> m_asc;
|
||||
required_device<z80scc_device> m_scc;
|
||||
required_shared_ptr<uint16_t> m_vram;
|
||||
|
||||
virtual void machine_start() override;
|
||||
virtual void machine_reset() override;
|
||||
|
||||
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
|
||||
|
||||
u16 *m_ram_ptr, *m_rom_ptr;
|
||||
u32 m_ram_mask, m_ram_size, m_rom_size;
|
||||
|
||||
emu_timer *m_6015_timer;
|
||||
|
||||
WRITE_LINE_MEMBER(adb_irq_w) { m_adb_irq_pending = state; }
|
||||
int m_adb_irq_pending;
|
||||
|
||||
uint16_t mac_via_r(offs_t offset);
|
||||
void mac_via_w(offs_t offset, uint16_t data, uint16_t mem_mask);
|
||||
uint8_t mac_via_in_a();
|
||||
uint8_t mac_via_in_b();
|
||||
void mac_via_out_a(uint8_t data);
|
||||
void mac_via_out_b(uint8_t data);
|
||||
void field_interrupts();
|
||||
DECLARE_WRITE_LINE_MEMBER(via_irq_w);
|
||||
TIMER_CALLBACK_MEMBER(mac_6015_tick);
|
||||
WRITE_LINE_MEMBER(via_cb2_w) { m_macadb->adb_data_w(state); }
|
||||
int m_via_cycles, m_via_interrupt, m_scc_interrupt, m_asc_interrupt, m_last_taken_interrupt;
|
||||
int m_irq_count, m_ca1_data, m_ca2_data;
|
||||
|
||||
uint16_t rom_switch_r(offs_t offset);
|
||||
bool m_overlay;
|
||||
|
||||
uint16_t scsi_r(offs_t offset, uint16_t mem_mask);
|
||||
void scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask);
|
||||
|
||||
uint16_t mac_scc_r(offs_t offset)
|
||||
{
|
||||
uint16_t result = m_scc->dc_ab_r(offset);
|
||||
return (result << 8) | result;
|
||||
}
|
||||
void mac_scc_2_w(offs_t offset, uint16_t data) { m_scc->dc_ab_w(offset, data >> 8); }
|
||||
|
||||
uint16_t mac_iwm_r(offs_t offset, uint16_t mem_mask)
|
||||
{
|
||||
uint16_t result = m_iwm->read(offset >> 8);
|
||||
return (result << 8) | result;
|
||||
}
|
||||
void mac_iwm_w(offs_t offset, uint16_t data, uint16_t mem_mask)
|
||||
{
|
||||
if (ACCESSING_BITS_0_7)
|
||||
m_iwm->write((offset >> 8), data & 0xff);
|
||||
else
|
||||
m_iwm->write((offset >> 8), data>>8);
|
||||
}
|
||||
|
||||
uint16_t mac_autovector_r(offs_t offset) { return 0; }
|
||||
void mac_autovector_w(offs_t offset, uint16_t data) {};
|
||||
|
||||
// returns nonzero if no PDS RAM expansion, 0 if present
|
||||
uint16_t mac_config_r() { return 0xffff; }
|
||||
|
||||
DECLARE_WRITE_LINE_MEMBER(asc_irq_w)
|
||||
{
|
||||
m_asc_interrupt = state;
|
||||
field_interrupts();
|
||||
}
|
||||
};
|
||||
|
||||
void macportable_state::field_interrupts()
|
||||
{
|
||||
int take_interrupt = -1;
|
||||
|
||||
if ((m_scc_interrupt) || (m_asc_interrupt))
|
||||
{
|
||||
take_interrupt = 2;
|
||||
}
|
||||
else if (m_via_interrupt)
|
||||
{
|
||||
take_interrupt = 1;
|
||||
}
|
||||
|
||||
if (m_last_taken_interrupt > -1)
|
||||
{
|
||||
m_maincpu->set_input_line(m_last_taken_interrupt, CLEAR_LINE);
|
||||
m_last_taken_interrupt = -1;
|
||||
}
|
||||
|
||||
if (take_interrupt > -1)
|
||||
{
|
||||
m_maincpu->set_input_line(take_interrupt, ASSERT_LINE);
|
||||
m_last_taken_interrupt = take_interrupt;
|
||||
}
|
||||
}
|
||||
|
||||
void macportable_state::machine_start()
|
||||
{
|
||||
m_ram_ptr = (u16*)m_ram->pointer();
|
||||
m_ram_size = m_ram->size()>>1;
|
||||
m_ram_mask = m_ram_size - 1;
|
||||
m_rom_ptr = (u16*)memregion("bootrom")->base();
|
||||
m_rom_size = memregion("bootrom")->bytes();
|
||||
m_via_cycles = -50;
|
||||
m_via_interrupt = m_scc_interrupt = m_asc_interrupt = 0;
|
||||
m_last_taken_interrupt = -1;
|
||||
m_irq_count = m_ca1_data = m_ca2_data = 0;
|
||||
|
||||
m_6015_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(macportable_state::mac_6015_tick),this));
|
||||
m_6015_timer->adjust(attotime::never);
|
||||
}
|
||||
|
||||
void macportable_state::machine_reset()
|
||||
{
|
||||
m_overlay = true;
|
||||
m_via_interrupt = m_scc_interrupt = 0;
|
||||
m_last_taken_interrupt = -1;
|
||||
m_irq_count = m_ca1_data = m_ca2_data = 0;
|
||||
|
||||
// put ROM mirror at 0
|
||||
address_space& space = m_maincpu->space(AS_PROGRAM);
|
||||
const u32 memory_size = std::min((u32)0x3fffff, m_rom_size);
|
||||
const u32 memory_end = memory_size - 1;
|
||||
offs_t memory_mirror = memory_end & ~(memory_size - 1);
|
||||
|
||||
space.unmap_write(0x00000000, memory_end);
|
||||
space.install_read_bank(0x00000000, memory_end & ~memory_mirror, memory_mirror, "bank1");
|
||||
membank("bank1")->set_base(m_rom_ptr);
|
||||
|
||||
// start 60.15 Hz timer
|
||||
m_6015_timer->adjust(attotime::from_hz(60.15), 0, attotime::from_hz(60.15));
|
||||
}
|
||||
|
||||
void macportable_state::init_macprtb()
|
||||
{
|
||||
}
|
||||
|
||||
uint32_t macportable_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
|
||||
{
|
||||
uint16_t const *const video_ram = (const uint16_t *) m_vram.target();
|
||||
|
||||
for (int y = 0; y < 400; y++)
|
||||
{
|
||||
uint32_t *const line = &bitmap.pix(y);
|
||||
|
||||
for (int x = 0; x < 640; x += 16)
|
||||
{
|
||||
uint16_t const word = video_ram[((y * 640)/16) + ((x/16))];
|
||||
for (int b = 0; b < 16; b++)
|
||||
{
|
||||
line[x + b] = ((word >> (15 - b)) & 0x0001) ? 0 : 0xffffffff;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint16_t macportable_state::mac_via_r(offs_t offset)
|
||||
{
|
||||
uint16_t data;
|
||||
|
||||
offset >>= 8;
|
||||
offset &= 0x0f;
|
||||
|
||||
data = m_via1->read(offset);
|
||||
|
||||
m_maincpu->adjust_icount(m_via_cycles);
|
||||
|
||||
return (data & 0xff) | (data << 8);
|
||||
}
|
||||
|
||||
void macportable_state::mac_via_w(offs_t offset, uint16_t data, uint16_t mem_mask)
|
||||
{
|
||||
offset >>= 8;
|
||||
offset &= 0x0f;
|
||||
|
||||
if (ACCESSING_BITS_0_7)
|
||||
m_via1->write(offset, data & 0xff);
|
||||
if (ACCESSING_BITS_8_15)
|
||||
m_via1->write(offset, (data >> 8) & 0xff);
|
||||
|
||||
m_maincpu->adjust_icount(m_via_cycles);
|
||||
}
|
||||
|
||||
WRITE_LINE_MEMBER(macportable_state::via_irq_w)
|
||||
{
|
||||
m_via_interrupt = state;
|
||||
field_interrupts();
|
||||
}
|
||||
|
||||
uint16_t macportable_state::rom_switch_r(offs_t offset)
|
||||
{
|
||||
// disable the overlay
|
||||
if (m_overlay)
|
||||
{
|
||||
address_space& space = m_maincpu->space(AS_PROGRAM);
|
||||
const u32 memory_end = m_ram->size() - 1;
|
||||
void *memory_data = m_ram->pointer();
|
||||
offs_t memory_mirror = memory_end & ~memory_end;
|
||||
|
||||
space.install_readwrite_bank(0x00000000, memory_end & ~memory_mirror, memory_mirror, "bank1");
|
||||
membank("bank1")->set_base(memory_data);
|
||||
m_overlay = false;
|
||||
}
|
||||
|
||||
//printf("rom_switch_r: offset %08x ROM_size -1 = %08x, masked = %08x\n", offset, m_rom_size-1, offset & ((m_rom_size - 1)>>2));
|
||||
|
||||
return m_rom_ptr[offset & ((m_rom_size - 1)>>2)];
|
||||
}
|
||||
|
||||
TIMER_CALLBACK_MEMBER(macportable_state::mac_6015_tick)
|
||||
{
|
||||
/* signal VBlank on CA1 input on the VIA */
|
||||
m_ca1_data ^= 1;
|
||||
m_via1->write_ca1(m_ca1_data);
|
||||
|
||||
if (++m_irq_count == 60)
|
||||
{
|
||||
m_irq_count = 0;
|
||||
|
||||
m_ca2_data ^= 1;
|
||||
/* signal 1 Hz irq on CA2 input on the VIA */
|
||||
m_via1->write_ca2(m_ca2_data);
|
||||
}
|
||||
}
|
||||
|
||||
uint16_t macportable_state::scsi_r(offs_t offset, uint16_t mem_mask)
|
||||
{
|
||||
int reg = (offset >> 3) & 0xf;
|
||||
|
||||
// logerror("macplus_scsi_r: offset %x mask %x\n", offset, mem_mask);
|
||||
|
||||
if ((reg == 6) && (offset == 0x130))
|
||||
{
|
||||
reg = R5380_CURDATA_DTACK;
|
||||
}
|
||||
|
||||
return m_ncr5380->ncr5380_read_reg(reg) << 8;
|
||||
}
|
||||
|
||||
void macportable_state::scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask)
|
||||
{
|
||||
int reg = (offset >> 3) & 0xf;
|
||||
|
||||
// logerror("macplus_scsi_w: data %x offset %x mask %x\n", data, offset, mem_mask);
|
||||
|
||||
if ((reg == 0) && (offset == 0x100))
|
||||
{
|
||||
reg = R5380_OUTDATA_DTACK;
|
||||
}
|
||||
|
||||
m_ncr5380->ncr5380_write_reg(reg, data);
|
||||
}
|
||||
/***************************************************************************
|
||||
ADDRESS MAPS
|
||||
***************************************************************************/
|
||||
void macportable_state::macprtb_map(address_map &map)
|
||||
{
|
||||
map(0x000000, 0x8fffff).r(FUNC(macportable_state::rom_switch_r));
|
||||
map(0x900000, 0x93ffff).rom().region("bootrom", 0).mirror(0x0c0000);
|
||||
map(0xf60000, 0xf6ffff).rw(FUNC(macportable_state::mac_iwm_r), FUNC(macportable_state::mac_iwm_w));
|
||||
map(0xf70000, 0xf7ffff).rw(FUNC(macportable_state::mac_via_r), FUNC(macportable_state::mac_via_w));
|
||||
map(0xf90000, 0xf9ffff).rw(FUNC(macportable_state::scsi_r), FUNC(macportable_state::scsi_w));
|
||||
map(0xfa8000, 0xfaffff).ram().share("vram"); // VRAM
|
||||
map(0xfb0000, 0xfbffff).rw(m_asc, FUNC(asc_device::read), FUNC(asc_device::write));
|
||||
map(0xfc0000, 0xfcffff).r(FUNC(macportable_state::mac_config_r));
|
||||
map(0xfd0000, 0xfdffff).rw(FUNC(macportable_state::mac_scc_r), FUNC(macportable_state::mac_scc_2_w));
|
||||
map(0xfffff0, 0xffffff).rw(FUNC(macportable_state::mac_autovector_r), FUNC(macportable_state::mac_autovector_w));
|
||||
}
|
||||
|
||||
uint8_t macportable_state::mac_via_in_a()
|
||||
{
|
||||
return m_macadb->get_pm_data_recv();
|
||||
}
|
||||
|
||||
uint8_t macportable_state::mac_via_in_b()
|
||||
{
|
||||
int val = 0;
|
||||
// printf("Read VIA B: PM_ACK %x\n", m_pm_ack);
|
||||
val = 0x80 | 0x04 | m_macadb->get_pm_ack(); // SCC wait/request (bit 2 must be set at 900c1a or startup tests always fail)
|
||||
|
||||
// printf("%s VIA1 IN_B = %02x\n", machine().describe_context().c_str(), val);
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
void macportable_state::mac_via_out_a(uint8_t data)
|
||||
{
|
||||
// printf("%s VIA1 OUT A: %02x\n", machine().describe_context().c_str(), data);
|
||||
|
||||
m_macadb->set_pm_data_send(data);
|
||||
}
|
||||
|
||||
void macportable_state::mac_via_out_b(uint8_t data)
|
||||
{
|
||||
// printf("%s VIA1 OUT B: %02x\n", machine().describe_context().c_str(), data);
|
||||
sony_set_sel_line(m_iwm.target(), (data & 0x20) >> 5);
|
||||
m_macadb->pmu_req_w(data & 1);
|
||||
}
|
||||
|
||||
/***************************************************************************
|
||||
DEVICE CONFIG
|
||||
***************************************************************************/
|
||||
|
||||
static const applefdc_interface mac_iwm_interface =
|
||||
{
|
||||
sony_set_lines,
|
||||
sony_set_enable_lines,
|
||||
|
||||
sony_read_data,
|
||||
sony_write_data,
|
||||
sony_read_status
|
||||
};
|
||||
|
||||
static const floppy_interface mac_floppy_interface =
|
||||
{
|
||||
FLOPPY_STANDARD_3_5_DSHD,
|
||||
LEGACY_FLOPPY_OPTIONS_NAME(apple35_mac),
|
||||
"floppy_3_5"
|
||||
};
|
||||
|
||||
static INPUT_PORTS_START( macadb )
|
||||
INPUT_PORTS_END
|
||||
|
||||
/***************************************************************************
|
||||
MACHINE DRIVERS
|
||||
***************************************************************************/
|
||||
|
||||
void macportable_state::macprtb(machine_config &config)
|
||||
{
|
||||
/* basic machine hardware */
|
||||
/* basic machine hardware */
|
||||
M68000(config, m_maincpu, C15M);
|
||||
m_maincpu->set_addrmap(AS_PROGRAM, &macportable_state::macprtb_map);
|
||||
|
||||
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
|
||||
m_screen->set_refresh_hz(60.15);
|
||||
m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(1260));
|
||||
m_screen->set_video_attributes(VIDEO_UPDATE_BEFORE_VBLANK);
|
||||
m_screen->set_size(700, 480);
|
||||
m_screen->set_visarea(0, 639, 0, 399);
|
||||
m_screen->set_screen_update(FUNC(macportable_state::screen_update));
|
||||
|
||||
MACADB(config, m_macadb, C15M);
|
||||
m_macadb->set_pmu_mode(true);
|
||||
m_macadb->set_pmu_is_via1(true);
|
||||
|
||||
LEGACY_IWM(config, m_iwm, &mac_iwm_interface);
|
||||
sonydriv_floppy_image_device::legacy_2_drives_add(config, &mac_floppy_interface);
|
||||
|
||||
scsi_port_device &scsibus(SCSI_PORT(config, "scsi"));
|
||||
scsibus.set_slot_device(1, "harddisk", SCSIHD, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_6));
|
||||
scsibus.set_slot_device(2, "harddisk", SCSIHD, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_5));
|
||||
|
||||
NCR5380(config, m_ncr5380, C7M);
|
||||
m_ncr5380->set_scsi_port("scsi");
|
||||
|
||||
SCC85C30(config, m_scc, C7M);
|
||||
// m_scc->intrq_callback().set(FUNC(macportable_state::set_scc_interrupt));
|
||||
|
||||
VIA6522(config, m_via1, C7M/10);
|
||||
m_via1->readpa_handler().set(FUNC(macportable_state::mac_via_in_a));
|
||||
m_via1->readpb_handler().set(FUNC(macportable_state::mac_via_in_b));
|
||||
m_via1->writepa_handler().set(FUNC(macportable_state::mac_via_out_a));
|
||||
m_via1->writepb_handler().set(FUNC(macportable_state::mac_via_out_b));
|
||||
m_via1->irq_handler().set(FUNC(macportable_state::via_irq_w));
|
||||
m_via1->cb2_handler().set(FUNC(macportable_state::via_cb2_w));
|
||||
|
||||
SPEAKER(config, "lspeaker").front_left();
|
||||
SPEAKER(config, "rspeaker").front_right();
|
||||
ASC(config, m_asc, C15M, asc_device::asc_type::ASC);
|
||||
m_asc->irqf_callback().set(FUNC(macportable_state::asc_irq_w));
|
||||
m_asc->add_route(0, "lspeaker", 1.0);
|
||||
m_asc->add_route(1, "rspeaker", 1.0);
|
||||
|
||||
/* internal ram */
|
||||
RAM(config, m_ram);
|
||||
m_ram->set_default_size("1M");
|
||||
m_ram->set_extra_options("1M,3M,5M,7M,9M");
|
||||
|
||||
SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop");
|
||||
}
|
||||
|
||||
ROM_START(macprtb)
|
||||
ROM_REGION16_BE(0x40000, "bootrom", 0)
|
||||
ROM_LOAD16_WORD("93ca3846.rom", 0x000000, 0x040000, CRC(497348f8) SHA1(79b468b33fc53f11e87e2e4b195aac981bf0c0a6))
|
||||
|
||||
ROM_REGION(0x1800, "pmu", 0)
|
||||
ROM_LOAD("pmuv1.bin", 0x000000, 0x001800, CRC(01dae148) SHA1(29d2fca7426c31f2b9334832ed3d257974a61bb1))
|
||||
ROM_END
|
||||
|
||||
ROM_START(macpb100)
|
||||
ROM_REGION16_BE(0x40000, "bootrom", 0)
|
||||
ROM_LOAD16_WORD("96645f9c.rom", 0x000000, 0x040000, CRC(29ac7ee9) SHA1(7f3acf40b1f63612de2314a2e9fcfeafca0711fc))
|
||||
|
||||
ROM_REGION(0x1800, "pmu", 0)
|
||||
ROM_LOAD("pmuv1.bin", 0x000000, 0x001800, CRC(01dae148) SHA1(29d2fca7426c31f2b9334832ed3d257974a61bb1))
|
||||
ROM_END
|
||||
|
||||
COMP(1989, macprtb, 0, 0, macprtb, macadb, macportable_state, init_macprtb, "Apple Computer", "Macintosh Portable", MACHINE_NOT_WORKING)
|
||||
COMP(1991, macpb100, 0, 0, macprtb, macadb, macportable_state, init_macprtb, "Apple Computer", "Macintosh PowerBook 100", MACHINE_NOT_WORKING )
|
||||
@ -105,7 +105,6 @@ public:
|
||||
void maclc3(machine_config &config, bool egret = true);
|
||||
void macpd210(machine_config &config);
|
||||
void maciici(machine_config &config);
|
||||
void macprtb(machine_config &config);
|
||||
void maciix(machine_config &config, bool nubus_bank1 = true, bool nubus_bank2 = true);
|
||||
void maclc520(machine_config &config);
|
||||
void pwrmac(machine_config &config);
|
||||
@ -129,7 +128,6 @@ public:
|
||||
void init_maclc2();
|
||||
void init_maciifdhd();
|
||||
void init_macse30();
|
||||
void init_macprtb();
|
||||
void init_maciivx();
|
||||
void init_maciivi();
|
||||
void init_macpd210();
|
||||
@ -361,9 +359,6 @@ private:
|
||||
uint8_t mac_gsc_r(offs_t offset);
|
||||
void mac_gsc_w(uint8_t data);
|
||||
|
||||
uint8_t mac_5396_r(offs_t offset);
|
||||
void mac_5396_w(offs_t offset, uint8_t data);
|
||||
|
||||
uint32_t macwd_r(offs_t offset, uint32_t mem_mask = ~0);
|
||||
void macwd_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
|
||||
|
||||
@ -393,7 +388,6 @@ private:
|
||||
void macpb165c_map(address_map &map);
|
||||
void macpd210_map(address_map &map);
|
||||
void macplus_map(address_map &map);
|
||||
void macprtb_map(address_map &map);
|
||||
void macse30_map(address_map &map);
|
||||
void macse_map(address_map &map);
|
||||
void pwrmac_map(address_map &map);
|
||||
@ -426,7 +420,6 @@ private:
|
||||
void macgsc_palette(palette_device &palette) const;
|
||||
|
||||
DECLARE_VIDEO_START(mac);
|
||||
DECLARE_VIDEO_START(macprtb);
|
||||
DECLARE_VIDEO_START(macsonora);
|
||||
DECLARE_VIDEO_RESET(macrbv);
|
||||
DECLARE_VIDEO_START(macv8);
|
||||
@ -434,7 +427,6 @@ private:
|
||||
DECLARE_VIDEO_RESET(maceagle);
|
||||
DECLARE_VIDEO_START(macrbv);
|
||||
uint32_t screen_update_mac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
|
||||
uint32_t screen_update_macprtb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
|
||||
uint32_t screen_update_macse30(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
|
||||
uint32_t screen_update_macpb140(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
|
||||
uint32_t screen_update_macpb160(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
|
||||
|
||||
@ -173,17 +173,6 @@ void mac_state::field_interrupts()
|
||||
take_interrupt = 1;
|
||||
}
|
||||
}
|
||||
else if ((m_model == MODEL_MAC_PORTABLE) || (m_model == MODEL_MAC_PB100))
|
||||
{
|
||||
if ((m_scc_interrupt) || (m_asc_interrupt))
|
||||
{
|
||||
take_interrupt = 2;
|
||||
}
|
||||
else if (m_via_interrupt)
|
||||
{
|
||||
take_interrupt = 1;
|
||||
}
|
||||
}
|
||||
else if ((m_model < MODEL_MAC_POWERMAC_6100) && (m_model != MODEL_MAC_IIFX))
|
||||
{
|
||||
if (m_scc_interrupt)
|
||||
@ -251,11 +240,6 @@ WRITE_LINE_MEMBER(mac_state::mac_asc_irq)
|
||||
rbv_recalc_irqs();
|
||||
}
|
||||
}
|
||||
else if ((m_model == MODEL_MAC_PORTABLE) || (m_model == MODEL_MAC_PB100))
|
||||
{
|
||||
// m_asc_interrupt = state;
|
||||
// field_interrupts();
|
||||
}
|
||||
else if ((m_model >= MODEL_MAC_II) && (m_model != MODEL_MAC_IIFX))
|
||||
{
|
||||
m_via2->write_cb1(state^1);
|
||||
@ -422,7 +406,7 @@ void mac_state::set_memory_overlay(int overlay)
|
||||
mac_install_memory(0x40000000, 0x4007ffff, memory_size, memory_data, is_rom, "bank2");
|
||||
}
|
||||
}
|
||||
else if ((m_model == MODEL_MAC_PORTABLE) || (m_model == MODEL_MAC_PB100) || (m_model == MODEL_MAC_IIFX))
|
||||
else if (m_model == MODEL_MAC_IIFX)
|
||||
{
|
||||
address_space& space = m_maincpu->space(AS_PROGRAM);
|
||||
space.unmap_write(0x000000, 0x9fffff);
|
||||
@ -1066,7 +1050,7 @@ uint8_t mac_state::mac_via2_in_a()
|
||||
{
|
||||
uint8_t result;
|
||||
|
||||
if ((m_model == MODEL_MAC_QUADRA_700) || (m_model == MODEL_MAC_QUADRA_900) || (m_model == MODEL_MAC_QUADRA_950))
|
||||
if ((m_model == MODEL_MAC_QUADRA_900) || (m_model == MODEL_MAC_QUADRA_950))
|
||||
{
|
||||
result = 0x80 | m_nubus_irq_state;
|
||||
}
|
||||
@ -1426,8 +1410,7 @@ void mac_state::mac_driver_init(model_t model)
|
||||
memset(m_ram->pointer(), 0, m_ram->size());
|
||||
|
||||
if ((model == MODEL_MAC_SE) || (model == MODEL_MAC_CLASSIC) || (model == MODEL_MAC_CLASSIC_II) || (model == MODEL_MAC_LC) || (model == MODEL_MAC_COLOR_CLASSIC) || (model >= MODEL_MAC_LC_475 && model <= MODEL_MAC_LC_580) ||
|
||||
(model == MODEL_MAC_LC_II) || (model == MODEL_MAC_LC_III) || (model == MODEL_MAC_LC_III_PLUS) || ((m_model >= MODEL_MAC_II) && (m_model <= MODEL_MAC_SE30)) ||
|
||||
(model == MODEL_MAC_PORTABLE) || (model == MODEL_MAC_PB100))
|
||||
(model == MODEL_MAC_LC_II) || (model == MODEL_MAC_LC_III) || (model == MODEL_MAC_LC_III_PLUS) || ((m_model >= MODEL_MAC_II) && (m_model <= MODEL_MAC_SE30)))
|
||||
{
|
||||
m_overlay_timeout = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mac_state::overlay_timeout_func),this));
|
||||
}
|
||||
@ -1461,8 +1444,6 @@ MAC_DRIVER_INIT(maclrcclassic, MODEL_MAC_COLOR_CLASSIC)
|
||||
MAC_DRIVER_INIT(macpm6100, MODEL_MAC_POWERMAC_6100)
|
||||
MAC_DRIVER_INIT(macpm7100, MODEL_MAC_POWERMAC_7100)
|
||||
MAC_DRIVER_INIT(macpm8100, MODEL_MAC_POWERMAC_8100)
|
||||
MAC_DRIVER_INIT(macprtb, MODEL_MAC_PORTABLE)
|
||||
MAC_DRIVER_INIT(macpb100, MODEL_MAC_PB100)
|
||||
MAC_DRIVER_INIT(macpb140, MODEL_MAC_PB140)
|
||||
MAC_DRIVER_INIT(macpb160, MODEL_MAC_PB160)
|
||||
MAC_DRIVER_INIT(maciivx, MODEL_MAC_IIVX)
|
||||
|
||||
@ -117,26 +117,6 @@ uint32_t mac_state::screen_update_macse30(screen_device &screen, bitmap_ind16 &b
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint32_t mac_state::screen_update_macprtb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
|
||||
{
|
||||
uint16_t const *const video_ram = (const uint16_t *) m_vram16.target();
|
||||
|
||||
for (int y = 0; y < 400; y++)
|
||||
{
|
||||
uint16_t *const line = &bitmap.pix(y);
|
||||
|
||||
for (int x = 0; x < 640; x += 16)
|
||||
{
|
||||
uint16_t const word = video_ram[((y * 640)/16) + ((x/16))];
|
||||
for (int b = 0; b < 16; b++)
|
||||
{
|
||||
line[x + b] = (word >> (15 - b)) & 0x0001;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint32_t mac_state::screen_update_macpb140(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
|
||||
{
|
||||
uint16_t const *const video_ram = (const uint16_t *) m_vram.target();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user