summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/jazz.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/jazz.h')
-rw-r--r--src/mame/includes/jazz.h37
1 files changed, 27 insertions, 10 deletions
diff --git a/src/mame/includes/jazz.h b/src/mame/includes/jazz.h
index 3bf5e801908..a3274d07526 100644
--- a/src/mame/includes/jazz.h
+++ b/src/mame/includes/jazz.h
@@ -6,7 +6,7 @@
#pragma once
-#include "cpu/mips/mips3.h"
+#include "cpu/mips/r4000.h"
// memory
#include "machine/ram.h"
@@ -17,14 +17,21 @@
#include "machine/jazz_mct_adr.h"
#include "machine/dp83932c.h"
#include "machine/mc146818.h"
+#include "machine/ins8250.h"
#include "machine/ncr5390.h"
#include "machine/upd765.h"
#include "machine/at_keybc.h"
+#include "machine/pc_lpt.h"
+#include "machine/i82357.h"
// video
#include "screen.h"
#include "video/ims_cvc.h"
+// audio
+#include "sound/spkrdev.h"
+#include "speaker.h"
+
// busses and connectors
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
@@ -33,17 +40,20 @@
#include "bus/pc_kbd/pc_kbdc.h"
#include "bus/pc_kbd/keyboards.h"
+#include "imagedev/floppy.h"
+#include "formats/pc_dsk.h"
+
class jazz_state : public driver_device
{
public:
jazz_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- , m_maincpu(*this, "cpu")
+ , m_cpu(*this, "cpu")
, m_ram(*this, "ram")
, m_vram(*this, "vram")
, m_mct_adr(*this, "mct_adr")
, m_scsibus(*this, "scsi")
- , m_scsi(*this, "scsi:7:host")
+ , m_scsi(*this, "scsi:7:ncr53c94")
, m_fdc(*this, "fdc")
, m_rtc(*this, "rtc")
, m_nvram(*this, "nvram")
@@ -52,6 +62,10 @@ public:
, m_network(*this, "net")
, m_screen(*this, "screen")
, m_ramdac(*this, "g364")
+ , m_ace(*this, "ace%u", 0)
+ , m_lpt(*this, "lpt")
+ , m_isp(*this, "isp")
+ , m_buzzer(*this, "buzzer")
{
}
@@ -65,32 +79,35 @@ protected:
// machine config
void jazz(machine_config &config);
+
public:
void mmr4000be(machine_config &config);
void mmr4000le(machine_config &config);
void init_common();
+ DECLARE_FLOPPY_FORMATS(floppy_formats);
+
protected:
// devices
- required_device<mips3_device> m_maincpu;
+ required_device<r4000_device> m_cpu;
required_device<ram_device> m_ram;
required_device<ram_device> m_vram;
required_device<jazz_mct_adr_device> m_mct_adr;
required_device<nscsi_bus_device> m_scsibus;
- required_device<ncr5390_device> m_scsi;
+ required_device<ncr53c94_device> m_scsi;
required_device<n82077aa_device> m_fdc;
required_device<mc146818_device> m_rtc;
required_device<nvram_device> m_nvram;
required_device<amd_28f020_device> m_flash;
- required_device<at_keyboard_controller_device> m_kbdc;
+ required_device<ps2_keyboard_controller_device> m_kbdc;
required_device<dp83932c_device> m_network;
required_device<screen_device> m_screen;
required_device<g364_device> m_ramdac;
-
- // helpers
- u8 led_r() { return m_led; }
- void led_w(const u8 data) { logerror("led 0x%02x\n", data); m_led = data; }
+ required_device_array<ns16550_device, 2> m_ace;
+ required_device<pc_lpt_device> m_lpt;
+ required_device<i82357_device> m_isp;
+ required_device<speaker_sound_device> m_buzzer;
private:
// machine state