few more changes (nw)

This commit is contained in:
Miodrag Milanovic 2015-04-13 13:31:25 +02:00
parent 2edee0b811
commit 996880022f
16 changed files with 52 additions and 52 deletions

View File

@ -86,18 +86,18 @@ const rom_entry *macpds_sedisplay_device::device_rom_region() const
macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS_SEDISPLAY, "Radius SE Full Page Display", tag, owner, clock, "pds_sefp", __FILE__),
device_video_interface(mconfig, *this),
device_macpds_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", SEDISPLAY_SCREEN_NAME)
device_macpds_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(SEDISPLAY_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
macpds_sedisplay_device::macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_macpds_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", SEDISPLAY_SCREEN_NAME)
device_macpds_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(SEDISPLAY_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -77,9 +77,9 @@ const rom_entry *nubus_824gc_device::device_rom_region() const
jmfb_device::jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", GC48_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(GC48_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -66,18 +66,18 @@ const rom_entry *nubus_m2hires_device::device_rom_region() const
nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_M2HIRES, "Macintosh II Hi-Resolution video card", tag, owner, clock, "nb_m2hr", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", M2HIRES_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(M2HIRES_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
nubus_m2hires_device::nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", M2HIRES_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(M2HIRES_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -67,18 +67,18 @@ const rom_entry *nubus_m2video_device::device_rom_region() const
nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_M2VIDEO, "Macintosh II Video Card", tag, owner, clock, "nb_m2vc", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", M2VIDEO_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(M2VIDEO_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
nubus_m2video_device::nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", M2VIDEO_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(M2VIDEO_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -66,18 +66,18 @@ const rom_entry *nubus_radiustpd_device::device_rom_region() const
nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_RADIUSTPD, "Radius Two Page Display video card", tag, owner, clock, "nb_rtpd", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", RADIUSTPD_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(RADIUSTPD_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
nubus_radiustpd_device::nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", RADIUSTPD_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(RADIUSTPD_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -68,18 +68,18 @@ const rom_entry *nubus_spec8s3_device::device_rom_region() const
nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_SPEC8S3, "SuperMac Spectrum/8 Series III video card", tag, owner, clock, "nb_sp8s3", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", SPEC8S3_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(SPEC8S3_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
nubus_spec8s3_device::nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", SPEC8S3_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(SPEC8S3_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -83,10 +83,10 @@ const rom_entry *nubus_specpdq_device::device_rom_region() const
nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_SPECPDQ, "SuperMac Spectrum PDQ video card", tag, owner, clock, "nb_spdq", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", SPECPDQ_SCREEN_NAME),
device_nubus_card_interface(mconfig, *this),
m_palette(*this, "palette")
{
m_assembled_tag = astring(tag).cat(":").cat(SPECPDQ_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
@ -94,9 +94,9 @@ nubus_specpdq_device::nubus_specpdq_device(const machine_config &mconfig, device
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", SPECPDQ_SCREEN_NAME),
m_palette(*this, "palette")
{
m_assembled_tag = astring(tag).cat(":").cat(SPECPDQ_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -69,18 +69,18 @@ const rom_entry *nubus_wsportrait_device::device_rom_region() const
nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, NUBUS_WSPORTRAIT, "Macintosh II Portrait Video Card", tag, owner, clock, "nb_wspt", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", WSPORTRAIT_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(WSPORTRAIT_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
nubus_wsportrait_device::nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", WSPORTRAIT_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(WSPORTRAIT_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -69,18 +69,18 @@ const rom_entry *nubus_xceed30hr_device::device_rom_region() const
nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_XCEED30HR, "Micron/XCEED Technology Color 30HR", tag, owner, clock, "pd3_30hr", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", XCEED30HR_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(XCEED30HR_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
nubus_xceed30hr_device::nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", XCEED30HR_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(XCEED30HR_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -62,18 +62,18 @@ const rom_entry *nubus_cb264se30_device::device_rom_region() const
nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_CB264SE30, "RasterOps Colorboard 264/SE30", tag, owner, clock, "pd3_c264", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", CB264SE30_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(CB264SE30_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
nubus_cb264se30_device::nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", CB264SE30_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(CB264SE30_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -65,18 +65,18 @@ const rom_entry *nubus_xceedmc30_device::device_rom_region() const
nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_XCEEDMC30, "Micron/XCEED Technology MacroColor 30", tag, owner, clock, "pd3_mclr", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", XCEEDMC30_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(XCEEDMC30_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
nubus_xceedmc30_device::nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", XCEEDMC30_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(XCEEDMC30_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -68,18 +68,18 @@ const rom_entry *nubus_procolor816_device::device_rom_region() const
nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_PROCOLOR816, "Lapis ProColor Server 8*16", tag, owner, clock, "pd3_pc16", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", PROCOLOR816_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(PROCOLOR816_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
nubus_procolor816_device::nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", PROCOLOR816_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(PROCOLOR816_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -62,18 +62,18 @@ const rom_entry *nubus_lview_device::device_rom_region() const
nubus_lview_device::nubus_lview_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PDS030_LVIEW, "Sigma Designs L-View", tag, owner, clock, "pd3_lviw", __FILE__),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", LVIEW_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(LVIEW_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}
nubus_lview_device::nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_video_interface(mconfig, *this),
device_nubus_card_interface(mconfig, *this),
m_assembled_tag(tag, ":", LVIEW_SCREEN_NAME)
device_nubus_card_interface(mconfig, *this)
{
m_assembled_tag = astring(tag).cat(":").cat(LVIEW_SCREEN_NAME);
m_screen_tag = m_assembled_tag.c_str();
}

View File

@ -796,7 +796,7 @@ void base_sns_cart_slot_device::setup_addon_from_fullpath()
// otherwise, we need to use the legacy versions including DSP dump in device romset
if (!m_cart->get_addon_bios_size())
{
astring region(m_cart->device().tag(), ":addon");
astring region = astring(m_cart->device().tag()).cat(":addon");
UINT8 *ROM = NULL;
switch (m_addon)

View File

@ -2285,7 +2285,7 @@ rpk_socket* rpk_reader::load_ram_resource(emu_options &options, xml_data_node* r
global_free_array(contents);
throw rpk_exception(RPK_INVALID_RAM_SPEC, "<ram type='persistent'> must have a 'file' attribute");
}
astring ram_pathname(system_name, PATH_SEPARATOR, ram_filename);
astring ram_pathname = astring(system_name).cat(PATH_SEPARATOR).cat(ram_filename);
ram_pname = core_strdup(ram_pathname.c_str());
// load, and fill rest with 00
if (VERBOSE>6) LOG("gromport/RPK: Loading NVRAM contents from '%s'\n", ram_pname);

View File

@ -509,7 +509,7 @@ public:
const char* to_string()
{
if (m_detail==NULL) return error_text[(int)m_err];
astring errormsg(error_text[(int)m_err], ": ", m_detail);
astring errormsg = astring(error_text[(int)m_err]).cat(": ").cat(m_detail);
return core_strdup(errormsg.c_str());
}