summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/includes
diff options
context:
space:
mode:
author Curt Coder <curtcoder@mail.com>2012-11-22 19:33:19 +0000
committer Curt Coder <curtcoder@mail.com>2012-11-22 19:33:19 +0000
commit9046ce0dc516d3a8b947deaa67448068c198eb45 (patch)
tree0f3c1a6ba191584dfd05631c95c6a4d978d37fd4 /src/mess/includes
parent20f0cd1a58cfeff8d49437b9c34a344732939706 (diff)
sed1310: Cleanup. (nw)
(MESS) bw2: Fixed memory mapping. (nw) (MESS) msm6255: Refactored to use device_memory_interface. (nw) (MESS) floppy: Added macros for declaring modern floppy formats. The generic floppy formats (D88/DFI/IMD/IPF/MFI/MFM) are now automatically supported in each driver using the modern floppy code. [Curt Coder]
Diffstat (limited to 'src/mess/includes')
-rw-r--r--src/mess/includes/apollo.h2
-rw-r--r--src/mess/includes/atarist.h2
-rw-r--r--src/mess/includes/bebox.h3
-rw-r--r--src/mess/includes/bw12.h2
-rw-r--r--src/mess/includes/bw2.h5
-rw-r--r--src/mess/includes/einstein.h2
-rw-r--r--src/mess/includes/m5.h1
-rw-r--r--src/mess/includes/mikromik.h1
-rw-r--r--src/mess/includes/newbrain.h6
-rw-r--r--src/mess/includes/next.h2
-rw-r--r--src/mess/includes/pc.h2
-rw-r--r--src/mess/includes/pc1512.h1
-rw-r--r--src/mess/includes/pcw16.h2
-rw-r--r--src/mess/includes/samcoupe.h4
-rw-r--r--src/mess/includes/super6.h1
-rw-r--r--src/mess/includes/x68k.h1
16 files changed, 24 insertions, 13 deletions
diff --git a/src/mess/includes/apollo.h b/src/mess/includes/apollo.h
index 3fec158d2e9..38f5d97ab2e 100644
--- a/src/mess/includes/apollo.h
+++ b/src/mess/includes/apollo.h
@@ -23,6 +23,7 @@
#include "machine/sc499.h"
#include "machine/3c505.h"
#include "machine/68681.h"
+#include "machine/pc_fdc.h"
#ifndef VERBOSE
#define VERBOSE 0
@@ -185,6 +186,7 @@ public:
void fdc_interrupt(bool state);
void fdc_dma_drq(bool state);
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
};
MACHINE_CONFIG_EXTERN( apollo );
diff --git a/src/mess/includes/atarist.h b/src/mess/includes/atarist.h
index 9fbb76e55b8..cd4996045ed 100644
--- a/src/mess/includes/atarist.h
+++ b/src/mess/includes/atarist.h
@@ -273,7 +273,7 @@ public:
floppy_image_device *floppy_devices[2];
- static const floppy_format_type floppy_formats[];
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
TIMER_CALLBACK_MEMBER(st_mouse_tick);
TIMER_CALLBACK_MEMBER(atarist_shifter_tick);
TIMER_CALLBACK_MEMBER(atarist_glue_tick);
diff --git a/src/mess/includes/bebox.h b/src/mess/includes/bebox.h
index d663b1a4220..2b9b8948788 100644
--- a/src/mess/includes/bebox.h
+++ b/src/mess/includes/bebox.h
@@ -9,9 +9,11 @@
#ifndef BEBOX_H_
#define BEBOX_H_
+#include "emu.h"
#include "machine/ins8250.h"
#include "machine/8237dma.h"
#include "machine/53c810.h"
+#include "machine/upd765.h"
struct bebox_devices_t
{
@@ -86,6 +88,7 @@ public:
void fdc_interrupt(bool state);
void fdc_dma_drq(bool state);
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
};
diff --git a/src/mess/includes/bw12.h b/src/mess/includes/bw12.h
index 372452127e3..a63736bc0a3 100644
--- a/src/mess/includes/bw12.h
+++ b/src/mess/includes/bw12.h
@@ -109,6 +109,8 @@ public:
int m_motor1;
TIMER_DEVICE_CALLBACK_MEMBER(floppy_motor_off_tick);
DECLARE_WRITE_LINE_MEMBER(pit_out0_w);
+ DECLARE_FLOPPY_FORMATS( bw12_floppy_formats );
+ DECLARE_FLOPPY_FORMATS( bw14_floppy_formats );
};
#endif
diff --git a/src/mess/includes/bw2.h b/src/mess/includes/bw2.h
index af6f3c9ec72..9a5a4089357 100644
--- a/src/mess/includes/bw2.h
+++ b/src/mess/includes/bw2.h
@@ -6,9 +6,6 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "formats/bw2_dsk.h"
-#include "formats/hxcmfm_dsk.h"
-#include "formats/imd_dsk.h"
-#include "formats/mfi_dsk.h"
#include "machine/bw2exp.h"
#include "machine/ctronics.h"
#include "machine/i8251.h"
@@ -74,7 +71,7 @@ public:
void fdc_intrq_w(bool state);
void fdc_drq_w(bool state);
- static const floppy_format_type floppy_formats[];
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
// keyboard state
UINT8 m_kb;
diff --git a/src/mess/includes/einstein.h b/src/mess/includes/einstein.h
index 26b10f9e6f4..ab508c3904b 100644
--- a/src/mess/includes/einstein.h
+++ b/src/mess/includes/einstein.h
@@ -67,7 +67,7 @@ public:
UINT8 *m_crtc_ram;
UINT8 m_de;
- static const floppy_format_type floppy_formats[];
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
DECLARE_WRITE8_MEMBER(einstein_80col_ram_w);
DECLARE_READ8_MEMBER(einstein_80col_ram_r);
DECLARE_READ8_MEMBER(einstein_80col_state_r);
diff --git a/src/mess/includes/m5.h b/src/mess/includes/m5.h
index 6da24175df2..320bc80b283 100644
--- a/src/mess/includes/m5.h
+++ b/src/mess/includes/m5.h
@@ -73,6 +73,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(sordm5_video_interrupt_callback);
void fdc_irq(bool state);
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
};
#endif
diff --git a/src/mess/includes/mikromik.h b/src/mess/includes/mikromik.h
index 6d44f4ce186..f0d189e5e87 100644
--- a/src/mess/includes/mikromik.h
+++ b/src/mess/includes/mikromik.h
@@ -118,6 +118,7 @@ public:
int m_tc;
UINT32 screen_update_mm1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(kbclk_tick);
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
};
diff --git a/src/mess/includes/newbrain.h b/src/mess/includes/newbrain.h
index b5c11815aa3..88a5c4567cd 100644
--- a/src/mess/includes/newbrain.h
+++ b/src/mess/includes/newbrain.h
@@ -8,16 +8,14 @@
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "cpu/cop400/cop400.h"
-#include "machine/upd765.h"
+#include "imagedev/cassette.h"
#include "machine/6850acia.h"
#include "machine/adc0808.h"
#include "machine/z80ctc.h"
#include "machine/z80sio.h"
-#include "imagedev/flopdrv.h"
-#include "formats/basicdsk.h"
-#include "imagedev/cassette.h"
#include "machine/rescap.h"
#include "machine/ram.h"
+#include "machine/upd765.h"
#define SCREEN_TAG "screen"
#define Z80_TAG "409"
diff --git a/src/mess/includes/next.h b/src/mess/includes/next.h
index f849a9daa8a..a49290f6414 100644
--- a/src/mess/includes/next.h
+++ b/src/mess/includes/next.h
@@ -114,7 +114,7 @@ public:
void mo_irq(bool state);
void mo_drq(bool state);
- static const floppy_format_type floppy_formats[];
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
static const cdrom_interface cdrom_intf;
static const harddisk_interface harddisk_intf;
diff --git a/src/mess/includes/pc.h b/src/mess/includes/pc.h
index 48c41a5c084..3738c0ee256 100644
--- a/src/mess/includes/pc.h
+++ b/src/mess/includes/pc.h
@@ -13,6 +13,7 @@
#include "machine/serial.h"
#include "machine/ser_mouse.h"
#include "machine/pc_kbdc.h"
+#include "machine/upd765.h"
class pc_state : public driver_device
{
@@ -129,6 +130,7 @@ public:
void fdc_interrupt(bool state);
void fdc_dma_drq(bool state);
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
};
/*----------- defined in machine/pc.c -----------*/
diff --git a/src/mess/includes/pc1512.h b/src/mess/includes/pc1512.h
index 41a0d602e9d..cc07c17ef25 100644
--- a/src/mess/includes/pc1512.h
+++ b/src/mess/includes/pc1512.h
@@ -155,6 +155,7 @@ public:
DECLARE_INPUT_CHANGED_MEMBER( mouse_button_2_changed );
DECLARE_INPUT_CHANGED_MEMBER( mouse_x_changed );
DECLARE_INPUT_CHANGED_MEMBER( mouse_y_changed );
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
// system status register
int m_pit1;
diff --git a/src/mess/includes/pcw16.h b/src/mess/includes/pcw16.h
index 4608be3e2fd..830a2943af6 100644
--- a/src/mess/includes/pcw16.h
+++ b/src/mess/includes/pcw16.h
@@ -7,6 +7,7 @@
#ifndef PCW16_H_
#define PCW16_H_
+#include "machine/upd765.h" /* FDC superio */
#define PCW16_BORDER_HEIGHT 8
#define PCW16_BORDER_WIDTH 8
@@ -113,6 +114,7 @@ public:
void trigger_fdc_int();
void fdc_interrupt(bool state);
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
};
#endif /* PCW16_H_ */
diff --git a/src/mess/includes/samcoupe.h b/src/mess/includes/samcoupe.h
index b59cb878aa1..3901058bfbd 100644
--- a/src/mess/includes/samcoupe.h
+++ b/src/mess/includes/samcoupe.h
@@ -11,6 +11,8 @@
#ifndef SAMCOUPE_H_
#define SAMCOUPE_H_
+#include "machine/wd1772.h"
+
/* screen dimensions */
#define SAM_BLOCK 8
@@ -114,7 +116,7 @@ public:
UINT8* sam_bank_read_ptr[4];
UINT8* sam_bank_write_ptr[4];
-
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
};
diff --git a/src/mess/includes/super6.h b/src/mess/includes/super6.h
index 0b4abb44234..b81193f0fc7 100644
--- a/src/mess/includes/super6.h
+++ b/src/mess/includes/super6.h
@@ -71,7 +71,6 @@ public:
DECLARE_WRITE_LINE_MEMBER( fr_w );
void fdc_intrq_w(bool state);
void fdc_drq_w(bool state);
- static const floppy_format_type floppy_formats[];
void bankswitch();
diff --git a/src/mess/includes/x68k.h b/src/mess/includes/x68k.h
index 7d68600b447..a2758f3a3a9 100644
--- a/src/mess/includes/x68k.h
+++ b/src/mess/includes/x68k.h
@@ -74,6 +74,7 @@ public:
void floppy_load_unload();
int floppy_load(floppy_image_device *dev);
void floppy_unload(floppy_image_device *dev);
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
struct
{