summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/includes
diff options
context:
space:
mode:
author cracyc <cracyc@users.noreply.github.com>2015-09-28 16:14:53 -0500
committer cracyc <cracyc@users.noreply.github.com>2015-09-28 16:14:53 -0500
commitc400248728c831b2bcdca3382780a07422d025e5 (patch)
tree643a7dd57cb35bbae0d11896255838f940e6433d /src/mess/includes
parentf73fe4cda85b04102f5b834b793eb61df5250e19 (diff)
i8271: modernize [Carl]
Diffstat (limited to 'src/mess/includes')
-rw-r--r--src/mess/includes/atom.h6
-rw-r--r--src/mess/includes/bbc.h1
-rw-r--r--src/mess/includes/imds2.h5
3 files changed, 10 insertions, 2 deletions
diff --git a/src/mess/includes/atom.h b/src/mess/includes/atom.h
index 62992b67469..bd7b2427897 100644
--- a/src/mess/includes/atom.h
+++ b/src/mess/includes/atom.h
@@ -13,7 +13,7 @@
#include "machine/ram.h"
#include "imagedev/snapquik.h"
#include "formats/atom_tap.h"
-#include "formats/basicdsk.h"
+#include "formats/atom_dsk.h"
#include "formats/uef_cas.h"
#include "bus/centronics/ctronics.h"
#include "machine/6522via.h"
@@ -46,6 +46,7 @@ public:
m_maincpu(*this, SY6502_TAG),
m_vdg(*this, MC6847_TAG),
m_cassette(*this, "cassette"),
+ m_fdc(*this, I8271_TAG),
m_centronics(*this, CENTRONICS_TAG),
m_speaker(*this, "speaker"),
m_cart(*this, "cartslot"),
@@ -67,6 +68,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<mc6847_base_device> m_vdg;
required_device<cassette_image_device> m_cassette;
+ optional_device<i8271_device> m_fdc;
required_device<centronics_device> m_centronics;
required_device<speaker_sound_device> m_speaker;
optional_device<generic_slot_device> m_cart;
@@ -95,6 +97,7 @@ public:
DECLARE_READ8_MEMBER( vdg_videoram_r );
DECLARE_INPUT_CHANGED_MEMBER( trigger_reset );
DECLARE_WRITE_LINE_MEMBER( atom_8271_interrupt_callback );
+ DECLARE_WRITE_LINE_MEMBER( motor_w );
/* video state */
required_shared_ptr<UINT8> m_video_ram;
@@ -109,6 +112,7 @@ public:
/* devices */
int m_previous_i8271_int_state;
+ DECLARE_FLOPPY_FORMATS(floppy_formats);
TIMER_DEVICE_CALLBACK_MEMBER(cassette_output_tick);
int load_cart(device_image_interface &image, generic_slot_device *slot);
diff --git a/src/mess/includes/bbc.h b/src/mess/includes/bbc.h
index 9f5dcb19327..5b8e56d25e5 100644
--- a/src/mess/includes/bbc.h
+++ b/src/mess/includes/bbc.h
@@ -167,6 +167,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(write_cts_serial);
DECLARE_INPUT_CHANGED_MEMBER( trigger_reset );
DECLARE_WRITE_LINE_MEMBER(bbc_i8271_interrupt);
+ DECLARE_WRITE_LINE_MEMBER(motor_w);
UPD7002_GET_ANALOGUE(BBC_get_analogue_input);
UPD7002_EOC(BBC_uPD7002_EOC);
diff --git a/src/mess/includes/imds2.h b/src/mess/includes/imds2.h
index 2b7b20de074..298b808be82 100644
--- a/src/mess/includes/imds2.h
+++ b/src/mess/includes/imds2.h
@@ -79,11 +79,12 @@ class imds2_state : public driver_device
required_device<beep_device> m_iocbeep;
required_device<pit8253_device> m_ioctimer;
required_device<i8271_device> m_iocfdc;
+ required_device<floppy_connector> m_flop0;
+ required_device<floppy_connector> m_flop1;
required_device<i8041_device> m_iocpio;
required_device<i8741_device> m_kbcpu;
required_device<palette_device> m_palette;
required_device<gfxdecode_device> m_gfxdecode;
- required_device<legacy_floppy_image_device> m_floppy0;
required_device<centronics_device> m_centronics;
required_ioport m_io_key0;
required_ioport m_io_key1;
@@ -101,6 +102,8 @@ class imds2_state : public driver_device
void imds2_update_beeper(void);
void imds2_update_printer(void);
+ int floppy_load(floppy_image_device *dev);
+ void floppy_unload(floppy_image_device *dev);
// IPC control port
UINT8 m_ipc_control;