some astring to std::string conversion (nw)

This commit is contained in:
Miodrag Milanovic 2015-04-18 18:35:04 +02:00
parent 6a41d76a80
commit 59bb9d4fd6
151 changed files with 250 additions and 249 deletions

View File

@ -490,7 +490,7 @@ void address_map::uplift_submaps(running_machine &machine, device_t &device, dev
{
if (entry->m_read.m_type == AMH_DEVICE_SUBMAP)
{
astring tag;
std::string tag;
owner.subtag(tag, entry->m_read.m_tag);
device_t *mapdevice = machine.device(tag.c_str());
if (mapdevice == NULL) {

View File

@ -78,7 +78,7 @@ void a1bus_cassette_device::device_start()
{
set_a1bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, CASSETTE_ROM_REGION).c_str())->base();
install_device(0xc000, 0xc0ff, read8_delegate(FUNC(a1bus_cassette_device::cassette_r), this), write8_delegate(FUNC(a1bus_cassette_device::cassette_w), this));

View File

@ -73,7 +73,7 @@ void a1bus_cffa_device::device_start()
{
set_a1bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, CFFA_ROM_REGION).c_str())->base();
install_device(0xafe0, 0xafff, read8_delegate(FUNC(a1bus_cffa_device::cffa_r), this), write8_delegate(FUNC(a1bus_cffa_device::cffa_w), this));

View File

@ -97,7 +97,7 @@ void a2bus_applicard_device::device_start()
set_a2bus_device();
// locate Z80 ROM
astring tempstring;
std::string tempstring;
m_z80rom = device().machine().root_device().memregion(this->subtag(tempstring, Z80_ROM_REGION).c_str())->base();
save_item(NAME(m_bROMAtZ80Zero));

View File

@ -109,7 +109,7 @@ void a2bus_cffa2000_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, CFFA2_ROM_REGION).c_str())->base();
// patch default setting so slave device is enabled and up to 13 devices on both connectors

View File

@ -122,7 +122,7 @@ void a2bus_corvus_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, CORVUS_ROM_REGION).c_str())->base();
}

View File

@ -114,7 +114,7 @@ void a2bus_floppy_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, DISKII_ROM_REGION).c_str())->base();
}

View File

@ -84,7 +84,7 @@ void a2bus_diskiing_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, DISKII_ROM_REGION).c_str())->base();
}

View File

@ -136,7 +136,7 @@ void a2bus_hsscsi_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, SCSI_ROM_REGION).c_str())->base();
memset(m_ram, 0, 8192);

View File

@ -102,7 +102,7 @@ void a2bus_memexp_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, MEMEXP_ROM_REGION).c_str())->base();
memset(m_ram, 0xff, 1024*1024*sizeof(UINT8));

View File

@ -127,7 +127,7 @@ void a2bus_pic_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, PIC_ROM_REGION).c_str())->base();
m_timer = timer_alloc(0, NULL);

View File

@ -129,7 +129,7 @@ void a2bus_scsi_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, SCSI_ROM_REGION).c_str())->base();
memset(m_ram, 0, 8192);

View File

@ -154,7 +154,7 @@ void a2bus_ssc_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, SSC_ROM_REGION).c_str())->base();
}

View File

@ -64,7 +64,7 @@ void a2bus_swyft_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, SWYFT_ROM_REGION).c_str())->base();
save_item(NAME(m_rombank));

View File

@ -97,7 +97,7 @@ void a2bus_thunderclock_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, THUNDERCLOCK_ROM_REGION).c_str())->base();
save_item(NAME(m_dataout));

View File

@ -162,10 +162,10 @@ void a2bus_videx160_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, ULTRATERM_ROM_REGION).c_str())->base();
astring tempstring2;
std::string tempstring2;
m_chrrom = device().machine().root_device().memregion(this->subtag(tempstring2, ULTRATERM_GFX_REGION).c_str())->base();
memset(m_ram, 0, 256*16);

View File

@ -217,10 +217,10 @@ void a2bus_videx80_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, VIDEOTERM_ROM_REGION).c_str())->base();
astring tempstring2;
std::string tempstring2;
m_chrrom = device().machine().root_device().memregion(this->subtag(tempstring2, VIDEOTERM_GFX_REGION).c_str())->base();
memset(m_ram, 0, 4*512);

View File

@ -138,7 +138,7 @@ void a2bus_vulcanbase_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, VULCAN_ROM_REGION).c_str())->base();
save_item(NAME(m_lastdata));

View File

@ -88,7 +88,7 @@ void a2bus_zipdrivebase_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, ZIPDRIVE_ROM_REGION).c_str())->base();
save_item(NAME(m_lastdata));

View File

@ -139,7 +139,7 @@ void a2bus_corvfdc01_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, FDC01_ROM_REGION).c_str())->base();
save_item(NAME(m_fdc_local_status));

View File

@ -35,6 +35,7 @@ static SLOT_INTERFACE_START( corv_floppies )
SLOT_INTERFACE( "525dsqd", FLOPPY_525_QD )
SLOT_INTERFACE_END
MACHINE_CONFIG_FRAGMENT( fdc02 )
MCFG_UPD765A_ADD(FDC02_FDC_TAG, true, false)
MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(a2bus_corvfdc02_device, intrq_w))
@ -108,7 +109,7 @@ void a2bus_corvfdc02_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, FDC02_ROM_REGION).c_str())->base();
m_timer = timer_alloc(0);

View File

@ -205,7 +205,7 @@ void a2bus_mouse_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, MOUSE_ROM_REGION).c_str())->base();
// allocate two timers: one for the 68705, one for the quadrature magic

View File

@ -148,7 +148,7 @@ void a2bus_timemasterho_device::device_start()
// set_a2bus_device makes m_slot valid
set_a2bus_device();
astring tempstring;
std::string tempstring;
m_rom = device().machine().root_device().memregion(this->subtag(tempstring, TIMEMASTER_ROM_REGION).c_str())->base();
}

View File

@ -530,7 +530,7 @@ int a78_cart_slot_device::verify_header(char *header)
get default card software
-------------------------------------------------*/
void a78_cart_slot_device::get_default_card_software(astring &result)
void a78_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -588,7 +588,7 @@ void a78_cart_slot_device::get_default_card_software(astring &result)
clear();
result.cpy(slot_string);
result.assign(slot_string);
}
else
software_get_default_slot(result, "a78_rom");

View File

@ -114,7 +114,7 @@ public:
virtual device_image_partialhash_func get_partial_hash() const { return &a78_partialhash; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_04xx);

View File

@ -408,7 +408,7 @@ int a800_cart_slot_device::identify_cart_type(UINT8 *header)
get default card software
-------------------------------------------------*/
void a800_cart_slot_device::get_default_card_software(astring &result)
void a800_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -438,14 +438,14 @@ void a800_cart_slot_device::get_default_card_software(astring &result)
clear();
result.cpy(slot_string);
result.assign(slot_string);
}
else
software_get_default_slot(result, "a800_8k");
}
void a5200_cart_slot_device::get_default_card_software(astring &result)
void a5200_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -471,14 +471,14 @@ void a5200_cart_slot_device::get_default_card_software(astring &result)
clear();
result.cpy(slot_string);
result.assign(slot_string);
}
else
software_get_default_slot(result, "a5200");
}
void xegs_cart_slot_device::get_default_card_software(astring &result)
void xegs_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -506,7 +506,7 @@ void xegs_cart_slot_device::get_default_card_software(astring &result)
clear();
result.cpy(slot_string);
result.assign(slot_string);
}
else
software_get_default_slot(result, "xegs");

View File

@ -113,7 +113,7 @@ public:
virtual const char *file_extensions() const { return "bin,rom,car"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_80xx);
@ -142,7 +142,7 @@ public:
virtual const char *file_extensions() const { return "bin,rom,car,a52"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
};
// ======================> xegs_cart_slot_device
@ -157,7 +157,7 @@ public:
virtual const char *file_extensions() const { return "bin,rom,car"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
};
// device type definition

View File

@ -127,7 +127,7 @@ bool adam_expansion_slot_device::call_softlist_load(software_list_device &swlist
// get_default_card_software -
//-------------------------------------------------
void adam_expansion_slot_device::get_default_card_software(astring &result)
void adam_expansion_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "standard");
}

View File

@ -90,7 +90,7 @@ protected:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
devcb_write_line m_write_irq;

View File

@ -223,7 +223,7 @@ bool apf_cart_slot_device::call_softlist_load(software_list_device &swlist, cons
get default card software
-------------------------------------------------*/
void apf_cart_slot_device::get_default_card_software(astring &result)
void apf_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -242,7 +242,7 @@ void apf_cart_slot_device::get_default_card_software(astring &result)
//printf("type: %s\n", slot_string);
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}

View File

@ -84,7 +84,7 @@ public:
virtual const char *file_extensions() const { return "bin"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);

View File

@ -232,7 +232,7 @@ bool arcadia_cart_slot_device::call_softlist_load(software_list_device &swlist,
get default card software
-------------------------------------------------*/
void arcadia_cart_slot_device::get_default_card_software(astring &result)
void arcadia_cart_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "std");
}

View File

@ -73,7 +73,7 @@ public:
virtual const char *file_extensions() const { return "bin"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);

View File

@ -200,7 +200,7 @@ bool astrocade_cart_slot_device::call_softlist_load(software_list_device &swlist
get default card software
-------------------------------------------------*/
void astrocade_cart_slot_device::get_default_card_software(astring &result)
void astrocade_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -218,7 +218,7 @@ void astrocade_cart_slot_device::get_default_card_software(astring &result)
//printf("type: %s\n", slot_string);
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}

View File

@ -74,7 +74,7 @@ public:
virtual const char *file_extensions() const { return "bin"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);

View File

@ -220,7 +220,7 @@ bool c64_expansion_slot_device::call_softlist_load(software_list_device &swlist,
// get_default_card_software -
//-------------------------------------------------
void c64_expansion_slot_device::get_default_card_software(astring &result)
void c64_expansion_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{

View File

@ -152,7 +152,7 @@ protected:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
devcb_read8 m_read_dma_cd;
devcb_write8 m_write_dma_cd;

View File

@ -158,7 +158,7 @@ bool cbm2_expansion_slot_device::call_softlist_load(software_list_device &swlist
// get_default_card_software -
//-------------------------------------------------
void cbm2_expansion_slot_device::get_default_card_software(astring &result)
void cbm2_expansion_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "standard");
}

View File

@ -99,7 +99,7 @@ protected:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
device_cbm2_expansion_card_interface *m_card;
};

View File

@ -219,7 +219,7 @@ bool channelf_cart_slot_device::call_softlist_load(software_list_device &swlist,
get default card software
-------------------------------------------------*/
void channelf_cart_slot_device::get_default_card_software(astring &result)
void channelf_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -237,7 +237,7 @@ void channelf_cart_slot_device::get_default_card_software(astring &result)
//printf("type: %s\n", slot_string);
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}
software_get_default_slot(result, "chess");

View File

@ -87,7 +87,7 @@ public:
virtual const char *file_extensions() const { return "bin,chf"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);

View File

@ -362,7 +362,7 @@ bool cococart_slot_device::call_softlist_load(software_list_device &swlist, cons
// get_default_card_software
//-------------------------------------------------
void cococart_slot_device::get_default_card_software(astring &result)
void cococart_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "pak");
}

View File

@ -100,7 +100,7 @@ public:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing to $FF40-$FF7F
DECLARE_READ8_MEMBER(read);

View File

@ -115,7 +115,7 @@ bool colecovision_cartridge_slot_device::call_softlist_load(software_list_device
// get_default_card_software -
//-------------------------------------------------
void colecovision_cartridge_slot_device::get_default_card_software(astring &result)
void colecovision_cartridge_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "standard");
}

View File

@ -96,7 +96,7 @@ protected:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
device_colecovision_cartridge_interface *m_card;
};

View File

@ -231,7 +231,7 @@ bool crvision_cart_slot_device::call_softlist_load(software_list_device &swlist,
get default card software
-------------------------------------------------*/
void crvision_cart_slot_device::get_default_card_software(astring &result)
void crvision_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -269,7 +269,7 @@ void crvision_cart_slot_device::get_default_card_software(astring &result)
//printf("type: %s\n", slot_string);
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}

View File

@ -78,7 +78,7 @@ public:
virtual const char *file_extensions() const { return "bin,rom"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom40);

View File

@ -600,7 +600,7 @@ int base_gb_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
get default card software
-------------------------------------------------*/
void base_gb_cart_slot_device::get_default_card_software(astring &result)
void base_gb_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -623,7 +623,7 @@ void base_gb_cart_slot_device::get_default_card_software(astring &result)
//printf("type: %s\n", slot_string);
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}
@ -631,11 +631,11 @@ void base_gb_cart_slot_device::get_default_card_software(astring &result)
}
void megaduck_cart_slot_device::get_default_card_software(astring &result)
void megaduck_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
result.cpy("rom");
result.assign("rom");
return;
}

View File

@ -139,7 +139,7 @@ public:
virtual const char *file_extensions() const { return "bin,gb,gbc"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
@ -180,7 +180,7 @@ public:
virtual const char *file_extensions() const { return "bin"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
};

View File

@ -399,7 +399,7 @@ int gba_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
get default card software
-------------------------------------------------*/
void gba_cart_slot_device::get_default_card_software(astring &result)
void gba_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -416,7 +416,7 @@ void gba_cart_slot_device::get_default_card_software(astring &result)
//printf("type: %s\n", slot_string);
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}

View File

@ -90,7 +90,7 @@ public:
virtual const char *file_extensions() const { return "gba,bin"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ32_MEMBER(read_rom);

View File

@ -181,7 +181,7 @@ bool generic_slot_device::call_softlist_load(software_list_device &swlist, const
get default card software
-------------------------------------------------*/
void generic_slot_device::get_default_card_software(astring &result)
void generic_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, m_default_card);
}

View File

@ -124,7 +124,7 @@ public:
virtual const char *file_extensions() const { return m_extensions; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);

View File

@ -459,7 +459,7 @@ bool intv_cart_slot_device::call_softlist_load(software_list_device &swlist, con
get default card software
-------------------------------------------------*/
void intv_cart_slot_device::get_default_card_software(astring &result)
void intv_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -503,7 +503,7 @@ void intv_cart_slot_device::get_default_card_software(astring &result)
//printf("type: %s\n", slot_string);
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}
software_get_default_slot(result, "intv_rom");

View File

@ -118,7 +118,7 @@ public:
virtual const char *file_extensions() const { return "bin,int,rom,itv"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_rom04) { if (m_cart) return m_cart->read_rom04(space, offset, mem_mask); else return 0xffff; }

View File

@ -204,7 +204,7 @@ bool iq151cart_slot_device::call_softlist_load(software_list_device &swlist, con
get default card software
-------------------------------------------------*/
void iq151cart_slot_device::get_default_card_software(astring &result)
void iq151cart_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "basic6");
}

View File

@ -106,7 +106,7 @@ public:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual void read(offs_t offset, UINT8 &data);

View File

@ -362,7 +362,7 @@ void isa8_cga_device::device_start()
}
}
astring tempstring;
std::string tempstring;
m_chr_gen_base = memregion(subtag(tempstring, "gfx1").c_str())->base();
m_chr_gen = m_chr_gen_base + m_chr_gen_offset[1];

View File

@ -593,7 +593,7 @@ void isa8_ega_device::device_start()
if (m_palette != NULL && !m_palette->started())
throw device_missing_dependencies();
astring tempstring;
std::string tempstring;
set_isa_device();

View File

@ -257,7 +257,7 @@ void isa8_hdc_device::device_reset()
hard_disk_file *isa8_hdc_device::pc_hdc_file(int id)
{
harddisk_image_device *img = NULL;
astring tempstring;
std::string tempstring;
switch( id )
{
case 0:

View File

@ -329,7 +329,7 @@ void isa8_device::unmap_bank(offs_t start, offs_t end, offs_t mask, offs_t mirro
void isa8_device::install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, const char *region)
{
astring tempstring;
std::string tempstring;
if (machine().root_device().memregion("isa")) {
UINT8 *src = dev->memregion(region)->base();
UINT8 *dest = machine().root_device().memregion("isa")->base() + start - 0xc0000;

View File

@ -195,7 +195,7 @@ void isa8_mda_device::device_reset()
m_hsync = 0;
m_pixel = 0;
astring tempstring;
std::string tempstring;
m_chr_gen = memregion(subtag(tempstring, "gfx1").c_str())->base();
}
@ -612,7 +612,7 @@ void isa8_hercules_device::device_reset()
isa8_mda_device::device_reset();
m_configuration_switch = 0;
astring tempstring;
std::string tempstring;
m_chr_gen = memregion(subtag(tempstring, "gfx1").c_str())->base();
}

View File

@ -85,7 +85,7 @@ void isa8_pc1640_iga_device::device_start()
if (m_palette != NULL && !m_palette->started())
throw device_missing_dependencies();
astring tempstring;
std::string tempstring;
set_isa_device();

View File

@ -370,7 +370,7 @@ bool kccart_slot_device::call_softlist_load(software_list_device &swlist, const
get default card software
-------------------------------------------------*/
void kccart_slot_device::get_default_card_software(astring &result)
void kccart_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "standard");
}

View File

@ -104,7 +104,7 @@ public:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
};
// device type definition

View File

@ -187,7 +187,7 @@ void device_macpds_card_interface::install_bank(offs_t start, offs_t end, offs_t
void device_macpds_card_interface::install_rom(device_t *dev, const char *romregion, UINT32 addr)
{
astring tempstring;
std::string tempstring;
UINT8 *rom = device().machine().root_device().memregion(dev->subtag(tempstring, romregion).c_str())->base();
UINT32 romlen = device().machine().root_device().memregion(dev->subtag(tempstring, romregion).c_str())->bytes();
char bankname[128];

View File

@ -900,7 +900,7 @@ int base_md_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
get default card software
-------------------------------------------------*/
void base_md_cart_slot_device::get_default_card_software(astring &result)
void base_md_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -919,7 +919,7 @@ void base_md_cart_slot_device::get_default_card_software(astring &result)
clear();
result.cpy(slot_string);
result.assign(slot_string);
}
else
software_get_default_slot(result, "rom");

View File

@ -159,7 +159,7 @@ public:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
int get_type() { return m_type; }

View File

@ -276,7 +276,7 @@ int msx_slot_cartridge_device::get_cart_type(UINT8 *rom, UINT32 length)
}
void msx_slot_cartridge_device::get_default_card_software(astring &result)
void msx_slot_cartridge_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -334,7 +334,7 @@ void msx_slot_cartridge_device::get_default_card_software(astring &result)
slot_string = msx_cart_get_slot_option(type);
}
result.cpy(slot_string);
result.assign(slot_string);
return;
}
software_get_default_slot(result, "nomapper");

View File

@ -53,7 +53,7 @@ public:
virtual const char *file_extensions() const { return "mx1,bin,rom"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// msx_internal_slot-level overrides
virtual DECLARE_READ8_MEMBER(read);

View File

@ -202,7 +202,7 @@ bool neogeo_cart_slot_device::call_softlist_load(software_list_device &swlist, c
get default card software
-------------------------------------------------*/
void neogeo_cart_slot_device::get_default_card_software(astring &result)
void neogeo_cart_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "rom");
}

View File

@ -39,7 +39,7 @@ public:
virtual const char *file_extensions() const { return "bin"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ16_MEMBER(read_rom);

View File

@ -141,7 +141,7 @@ bool nes_aladdin_slot_device::call_softlist_load(software_list_device &swlist, c
return TRUE;
}
void nes_aladdin_slot_device::get_default_card_software(astring &result)
void nes_aladdin_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -162,7 +162,7 @@ void nes_aladdin_slot_device::get_default_card_software(astring &result)
clear();
result.cpy(slot_string);
result.assign(slot_string);
}
else
software_get_default_slot(result, "algn");

View File

@ -63,7 +63,7 @@ public:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
virtual DECLARE_READ8_MEMBER(read);
void write_prg(UINT32 offset, UINT8 data) { if (m_cart) m_cart->write_prg(offset, data); }

View File

@ -144,7 +144,7 @@ bool nes_datach_slot_device::call_softlist_load(software_list_device &swlist, co
return TRUE;
}
void nes_datach_slot_device::get_default_card_software(astring &result)
void nes_datach_slot_device::get_default_card_software(std::string &result)
{
// any way to detect the game with X24C01?
software_get_default_slot(result, "datach_rom");

View File

@ -65,7 +65,7 @@ public:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
virtual DECLARE_READ8_MEMBER(read);
void write_prg_bank(UINT8 bank) { if (m_cart) m_cart->write_prg_bank(bank); }

View File

@ -133,7 +133,7 @@ bool nes_kstudio_slot_device::call_softlist_load(software_list_device &swlist, c
return TRUE;
}
void nes_kstudio_slot_device::get_default_card_software(astring &result)
void nes_kstudio_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "ks_exp");
}

View File

@ -62,7 +62,7 @@ public:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
virtual DECLARE_READ8_MEMBER(read);
void write_prg_bank(UINT8 bank) { if (m_cart) m_cart->write_prg_bank(bank); }

View File

@ -912,7 +912,7 @@ bool nes_cart_slot_device::call_softlist_load(software_list_device &swlist, cons
get default card software
-------------------------------------------------*/
void nes_cart_slot_device::get_default_card_software(astring &result)
void nes_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -930,7 +930,7 @@ void nes_cart_slot_device::get_default_card_software(astring &result)
clear();
result.cpy(slot_string);
result.assign(slot_string);
}
else
software_get_default_slot(result, "nrom");

View File

@ -361,7 +361,7 @@ public:
virtual device_image_partialhash_func get_partial_hash() const { return &nes_partialhash; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
const char * get_default_card_ines(UINT8 *ROM, UINT32 len);
const char * get_default_card_unif(UINT8 *ROM, UINT32 len);
const char * nes_get_slot(int pcb_id);

View File

@ -112,7 +112,7 @@ bool nes_ntb_slot_device::call_softlist_load(software_list_device &swlist, const
return TRUE;
}
void nes_ntb_slot_device::get_default_card_software(astring &result)
void nes_ntb_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "ntbrom");
}

View File

@ -59,7 +59,7 @@ public:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
virtual DECLARE_READ8_MEMBER(read);

View File

@ -325,7 +325,7 @@ void device_nubus_card_interface::install_declaration_rom(device_t *dev, const c
{
bool inverted = false;
astring tempstring;
std::string tempstring;
UINT8 *rom = device().machine().root_device().memregion(dev->subtag(tempstring, romregion).c_str())->base();
UINT32 romlen = device().machine().root_device().memregion(dev->subtag(tempstring, romregion).c_str())->bytes();

View File

@ -211,7 +211,7 @@ bool o2_cart_slot_device::call_softlist_load(software_list_device &swlist, const
get default card software
-------------------------------------------------*/
void o2_cart_slot_device::get_default_card_software(astring &result)
void o2_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -229,7 +229,7 @@ void o2_cart_slot_device::get_default_card_software(astring &result)
//printf("type: %s\n", slot_string);
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}

View File

@ -84,7 +84,7 @@ public:
virtual const char *file_extensions() const { return "bin,rom"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom04);

View File

@ -53,7 +53,7 @@ jasmin_device::~jasmin_device()
void jasmin_device::device_start()
{
oricext_device::device_start();
astring tempstring;
std::string tempstring;
jasmin_rom = device().machine().root_device().memregion(this->subtag(tempstring, "jasmin").c_str())->base();
cpu->space(AS_PROGRAM).install_device(0x0000, 0xffff, *this, &jasmin_device::map);

View File

@ -48,7 +48,7 @@ microdisc_device::~microdisc_device()
void microdisc_device::device_start()
{
oricext_device::device_start();
astring tempstring;
std::string tempstring;
microdisc_rom = device().machine().root_device().memregion(this->subtag(tempstring, "microdisc").c_str())->base();
cpu->space(AS_PROGRAM).install_device(0x0000, 0xffff, *this, &microdisc_device::map);

View File

@ -339,7 +339,7 @@ int pce_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
get default card software
-------------------------------------------------*/
void pce_cart_slot_device::get_default_card_software(astring &result)
void pce_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -356,7 +356,7 @@ void pce_cart_slot_device::get_default_card_software(astring &result)
//printf("type: %s\n", slot_string);
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}

View File

@ -87,7 +87,7 @@ public:
virtual const char *file_extensions() const { return "pce,bin"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);

View File

@ -160,7 +160,7 @@ bool plus4_expansion_slot_device::call_softlist_load(software_list_device &swlis
// get_default_card_software -
//-------------------------------------------------
void plus4_expansion_slot_device::get_default_card_software(astring &result)
void plus4_expansion_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "standard");
}

View File

@ -138,7 +138,7 @@ protected:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
devcb_write_line m_write_irq;
devcb_read8 m_read_dma_cd;

View File

@ -117,7 +117,7 @@ bool ql_rom_cartridge_slot_t::call_softlist_load(software_list_device &swlist, c
// get_default_card_software -
//-------------------------------------------------
void ql_rom_cartridge_slot_t::get_default_card_software(astring &result)
void ql_rom_cartridge_slot_t::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "standard");
}

View File

@ -113,7 +113,7 @@ protected:
virtual const option_guide *create_option_guide() const { return NULL; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
device_ql_rom_cartridge_card_interface *m_card;
};

View File

@ -219,7 +219,7 @@ bool sat_cart_slot_device::call_softlist_load(software_list_device &swlist, cons
get default card software
-------------------------------------------------*/
void sat_cart_slot_device::get_default_card_software(astring &result)
void sat_cart_slot_device::get_default_card_software(std::string &result)
{
software_get_default_slot(result, "rom");
}

View File

@ -87,7 +87,7 @@ public:
virtual const char *file_extensions() const { return "bin"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ32_MEMBER(read_rom);

View File

@ -261,7 +261,7 @@ int scv_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
get default card software
-------------------------------------------------*/
void scv_cart_slot_device::get_default_card_software(astring &result)
void scv_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -278,7 +278,7 @@ void scv_cart_slot_device::get_default_card_software(astring &result)
//printf("type: %s\n", slot_string);
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}

View File

@ -88,7 +88,7 @@ public:
virtual const char *file_extensions() const { return "bin"; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);

View File

@ -603,7 +603,7 @@ int sega8_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len)
get default card software
-------------------------------------------------*/
void sega8_cart_slot_device::get_default_card_software(astring &result)
void sega8_cart_slot_device::get_default_card_software(std::string &result)
{
if (open_image_file(mconfig().options()))
{
@ -623,7 +623,7 @@ void sega8_cart_slot_device::get_default_card_software(astring &result)
//printf("type: %s\n", slot_string);
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}

View File

@ -138,7 +138,7 @@ public:
virtual const char *file_extensions() const { return m_extensions; }
// slot interface overrides
virtual void get_default_card_software(astring &result);
virtual void get_default_card_software(std::string &result);
// reading and writing
virtual DECLARE_READ8_MEMBER(read_cart);

View File

@ -999,7 +999,7 @@ void base_sns_cart_slot_device::get_cart_type_addon(UINT8 *ROM, UINT32 len, int
get default card software
-------------------------------------------------*/
void base_sns_cart_slot_device::get_default_card_software(astring &result)
void base_sns_cart_slot_device::get_default_card_software(std::string &result)
{
bool fullpath = open_image_file(mconfig().options());
@ -1058,7 +1058,7 @@ void base_sns_cart_slot_device::get_default_card_software(astring &result)
clear();
result.cpy(slot_string);
result.assign(slot_string);
return;
}

Some files were not shown because too many files have changed in this diff Show More