summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2018-02-12 16:57:50 +0100
committer hap <happppp@users.noreply.github.com>2018-02-12 16:58:08 +0100
commit20376d4d5e519c101b29faccbfba6d5e36b71ca4 (patch)
tree2ef04c04c3a2209ded799e6995240ad6d9f8471a
parentd53d624d549f8c741ba9e9e1f422937d02d061ec (diff)
reorder some memmap class declarations (nw)
-rw-r--r--src/mame/drivers/ckz80.cpp4
-rw-r--r--src/mame/drivers/cxgz80.cpp2
-rw-r--r--src/mame/drivers/fidel6502.cpp32
-rw-r--r--src/mame/drivers/fidel68k.cpp16
-rw-r--r--src/mame/drivers/fidelmcs48.cpp2
-rw-r--r--src/mame/drivers/fidelz80.cpp22
-rw-r--r--src/mame/drivers/novag6502.cpp8
-rw-r--r--src/mame/drivers/novag68k.cpp2
-rw-r--r--src/mame/drivers/novagf8.cpp4
9 files changed, 46 insertions, 46 deletions
diff --git a/src/mame/drivers/ckz80.cpp b/src/mame/drivers/ckz80.cpp
index e91a15e1d4a..5ec6a507f7d 100644
--- a/src/mame/drivers/ckz80.cpp
+++ b/src/mame/drivers/ckz80.cpp
@@ -93,10 +93,10 @@ public:
DECLARE_DRIVER_INIT(master);
DECLARE_READ8_MEMBER(master_trampoline_r);
DECLARE_WRITE8_MEMBER(master_trampoline_w);
- void master(machine_config &config);
-
void master_map(address_map &map);
void master_trampoline(address_map &map);
+ void master(machine_config &config);
+
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/drivers/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp
index d050bb02cf4..490c1fbec5a 100644
--- a/src/mame/drivers/cxgz80.cpp
+++ b/src/mame/drivers/cxgz80.cpp
@@ -89,9 +89,9 @@ public:
DECLARE_WRITE8_MEMBER(ch2001_speaker_on_w);
DECLARE_WRITE8_MEMBER(ch2001_leds_w);
DECLARE_READ8_MEMBER(ch2001_input_r);
+ void ch2001_map(address_map &map);
void ch2001(machine_config &config);
- void ch2001_map(address_map &map);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp
index 567ae36b990..5c7e8519e34 100644
--- a/src/mame/drivers/fidel6502.cpp
+++ b/src/mame/drivers/fidel6502.cpp
@@ -497,6 +497,9 @@ public:
DECLARE_MACHINE_RESET(su9);
DECLARE_INPUT_CHANGED_MEMBER(su9_cpu_freq);
void su9_set_cpu_freq();
+ void csc_map(address_map &map);
+ void su9_map(address_map &map);
+ void rsc_map(address_map &map);
void csc(machine_config &config);
void su9(machine_config &config);
void rsc(machine_config &config);
@@ -509,6 +512,8 @@ public:
DECLARE_WRITE8_MEMBER(eas_ppi_porta_w);
DECLARE_READ8_MEMBER(eas_ppi_portb_r);
DECLARE_WRITE8_MEMBER(eas_ppi_portc_w);
+ void eas_map(address_map &map);
+ void eag_map(address_map &map);
void eas(machine_config &config);
void eag(machine_config &config);
@@ -521,6 +526,8 @@ public:
DECLARE_MACHINE_RESET(sc9c);
DECLARE_INPUT_CHANGED_MEMBER(sc9c_cpu_freq);
void sc9c_set_cpu_freq();
+ void sc9_map(address_map &map);
+ void sc9d_map(address_map &map);
void sc9b(machine_config &config);
void sc9c(machine_config &config);
void sc9d(machine_config &config);
@@ -532,6 +539,8 @@ public:
DECLARE_WRITE8_MEMBER(sc12_control_w);
DECLARE_READ8_MEMBER(sc12_input_r);
void sc12_set_cpu_freq(offs_t offset);
+ void sc12_map(address_map &map);
+ void sc12_trampoline(address_map &map);
void sc12(machine_config &config);
void sc12b(machine_config &config);
@@ -541,6 +550,9 @@ public:
DECLARE_WRITE8_MEMBER(fexcel_ttl_w);
DECLARE_READ8_MEMBER(fexcelb_ttl_r);
DECLARE_READ8_MEMBER(fexcel_ttl_r);
+ void fexcel_map(address_map &map);
+ void fexcelb_map(address_map &map);
+ void fexcelp_map(address_map &map);
void fexcel(machine_config &config);
void fexcelb(machine_config &config);
void fexcel4(machine_config &config);
@@ -556,36 +568,24 @@ public:
DECLARE_WRITE8_MEMBER(fdesdis_lcd_w);
DECLARE_READ8_MEMBER(fdesdis_input_r);
DECLARE_DRIVER_INIT(fdesdis);
+ void fdesdis_map(address_map &map);
void fdes2000d(machine_config &config);
void fdes2100d(machine_config &config);
// Phantom
DECLARE_MACHINE_RESET(fphantom);
DECLARE_DRIVER_INIT(fphantom);
+ void fphantom_map(address_map &map);
void fphantom(machine_config &config);
// Chesster
DECLARE_WRITE8_MEMBER(chesster_control_w);
DECLARE_WRITE8_MEMBER(kishon_control_w);
DECLARE_DRIVER_INIT(chesster);
- void chesster(machine_config &config);
- void kishon(machine_config &config);
void chesster_map(address_map &map);
- void csc_map(address_map &map);
- void eag_map(address_map &map);
- void eas_map(address_map &map);
- void fdesdis_map(address_map &map);
- void fexcel_map(address_map &map);
- void fexcelb_map(address_map &map);
- void fexcelp_map(address_map &map);
- void fphantom_map(address_map &map);
void kishon_map(address_map &map);
- void rsc_map(address_map &map);
- void sc12_map(address_map &map);
- void sc12_trampoline(address_map &map);
- void sc9_map(address_map &map);
- void sc9d_map(address_map &map);
- void su9_map(address_map &map);
+ void chesster(machine_config &config);
+ void kishon(machine_config &config);
};
diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp
index b10419cebe7..6e30eb9491c 100644
--- a/src/mame/drivers/fidel68k.cpp
+++ b/src/mame/drivers/fidel68k.cpp
@@ -207,6 +207,9 @@ public:
// Excel 68000
DECLARE_WRITE8_MEMBER(fex68k_mux_w);
+ void fex68k_map(address_map &map);
+ void fex68km2_map(address_map &map);
+ void fex68km3_map(address_map &map);
void fex68k(machine_config &config);
void fex68km2(machine_config &config);
void fex68km3(machine_config &config);
@@ -216,6 +219,8 @@ public:
DECLARE_READ8_MEMBER(fdes68k_input_r);
DECLARE_WRITE8_MEMBER(fdes68k_lcd_w);
DECLARE_DRIVER_INIT(fdes2265);
+ void fdes2265_map(address_map &map);
+ void fdes2325_map(address_map &map);
void fdes2265(machine_config &config);
void fdes2325(machine_config &config);
@@ -227,19 +232,14 @@ public:
DECLARE_WRITE8_MEMBER(eag_7seg_w);
DECLARE_WRITE8_MEMBER(eag_mux_w);
DECLARE_READ8_MEMBER(eag_input2_r);
+ void eag_map(address_map &map);
+ void eagv7_map(address_map &map);
+ void eagv11_map(address_map &map);
void eag(machine_config &config);
void eagv7(machine_config &config);
void eagv9(machine_config &config);
void eagv10(machine_config &config);
void eagv11(machine_config &config);
- void eag_map(address_map &map);
- void eagv11_map(address_map &map);
- void eagv7_map(address_map &map);
- void fdes2265_map(address_map &map);
- void fdes2325_map(address_map &map);
- void fex68k_map(address_map &map);
- void fex68km2_map(address_map &map);
- void fex68km3_map(address_map &map);
};
diff --git a/src/mame/drivers/fidelmcs48.cpp b/src/mame/drivers/fidelmcs48.cpp
index 4ae62b0a02f..b3a6fcdbab2 100644
--- a/src/mame/drivers/fidelmcs48.cpp
+++ b/src/mame/drivers/fidelmcs48.cpp
@@ -48,8 +48,8 @@ public:
DECLARE_READ8_MEMBER(sc6_input_r);
DECLARE_READ_LINE_MEMBER(sc6_input6_r);
DECLARE_READ_LINE_MEMBER(sc6_input7_r);
- void sc6(machine_config &config);
void sc6_map(address_map &map);
+ void sc6(machine_config &config);
};
diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp
index b7b18877ae6..63bbf17ab6d 100644
--- a/src/mame/drivers/fidelz80.cpp
+++ b/src/mame/drivers/fidelz80.cpp
@@ -547,17 +547,24 @@ public:
DECLARE_WRITE8_MEMBER(cc10_ppi_porta_w);
TIMER_DEVICE_CALLBACK_MEMBER(beeper_off_callback);
DECLARE_MACHINE_START(vcc);
+ void cc10_map(address_map &map);
+ void vcc_io(address_map &map);
+ void vcc_map(address_map &map);
void cc10(machine_config &config);
void vcc(machine_config &config);
// BCC
DECLARE_READ8_MEMBER(bcc_input_r);
DECLARE_WRITE8_MEMBER(bcc_control_w);
+ void bcc_io(address_map &map);
+ void bcc_map(address_map &map);
void bcc(machine_config &config);
// SCC
DECLARE_READ8_MEMBER(scc_input_r);
DECLARE_WRITE8_MEMBER(scc_control_w);
+ void scc_io(address_map &map);
+ void scc_map(address_map &map);
void scc(machine_config &config);
// VSC
@@ -570,6 +577,8 @@ public:
DECLARE_READ8_MEMBER(vsc_pio_porta_r);
DECLARE_READ8_MEMBER(vsc_pio_portb_r);
DECLARE_WRITE8_MEMBER(vsc_pio_portb_w);
+ void vsc_io(address_map &map);
+ void vsc_map(address_map &map);
void vsc(machine_config &config);
// VBRC
@@ -580,6 +589,8 @@ public:
DECLARE_READ_LINE_MEMBER(vbrc_mcu_t1_r);
DECLARE_READ8_MEMBER(vbrc_mcu_p2_r);
DECLARE_WRITE8_MEMBER(vbrc_ioexp_port_w);
+ void vbrc_main_io(address_map &map);
+ void vbrc_main_map(address_map &map);
void vbrc(machine_config &config);
// DSC
@@ -588,18 +599,7 @@ public:
DECLARE_WRITE8_MEMBER(dsc_select_w);
DECLARE_READ8_MEMBER(dsc_input_r);
void dsc(machine_config &config);
- void bcc_io(address_map &map);
- void bcc_map(address_map &map);
- void cc10_map(address_map &map);
void dsc_map(address_map &map);
- void scc_io(address_map &map);
- void scc_map(address_map &map);
- void vbrc_main_io(address_map &map);
- void vbrc_main_map(address_map &map);
- void vcc_io(address_map &map);
- void vcc_map(address_map &map);
- void vsc_io(address_map &map);
- void vsc_map(address_map &map);
};
diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp
index 06b5ab75827..e4db33bf9a1 100644
--- a/src/mame/drivers/novag6502.cpp
+++ b/src/mame/drivers/novag6502.cpp
@@ -92,6 +92,7 @@ public:
DECLARE_WRITE8_MEMBER(supercon_control_w);
DECLARE_READ8_MEMBER(supercon_input1_r);
DECLARE_READ8_MEMBER(supercon_input2_r);
+ void supercon_map(address_map &map);
void supercon(machine_config &config);
// Constellation Forte
@@ -99,6 +100,7 @@ public:
DECLARE_WRITE64_MEMBER(cforte_lcd_output_w);
DECLARE_WRITE8_MEMBER(cforte_mux_w);
DECLARE_WRITE8_MEMBER(cforte_control_w);
+ void cforte_map(address_map &map);
void cforte(machine_config &config);
// Super Expert
@@ -111,17 +113,15 @@ public:
DECLARE_MACHINE_RESET(sexpert);
DECLARE_DRIVER_INIT(sexpert);
DECLARE_INPUT_CHANGED_MEMBER(sexpert_cpu_freq);
+ void sexpert_map(address_map &map);
void sexpert_set_cpu_freq();
void sexpert(machine_config &config);
// Super Forte
DECLARE_WRITE8_MEMBER(sforte_lcd_control_w);
DECLARE_WRITE8_MEMBER(sforte_lcd_data_w);
- void sforte(machine_config &config);
- void cforte_map(address_map &map);
- void sexpert_map(address_map &map);
void sforte_map(address_map &map);
- void supercon_map(address_map &map);
+ void sforte(machine_config &config);
};
diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp
index 537b882c7bb..52ebfefd133 100644
--- a/src/mame/drivers/novag68k.cpp
+++ b/src/mame/drivers/novag68k.cpp
@@ -50,8 +50,8 @@ public:
DECLARE_WRITE8_MEMBER(diablo68k_leds_w);
DECLARE_READ8_MEMBER(diablo68k_input1_r);
DECLARE_READ8_MEMBER(diablo68k_input2_r);
- void diablo68k(machine_config &config);
void diablo68k_map(address_map &map);
+ void diablo68k(machine_config &config);
};
diff --git a/src/mame/drivers/novagf8.cpp b/src/mame/drivers/novagf8.cpp
index b3cdfc47e44..92cfeb7157d 100644
--- a/src/mame/drivers/novagf8.cpp
+++ b/src/mame/drivers/novagf8.cpp
@@ -45,10 +45,10 @@ public:
DECLARE_WRITE8_MEMBER(delta1_io1_w);
DECLARE_READ8_MEMBER(delta1_io0_r);
DECLARE_READ8_MEMBER(delta1_io1_r);
- void delta1(machine_config &config);
-
void delta1_io(address_map &map);
void delta1_map(address_map &map);
+ void delta1(machine_config &config);
+
protected:
virtual void machine_start() override;
};