diff options
author | Vas Crabb <vas@vastheman.com> | 2017-02-27 22:16:07 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2017-02-27 22:57:14 +1100 |
commit | 6c23897483a0201dd0b65b450253fd9bf8fb8723 (patch) | |
tree | 62a083b4801f63b09bed57ae0c9e8f646aaa3200 /src/devices/bus/megadrive | |
parent | b07c572f709e95dcd1e2e4b9d4c696e122f67655 (diff) |
Self-registering devices prep:
* Make device_creator a variable template and get rid of the ampersands
* Remove screen.h and speaker.h from emu.h and add where necessary
* Centralise instantiations of screen and speaker finder templates
* Add/standardise #include guards in many hearers
* Remove many redundant #includes
* Order #includesr to help catch headers that can't be #included alone
(nw) This changes #include order to be prefix, unit header if applicable
then other stuff roughly in order from most dependent to least dependent
library. This helps catch headers that don't #include things that they
use.
Diffstat (limited to 'src/devices/bus/megadrive')
-rw-r--r-- | src/devices/bus/megadrive/eeprom.cpp | 16 | ||||
-rw-r--r-- | src/devices/bus/megadrive/ggenie.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/megadrive/jcart.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/megadrive/md_slot.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/megadrive/rom.cpp | 70 | ||||
-rw-r--r-- | src/devices/bus/megadrive/sk.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/megadrive/stm95.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/megadrive/svp.cpp | 2 |
8 files changed, 53 insertions, 53 deletions
diff --git a/src/devices/bus/megadrive/eeprom.cpp b/src/devices/bus/megadrive/eeprom.cpp index 49132e537e4..128de4da279 100644 --- a/src/devices/bus/megadrive/eeprom.cpp +++ b/src/devices/bus/megadrive/eeprom.cpp @@ -51,13 +51,13 @@ // md_rom_device - constructor //------------------------------------------------- -const device_type MD_STD_EEPROM = &device_creator<md_std_eeprom_device>; -const device_type MD_EEPROM_NBAJAM = &device_creator<md_eeprom_nbajam_device>; -const device_type MD_EEPROM_NBAJAMTE = &device_creator<md_eeprom_nbajamte_device>; -const device_type MD_EEPROM_NFLQB = &device_creator<md_eeprom_nflqb_device>; -const device_type MD_EEPROM_CSLAM = &device_creator<md_eeprom_cslam_device>; -const device_type MD_EEPROM_NHLPA = &device_creator<md_eeprom_nhlpa_device>; -const device_type MD_EEPROM_BLARA = &device_creator<md_eeprom_blara_device>; +const device_type MD_STD_EEPROM = device_creator<md_std_eeprom_device>; +const device_type MD_EEPROM_NBAJAM = device_creator<md_eeprom_nbajam_device>; +const device_type MD_EEPROM_NBAJAMTE = device_creator<md_eeprom_nbajamte_device>; +const device_type MD_EEPROM_NFLQB = device_creator<md_eeprom_nflqb_device>; +const device_type MD_EEPROM_CSLAM = device_creator<md_eeprom_cslam_device>; +const device_type MD_EEPROM_NHLPA = device_creator<md_eeprom_nhlpa_device>; +const device_type MD_EEPROM_BLARA = device_creator<md_eeprom_blara_device>; md_std_eeprom_device::md_std_eeprom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) @@ -378,7 +378,7 @@ WRITE16_MEMBER(md_eeprom_blara_device::write) // TEMPORARY ADDITION UNTIL WE FIND OUT WHAT IS MISSING IN THE CORE X24C02 CODE // THIS IS A CUSTOM I2C EEPROM EMULATION THAT ALLOWS NBA JAM TO WORK -const device_type MD_EEPROM_NBAJAM_ALT = &device_creator<md_eeprom_nbajam_device_alt>; +const device_type MD_EEPROM_NBAJAM_ALT = device_creator<md_eeprom_nbajam_device_alt>; md_eeprom_nbajam_device_alt::md_eeprom_nbajam_device_alt(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : md_std_eeprom_device(mconfig, MD_EEPROM_NBAJAM_ALT, "MD NBA Jam (Alt)", tag, owner, clock, "md_eeprom_nbajama", __FILE__) diff --git a/src/devices/bus/megadrive/ggenie.cpp b/src/devices/bus/megadrive/ggenie.cpp index a8586e087eb..0fa81aa1022 100644 --- a/src/devices/bus/megadrive/ggenie.cpp +++ b/src/devices/bus/megadrive/ggenie.cpp @@ -29,7 +29,7 @@ // md_rom_device - constructor //------------------------------------------------- -const device_type MD_ROM_GAMEGENIE = &device_creator<md_rom_ggenie_device>; +const device_type MD_ROM_GAMEGENIE = device_creator<md_rom_ggenie_device>; md_rom_ggenie_device::md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/bus/megadrive/jcart.cpp b/src/devices/bus/megadrive/jcart.cpp index 43d38e50a60..06ed2720eff 100644 --- a/src/devices/bus/megadrive/jcart.cpp +++ b/src/devices/bus/megadrive/jcart.cpp @@ -35,9 +35,9 @@ // md_rom_device - constructor //------------------------------------------------- -const device_type MD_JCART = &device_creator<md_jcart_device>; -const device_type MD_SEPROM_CODEMAST = &device_creator<md_seprom_codemast_device>; -const device_type MD_SEPROM_MM96 = &device_creator<md_seprom_mm96_device>; +const device_type MD_JCART = device_creator<md_jcart_device>; +const device_type MD_SEPROM_CODEMAST = device_creator<md_seprom_codemast_device>; +const device_type MD_SEPROM_MM96 = device_creator<md_seprom_mm96_device>; // Sampras, Super Skidmarks? md_jcart_device::md_jcart_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp index b6d864002f5..b363b6222cc 100644 --- a/src/devices/bus/megadrive/md_slot.cpp +++ b/src/devices/bus/megadrive/md_slot.cpp @@ -51,9 +51,9 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type MD_CART_SLOT = &device_creator<md_cart_slot_device>; -const device_type PICO_CART_SLOT = &device_creator<pico_cart_slot_device>; -const device_type COPERA_CART_SLOT = &device_creator<copera_cart_slot_device>; +const device_type MD_CART_SLOT = device_creator<md_cart_slot_device>; +const device_type PICO_CART_SLOT = device_creator<pico_cart_slot_device>; +const device_type COPERA_CART_SLOT = device_creator<copera_cart_slot_device>; //************************************************************************** // MD cartridges Interface diff --git a/src/devices/bus/megadrive/rom.cpp b/src/devices/bus/megadrive/rom.cpp index 772a777d965..bb9e7c4fab0 100644 --- a/src/devices/bus/megadrive/rom.cpp +++ b/src/devices/bus/megadrive/rom.cpp @@ -24,45 +24,45 @@ //------------------------------------------------- // BASE CARTS + NVRAM -const device_type MD_STD_ROM = &device_creator<md_std_rom_device>; -const device_type MD_ROM_SRAM = &device_creator<md_rom_sram_device>; -const device_type MD_ROM_FRAM = &device_creator<md_rom_fram_device>; +const device_type MD_STD_ROM = device_creator<md_std_rom_device>; +const device_type MD_ROM_SRAM = device_creator<md_rom_sram_device>; +const device_type MD_ROM_FRAM = device_creator<md_rom_fram_device>; // BASE CARTS + BANKSWITCH AT RESET -const device_type MD_ROM_CM2IN1 = &device_creator<md_rom_cm2in1_device>; +const device_type MD_ROM_CM2IN1 = device_creator<md_rom_cm2in1_device>; // BASE CARTS + PROTECTION / BANKSWITCH -const device_type MD_ROM_SSF2 = &device_creator<md_rom_ssf2_device>; -const device_type MD_ROM_BUGSLIFE = &device_creator<md_rom_bugslife_device>; -const device_type MD_ROM_SMOUSE = &device_creator<md_rom_smouse_device>; -const device_type MD_ROM_SMW64 = &device_creator<md_rom_smw64_device>; -const device_type MD_ROM_SMB = &device_creator<md_rom_smb_device>; -const device_type MD_ROM_SMB2 = &device_creator<md_rom_smb2_device>; -const device_type MD_ROM_SBUBL = &device_creator<md_rom_sbubl_device>; -const device_type MD_ROM_RX3 = &device_creator<md_rom_rx3_device>; -const device_type MD_ROM_MJLOV = &device_creator<md_rom_mjlov_device>; -const device_type MD_ROM_CJMJCLUB = &device_creator<md_rom_cjmjclub_device>; -const device_type MD_ROM_KOF98 = &device_creator<md_rom_kof98_device>; -const device_type MD_ROM_KOF99 = &device_creator<md_rom_kof99_device>; -const device_type MD_ROM_SOULB = &device_creator<md_rom_soulb_device>; -const device_type MD_ROM_CHINF3 = &device_creator<md_rom_chinf3_device>; -const device_type MD_ROM_16MJ2 = &device_creator<md_rom_16mj2_device>; -const device_type MD_ROM_ELFWOR = &device_creator<md_rom_elfwor_device>; -const device_type MD_ROM_YASECH = &device_creator<md_rom_yasech_device>; -const device_type MD_ROM_LION2 = &device_creator<md_rom_lion2_device>; -const device_type MD_ROM_LION3 = &device_creator<md_rom_lion3_device>; -const device_type MD_ROM_MCPIR = &device_creator<md_rom_mcpirate_device>; -const device_type MD_ROM_POKEA = &device_creator<md_rom_pokea_device>; -const device_type MD_ROM_POKESTAD = &device_creator<md_rom_pokestad_device>; -const device_type MD_ROM_REALTEC = &device_creator<md_rom_realtec_device>; -const device_type MD_ROM_REDCL = &device_creator<md_rom_redcl_device>; -const device_type MD_ROM_SQUIR = &device_creator<md_rom_squir_device>; -const device_type MD_ROM_TEKKENSP = &device_creator<md_rom_tekkensp_device>; -const device_type MD_ROM_TOPF = &device_creator<md_rom_topf_device>; -const device_type MD_ROM_RADICA = &device_creator<md_rom_radica_device>; -const device_type MD_ROM_BEGGARP = &device_creator<md_rom_beggarp_device>; -const device_type MD_ROM_WUKONG = &device_creator<md_rom_wukong_device>; -const device_type MD_ROM_STARODYS = &device_creator<md_rom_starodys_device>; +const device_type MD_ROM_SSF2 = device_creator<md_rom_ssf2_device>; +const device_type MD_ROM_BUGSLIFE = device_creator<md_rom_bugslife_device>; +const device_type MD_ROM_SMOUSE = device_creator<md_rom_smouse_device>; +const device_type MD_ROM_SMW64 = device_creator<md_rom_smw64_device>; +const device_type MD_ROM_SMB = device_creator<md_rom_smb_device>; +const device_type MD_ROM_SMB2 = device_creator<md_rom_smb2_device>; +const device_type MD_ROM_SBUBL = device_creator<md_rom_sbubl_device>; +const device_type MD_ROM_RX3 = device_creator<md_rom_rx3_device>; +const device_type MD_ROM_MJLOV = device_creator<md_rom_mjlov_device>; +const device_type MD_ROM_CJMJCLUB = device_creator<md_rom_cjmjclub_device>; +const device_type MD_ROM_KOF98 = device_creator<md_rom_kof98_device>; +const device_type MD_ROM_KOF99 = device_creator<md_rom_kof99_device>; +const device_type MD_ROM_SOULB = device_creator<md_rom_soulb_device>; +const device_type MD_ROM_CHINF3 = device_creator<md_rom_chinf3_device>; +const device_type MD_ROM_16MJ2 = device_creator<md_rom_16mj2_device>; +const device_type MD_ROM_ELFWOR = device_creator<md_rom_elfwor_device>; +const device_type MD_ROM_YASECH = device_creator<md_rom_yasech_device>; +const device_type MD_ROM_LION2 = device_creator<md_rom_lion2_device>; +const device_type MD_ROM_LION3 = device_creator<md_rom_lion3_device>; +const device_type MD_ROM_MCPIR = device_creator<md_rom_mcpirate_device>; +const device_type MD_ROM_POKEA = device_creator<md_rom_pokea_device>; +const device_type MD_ROM_POKESTAD = device_creator<md_rom_pokestad_device>; +const device_type MD_ROM_REALTEC = device_creator<md_rom_realtec_device>; +const device_type MD_ROM_REDCL = device_creator<md_rom_redcl_device>; +const device_type MD_ROM_SQUIR = device_creator<md_rom_squir_device>; +const device_type MD_ROM_TEKKENSP = device_creator<md_rom_tekkensp_device>; +const device_type MD_ROM_TOPF = device_creator<md_rom_topf_device>; +const device_type MD_ROM_RADICA = device_creator<md_rom_radica_device>; +const device_type MD_ROM_BEGGARP = device_creator<md_rom_beggarp_device>; +const device_type MD_ROM_WUKONG = device_creator<md_rom_wukong_device>; +const device_type MD_ROM_STARODYS = device_creator<md_rom_starodys_device>; md_std_rom_device::md_std_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) diff --git a/src/devices/bus/megadrive/sk.cpp b/src/devices/bus/megadrive/sk.cpp index 5703a2a96ca..8260ae4abf4 100644 --- a/src/devices/bus/megadrive/sk.cpp +++ b/src/devices/bus/megadrive/sk.cpp @@ -24,7 +24,7 @@ // md_rom_device - constructor //------------------------------------------------- -const device_type MD_ROM_SK = &device_creator<md_rom_sk_device>; +const device_type MD_ROM_SK = device_creator<md_rom_sk_device>; md_rom_sk_device::md_rom_sk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) diff --git a/src/devices/bus/megadrive/stm95.cpp b/src/devices/bus/megadrive/stm95.cpp index dded370bdba..05adacac57f 100644 --- a/src/devices/bus/megadrive/stm95.cpp +++ b/src/devices/bus/megadrive/stm95.cpp @@ -172,7 +172,7 @@ void stm95_eeprom_device::set_sck_line(int state) // md_rom_device - constructor //------------------------------------------------- -const device_type MD_EEPROM_STM95 = &device_creator<md_eeprom_stm95_device>; +const device_type MD_EEPROM_STM95 = device_creator<md_eeprom_stm95_device>; md_eeprom_stm95_device::md_eeprom_stm95_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp index 8aa370164f2..05ac7f024a2 100644 --- a/src/devices/bus/megadrive/svp.cpp +++ b/src/devices/bus/megadrive/svp.cpp @@ -34,7 +34,7 @@ // md_rom_device - constructor //------------------------------------------------- -const device_type MD_ROM_SVP = &device_creator<md_rom_svp_device>; +const device_type MD_ROM_SVP = device_creator<md_rom_svp_device>; md_rom_svp_device::md_rom_svp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), |