diff options
Diffstat (limited to 'src/devices/bus')
34 files changed, 69 insertions, 67 deletions
diff --git a/src/devices/bus/a7800/a78_slot.cpp b/src/devices/bus/a7800/a78_slot.cpp index 0509753a1c3..53541560fa4 100644 --- a/src/devices/bus/a7800/a78_slot.cpp +++ b/src/devices/bus/a7800/a78_slot.cpp @@ -537,7 +537,7 @@ std::string a78_cart_slot_device::get_default_card_software() int type = A78_TYPE0, mapper; // Load and check the header - core_fread(m_file, &head[0], 128); + m_file->read(&head[0], 128); // let's try to auto-fix some common errors in the header mapper = validate_header((head[53] << 8) | head[54], FALSE); @@ -558,7 +558,7 @@ std::string a78_cart_slot_device::get_default_card_software() break; case 0x0022: case 0x0026: - if (core_fsize(m_file) > 0x40000) + if (m_file->size() > 0x40000) type = A78_MEGACART; else type = A78_VERSABOARD; diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp index b2e46a421da..8f0f416ab0f 100644 --- a/src/devices/bus/a800/a800_slot.cpp +++ b/src/devices/bus/a800/a800_slot.cpp @@ -412,13 +412,13 @@ std::string a800_cart_slot_device::get_default_card_software() { const char *slot_string; dynamic_buffer head(0x10); - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); int type = A800_8K; // check whether there is an header, to identify the cart type if ((len % 0x1000) == 0x10) { - core_fread(m_file, &head[0], 0x10); + m_file->read(&head[0], 0x10); type = identify_cart_type(&head[0]); } else // otherwise try to guess based on size @@ -449,13 +449,13 @@ std::string a5200_cart_slot_device::get_default_card_software() { const char *slot_string; dynamic_buffer head(0x10); - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); int type = A5200_8K; // check whether there is an header, to identify the cart type if ((len % 0x1000) == 0x10) { - core_fread(m_file, &head[0], 0x10); + m_file->read(&head[0], 0x10); type = identify_cart_type(&head[0]); std::string info; @@ -482,13 +482,13 @@ std::string xegs_cart_slot_device::get_default_card_software() { const char *slot_string; dynamic_buffer head(0x10); - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); int type = A800_8K; // check whether there is an header, to identify the cart type if ((len % 0x1000) == 0x10) { - core_fread(m_file, &head[0], 0x10); + m_file->read(&head[0], 0x10); type = identify_cart_type(&head[0]); } if (type != A800_XEGS) diff --git a/src/devices/bus/apf/slot.cpp b/src/devices/bus/apf/slot.cpp index eb2e17d9f80..af872826ce3 100644 --- a/src/devices/bus/apf/slot.cpp +++ b/src/devices/bus/apf/slot.cpp @@ -226,7 +226,7 @@ std::string apf_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 size = core_fsize(m_file); + UINT32 size = m_file->size(); int type = APF_STD; // attempt to identify Space Destroyer, which needs 1K of additional RAM diff --git a/src/devices/bus/astrocde/slot.cpp b/src/devices/bus/astrocde/slot.cpp index 8ae7bbe8c15..2cab9c3c285 100644 --- a/src/devices/bus/astrocde/slot.cpp +++ b/src/devices/bus/astrocde/slot.cpp @@ -203,7 +203,7 @@ std::string astrocade_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 size = core_fsize(m_file); + UINT32 size = m_file->size(); int type = ASTROCADE_STD; if (size == 0x40000) diff --git a/src/devices/bus/c64/exp.cpp b/src/devices/bus/c64/exp.cpp index 47e2a20cc14..31263c5f927 100644 --- a/src/devices/bus/c64/exp.cpp +++ b/src/devices/bus/c64/exp.cpp @@ -153,7 +153,7 @@ bool c64_expansion_slot_device::call_load() int exrom = 1; int game = 1; - if (cbm_crt_read_header(m_file, &roml_size, &romh_size, &exrom, &game)) + if (cbm_crt_read_header(*m_file, &roml_size, &romh_size, &exrom, &game)) { UINT8 *roml = nullptr; UINT8 *romh = nullptr; @@ -164,7 +164,7 @@ bool c64_expansion_slot_device::call_load() if (roml_size) roml = m_card->m_roml; if (romh_size) romh = m_card->m_roml; - cbm_crt_read_data(m_file, roml, romh); + cbm_crt_read_data(*m_file, roml, romh); } m_card->m_exrom = exrom; @@ -222,7 +222,7 @@ std::string c64_expansion_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { if (!core_stricmp(filetype(), "crt")) - return cbm_crt_get_card(m_file); + return cbm_crt_get_card(*m_file); clear(); } diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp index c1f7fe0f1dd..5f4a1eaa285 100644 --- a/src/devices/bus/c64/xl80.cpp +++ b/src/devices/bus/c64/xl80.cpp @@ -122,14 +122,14 @@ GFXDECODE_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( c64_xl80 ) - MCFG_SCREEN_ADD(MC6845_SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white) MCFG_SCREEN_UPDATE_DEVICE(HD46505SP_TAG, h46505_device, screen_update) MCFG_SCREEN_SIZE(80*8, 24*8) MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*8-1) MCFG_SCREEN_REFRESH_RATE(50) MCFG_GFXDECODE_ADD("gfxdecode", "palette", c64_xl80) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD(HD46505SP_TAG, H46505, MC6845_SCREEN_TAG, XTAL_14_31818MHz / 8) MCFG_MC6845_SHOW_BORDER_AREA(true) diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp index bb0e38a22cb..6bc88abdadb 100644 --- a/src/devices/bus/cbm2/hrg.cpp +++ b/src/devices/bus/cbm2/hrg.cpp @@ -85,12 +85,12 @@ ADDRESS_MAP_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm2_hrg_a ) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 512-1) MCFG_SCREEN_REFRESH_RATE(25) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(EF9365_TAG, EF9365, 1750000) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) @@ -106,12 +106,12 @@ MACHINE_CONFIG_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm2_hrg_b ) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_REFRESH_RATE(50) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(EF9366_TAG, EF9365, 1750000) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) diff --git a/src/devices/bus/chanf/slot.cpp b/src/devices/bus/chanf/slot.cpp index 72045151cca..ea5b00b5348 100644 --- a/src/devices/bus/chanf/slot.cpp +++ b/src/devices/bus/chanf/slot.cpp @@ -222,7 +222,7 @@ std::string channelf_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); int type; if (len == 0x40000) diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/exp.cpp index 05a53b584a5..53953f82859 100644 --- a/src/devices/bus/coleco/exp.cpp +++ b/src/devices/bus/coleco/exp.cpp @@ -116,7 +116,7 @@ std::string colecovision_cartridge_slot_device::get_default_card_software() { if (open_image_file(mconfig().options())) { - UINT32 length = core_fsize(m_file); + UINT32 length = m_file->size(); if (length == 0x100000 || length == 0x200000) return software_get_default_slot("xin1"); } diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp index b9cc57b836f..15aa7f88295 100644 --- a/src/devices/bus/comx35/clm.cpp +++ b/src/devices/bus/comx35/clm.cpp @@ -135,7 +135,7 @@ GFXDECODE_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( comx_clm ) - MCFG_SCREEN_ADD(MC6845_SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white) MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_SCREEN_SIZE(80*8, 24*8) MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*8-1) @@ -143,7 +143,7 @@ static MACHINE_CONFIG_FRAGMENT( comx_clm ) MCFG_SCREEN_REFRESH_RATE(50) MCFG_GFXDECODE_ADD("gfxdecode", "palette", comx_clm) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD(MC6845_TAG, MC6845, MC6845_SCREEN_TAG, XTAL_14_31818MHz/7) MCFG_MC6845_SHOW_BORDER_AREA(true) diff --git a/src/devices/bus/crvision/slot.cpp b/src/devices/bus/crvision/slot.cpp index 74c9eb28645..22af6ced64c 100644 --- a/src/devices/bus/crvision/slot.cpp +++ b/src/devices/bus/crvision/slot.cpp @@ -234,7 +234,7 @@ std::string crvision_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 size = core_fsize(m_file); + UINT32 size = m_file->size(); int type = CRV_4K; switch (size) diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index 75ba3961754..ca0cd2a579a 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -459,14 +459,14 @@ static MACHINE_CONFIG_FRAGMENT( grip ) MCFG_CPU_IO_MAP(grip_io) // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::white) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/devices/bus/gameboy/gb_slot.cpp b/src/devices/bus/gameboy/gb_slot.cpp index 55555a8d4b2..47236928fb7 100644 --- a/src/devices/bus/gameboy/gb_slot.cpp +++ b/src/devices/bus/gameboy/gb_slot.cpp @@ -605,11 +605,11 @@ std::string base_gb_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 len = core_fsize(m_file), offset = 0; + UINT32 len = m_file->size(), offset = 0; dynamic_buffer rom(len); int type; - core_fread(m_file, &rom[0], len); + m_file->read(&rom[0], len); if ((len % 0x4000) == 512) offset = 512; diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp index 217f3f9e954..10c5d45a0a8 100644 --- a/src/devices/bus/gba/gba_slot.cpp +++ b/src/devices/bus/gba/gba_slot.cpp @@ -405,11 +405,11 @@ std::string gba_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); dynamic_buffer rom(len); int type; - core_fread(m_file, &rom[0], len); + m_file->read(&rom[0], len); type = get_cart_type(&rom[0], len); slot_string = gba_get_slot(type); diff --git a/src/devices/bus/intv/slot.cpp b/src/devices/bus/intv/slot.cpp index 87f36e14bac..d502016fe76 100644 --- a/src/devices/bus/intv/slot.cpp +++ b/src/devices/bus/intv/slot.cpp @@ -464,11 +464,11 @@ std::string intv_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); dynamic_buffer rom(len); int type = INTV_STD; - core_fread(m_file, &rom[0], len); + m_file->read(&rom[0], len); if (rom[0] == 0xa8 && (rom[1] == (rom[2] ^ 0xff))) { diff --git a/src/devices/bus/isa/isa_cards.cpp b/src/devices/bus/isa/isa_cards.cpp index a9ab1b9dc8f..e2702a5598f 100644 --- a/src/devices/bus/isa/isa_cards.cpp +++ b/src/devices/bus/isa/isa_cards.cpp @@ -19,6 +19,7 @@ SLOT_INTERFACE_START( pc_isa8_cards ) SLOT_INTERFACE("aga_pc200", ISA8_AGA_PC200) SLOT_INTERFACE("ega", ISA8_EGA) SLOT_INTERFACE("pgc", ISA8_PGC) + SLOT_INTERFACE("vga", ISA8_VGA) SLOT_INTERFACE("svga_et4k", ISA8_SVGA_ET4K) SLOT_INTERFACE("num9rev",ISA8_NUM_9_REV) SLOT_INTERFACE("com", ISA8_COM) @@ -40,6 +41,7 @@ SLOT_INTERFACE_START( pc_isa8_cards ) SLOT_INTERFACE("sblaster1_0", ISA8_SOUND_BLASTER_1_0) SLOT_INTERFACE("sblaster1_5", ISA8_SOUND_BLASTER_1_5) SLOT_INTERFACE("stereo_fx", ISA8_STEREO_FX) + SLOT_INTERFACE("ssi2001", ISA8_SSI2001) SLOT_INTERFACE("mpu401", ISA8_MPU401) SLOT_INTERFACE("ne1000", NE1000) SLOT_INTERFACE("3c503", EL2_3C503) diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp index c3eb61bf0e8..15255f1f3e5 100644 --- a/src/devices/bus/isa/omti8621.cpp +++ b/src/devices/bus/isa/omti8621.cpp @@ -1370,7 +1370,7 @@ void omti_disk_image_device::device_start() { m_image = this; - if (m_image->image_core_file() == nullptr) + if (!m_image->is_open()) { LOG1(("device_start_omti_disk: no disk")); } diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp index 88a0272a9c1..5e044759603 100644 --- a/src/devices/bus/isa/sc499.cpp +++ b/src/devices/bus/isa/sc499.cpp @@ -344,7 +344,7 @@ void sc499_device::device_start() m_installed = false; - if (m_image->image_core_file() == nullptr) + if (!m_image->is_open()) { LOG2(("start sc499: no cartridge tape")); } diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp index a2674838914..f44e0597cd4 100644 --- a/src/devices/bus/megadrive/md_slot.cpp +++ b/src/devices/bus/megadrive/md_slot.cpp @@ -905,11 +905,11 @@ std::string base_md_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 len = core_fsize(m_file), offset = 0; + UINT32 len = m_file->size(), offset = 0; dynamic_buffer rom(len); int type; - core_fread(m_file, &rom[0], len); + m_file->read(&rom[0], len); if (genesis_is_SMD(&rom[0x200], len - 0x200)) offset = 0x200; diff --git a/src/devices/bus/msx_slot/cartridge.cpp b/src/devices/bus/msx_slot/cartridge.cpp index c24df3bf1fb..ae806337359 100644 --- a/src/devices/bus/msx_slot/cartridge.cpp +++ b/src/devices/bus/msx_slot/cartridge.cpp @@ -283,7 +283,7 @@ std::string msx_slot_cartridge_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string = "nomapper"; - UINT32 length = core_fsize(m_file); + UINT32 length = m_file->size(); dynamic_buffer rom(length); int type = NOMAPPER; @@ -328,7 +328,7 @@ std::string msx_slot_cartridge_device::get_default_card_software() if (type == NOMAPPER) { // Not identified through hashfile, try automatic detection - core_fread(m_file, &rom[0], length); + m_file->read(&rom[0], length); type = get_cart_type(&rom[0], length); } diff --git a/src/devices/bus/nes/aladdin.cpp b/src/devices/bus/nes/aladdin.cpp index bad863b9255..bded198c5a7 100644 --- a/src/devices/bus/nes/aladdin.cpp +++ b/src/devices/bus/nes/aladdin.cpp @@ -147,11 +147,11 @@ std::string nes_aladdin_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string = "algn"; - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); dynamic_buffer rom(len); UINT8 mapper; - core_fread(m_file, &rom[0], len); + m_file->read(&rom[0], len); mapper = (rom[6] & 0xf0) >> 4; mapper |= rom[7] & 0xf0; diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp index 05adca0f9ae..5eaf22852c9 100644 --- a/src/devices/bus/nes/nes_slot.cpp +++ b/src/devices/bus/nes/nes_slot.cpp @@ -917,10 +917,10 @@ std::string nes_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string = "nrom"; - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); dynamic_buffer rom(len); - core_fread(m_file, &rom[0], len); + m_file->read(&rom[0], len); if ((rom[0] == 'N') && (rom[1] == 'E') && (rom[2] == 'S')) slot_string = get_default_card_ines(&rom[0], len); diff --git a/src/devices/bus/odyssey2/slot.cpp b/src/devices/bus/odyssey2/slot.cpp index 0a6e35028b9..3d0f8714288 100644 --- a/src/devices/bus/odyssey2/slot.cpp +++ b/src/devices/bus/odyssey2/slot.cpp @@ -214,7 +214,7 @@ std::string o2_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 size = core_fsize(m_file); + UINT32 size = m_file->size(); int type = O2_STD; if (size == 12288) diff --git a/src/devices/bus/pce/pce_slot.cpp b/src/devices/bus/pce/pce_slot.cpp index 4fffa5172fc..6a1e5859f1f 100644 --- a/src/devices/bus/pce/pce_slot.cpp +++ b/src/devices/bus/pce/pce_slot.cpp @@ -344,11 +344,11 @@ std::string pce_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); dynamic_buffer rom(len); int type; - core_fread(m_file, &rom[0], len); + m_file->read(&rom[0], len); type = get_cart_type(&rom[0], len); slot_string = pce_get_slot(type); diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp index d0bd43d0020..e22f4041a73 100644 --- a/src/devices/bus/pet/hsg.cpp +++ b/src/devices/bus/pet/hsg.cpp @@ -87,12 +87,12 @@ ADDRESS_MAP_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm8000_hsg_a ) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 512-1) MCFG_SCREEN_REFRESH_RATE(25) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(EF9365_TAG, EF9365, 1750000) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) @@ -108,12 +108,12 @@ MACHINE_CONFIG_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm8000_hsg_b ) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_REFRESH_RATE(50) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(EF9366_TAG, EF9365, 1750000) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) diff --git a/src/devices/bus/scv/slot.cpp b/src/devices/bus/scv/slot.cpp index 15495afe918..daf31a27885 100644 --- a/src/devices/bus/scv/slot.cpp +++ b/src/devices/bus/scv/slot.cpp @@ -264,11 +264,11 @@ std::string scv_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); dynamic_buffer rom(len); int type; - core_fread(m_file, &rom[0], len); + m_file->read(&rom[0], len); type = get_cart_type(&rom[0], len); slot_string = scv_get_slot(type); diff --git a/src/devices/bus/sega8/sega8_slot.cpp b/src/devices/bus/sega8/sega8_slot.cpp index df3c59adc05..a3ebf09c463 100644 --- a/src/devices/bus/sega8/sega8_slot.cpp +++ b/src/devices/bus/sega8/sega8_slot.cpp @@ -608,11 +608,11 @@ std::string sega8_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 len = core_fsize(m_file), offset = 0; + UINT32 len = m_file->size(), offset = 0; dynamic_buffer rom(len); int type; - core_fread(m_file, &rom[0], len); + m_file->read(&rom[0], len); if ((len % 0x4000) == 512) offset = 512; diff --git a/src/devices/bus/snes/snes_slot.cpp b/src/devices/bus/snes/snes_slot.cpp index 65c2fffdb4d..38260a06e84 100644 --- a/src/devices/bus/snes/snes_slot.cpp +++ b/src/devices/bus/snes/snes_slot.cpp @@ -1007,11 +1007,11 @@ std::string base_sns_cart_slot_device::get_default_card_software() { const char *slot_string; UINT32 offset; - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); dynamic_buffer rom(len); int type = 0, addon = 0; - core_fread(m_file, &rom[0], len); + m_file->read(&rom[0], len); offset = snes_skip_header(&rom[0], len); diff --git a/src/devices/bus/vc4000/slot.cpp b/src/devices/bus/vc4000/slot.cpp index 0b67a264c34..ba75cd67267 100644 --- a/src/devices/bus/vc4000/slot.cpp +++ b/src/devices/bus/vc4000/slot.cpp @@ -240,7 +240,7 @@ std::string vc4000_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 size = core_fsize(m_file); + UINT32 size = m_file->size(); int type = VC4000_STD; // attempt to identify the non-standard types diff --git a/src/devices/bus/vcs/vcs_slot.cpp b/src/devices/bus/vcs/vcs_slot.cpp index b946c8051e7..b8b25b864d4 100755..100644 --- a/src/devices/bus/vcs/vcs_slot.cpp +++ b/src/devices/bus/vcs/vcs_slot.cpp @@ -786,11 +786,11 @@ std::string vcs_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 len = core_fsize(m_file); + UINT32 len = m_file->size(); dynamic_buffer rom(len); int type; - core_fread(m_file, &rom[0], len); + m_file->read(&rom[0], len); type = identify_cart_type(&rom[0], len); slot_string = vcs_get_slot(type); diff --git a/src/devices/bus/vectrex/slot.cpp b/src/devices/bus/vectrex/slot.cpp index 1a9bbed7d29..14e531b8cd2 100644 --- a/src/devices/bus/vectrex/slot.cpp +++ b/src/devices/bus/vectrex/slot.cpp @@ -222,11 +222,11 @@ std::string vectrex_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 size = core_fsize(m_file); + UINT32 size = m_file->size(); dynamic_buffer rom(size); int type = VECTREX_STD; - core_fread(m_file, &rom[0], size); + m_file->read(&rom[0], size); if (!memcmp(&rom[0x06], "SRAM", 4)) type = VECTREX_SRAM; diff --git a/src/devices/bus/vic10/exp.cpp b/src/devices/bus/vic10/exp.cpp index 1aa6f2e6363..76c55ff7d79 100644 --- a/src/devices/bus/vic10/exp.cpp +++ b/src/devices/bus/vic10/exp.cpp @@ -139,7 +139,7 @@ bool vic10_expansion_slot_device::call_load() int exrom = 1; int game = 1; - if (cbm_crt_read_header(m_file, &roml_size, &romh_size, &exrom, &game)) + if (cbm_crt_read_header(*m_file, &roml_size, &romh_size, &exrom, &game)) { UINT8 *roml = nullptr; UINT8 *romh = nullptr; @@ -150,7 +150,7 @@ bool vic10_expansion_slot_device::call_load() if (roml_size) roml = m_card->m_lorom; if (romh_size) romh = m_card->m_lorom; - cbm_crt_read_data(m_file, roml, romh); + cbm_crt_read_data(*m_file, roml, romh); } } } @@ -187,7 +187,7 @@ std::string vic10_expansion_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { if (!core_stricmp(filetype(), "crt")) - return cbm_crt_get_card(m_file); + return cbm_crt_get_card(*m_file); clear(); } diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp index efadfc332dc..519758ba12a 100644 --- a/src/devices/bus/wangpc/tig.cpp +++ b/src/devices/bus/wangpc/tig.cpp @@ -110,14 +110,14 @@ UPD7220_DISPLAY_PIXELS_MEMBER( wangpc_tig_device::hgdc_display_pixels ) //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( wangpc_tig ) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, wangpc_tig_device, screen_update) MCFG_SCREEN_SIZE(80*10, 25*12) MCFG_SCREEN_VISIBLE_AREA(0, 80*10-1, 0, 25*12-1) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_REFRESH_RATE(60) - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") MCFG_DEVICE_ADD(UPD7720_0_TAG, UPD7220, XTAL_52_832MHz/28) MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_0_map) diff --git a/src/devices/bus/wswan/slot.cpp b/src/devices/bus/wswan/slot.cpp index b5b95851f00..256487bc8e1 100644 --- a/src/devices/bus/wswan/slot.cpp +++ b/src/devices/bus/wswan/slot.cpp @@ -311,12 +311,12 @@ std::string ws_cart_slot_device::get_default_card_software() if (open_image_file(mconfig().options())) { const char *slot_string; - UINT32 size = core_fsize(m_file); + UINT32 size = m_file->size(); dynamic_buffer rom(size); int type; UINT32 nvram; - core_fread(m_file, &rom[0], size); + m_file->read(&rom[0], size); // nvram size is not really used here, but we set it up nevertheless type = get_cart_type(&rom[0], size, nvram); |