Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

removed mame_* aliases and just use core_* functions (nw)

Browse Source
This commit is contained in:
Oliver Stöneberg 2014-03-24 22:05:08 +00:00
parent 5b375bb60a
commit 2e5ea37f65
52 changed files with 130 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emu/bus/c64/exp.c
View File

@ -126,7 +126,7 @@ bool c64_expansion_slot_device::call_load()
{
size = length();
if (!mame_stricmp(filetype(), "80"))
if (!core_stricmp(filetype(), "80"))
{
fread(m_card->m_roml, size);
m_card->m_exrom = (0);
@ -136,20 +136,20 @@ bool c64_expansion_slot_device::call_load()
m_card->m_game = 0;
}
}
else if (!mame_stricmp(filetype(), "a0"))
else if (!core_stricmp(filetype(), "a0"))
{
fread(m_card->m_romh, 0x2000);
m_card->m_exrom = 0;
m_card->m_game = 0;
}
else if (!mame_stricmp(filetype(), "e0"))
else if (!core_stricmp(filetype(), "e0"))
{
fread(m_card->m_romh, 0x2000);
m_card->m_game = 0;
}
else if (!mame_stricmp(filetype(), "crt"))
else if (!core_stricmp(filetype(), "crt"))
{
size_t roml_size = 0;
size_t romh_size = 0;
@ -224,7 +224,7 @@ void c64_expansion_slot_device::get_default_card_software(astring &result)
{
if (open_image_file(mconfig().options()))
{
if (!mame_stricmp(filetype(), "crt"))
if (!core_stricmp(filetype(), "crt"))
{
cbm_crt_get_card(result, m_file);
return;

6
src/emu/bus/cbm2/exp.c
View File

@ -114,17 +114,17 @@ bool cbm2_expansion_slot_device::call_load()
{
size = length();
if (!mame_stricmp(filetype(), "20"))
if (!core_stricmp(filetype(), "20"))
{
m_card->m_bank1.allocate(size);
fread(m_card->m_bank1, size);
}
else if (!mame_stricmp(filetype(), "40"))
else if (!core_stricmp(filetype(), "40"))
{
m_card->m_bank2.allocate(size);
fread(m_card->m_bank2, size);
}
else if (!mame_stricmp(filetype(), "60"))
else if (!core_stricmp(filetype(), "60"))
{
m_card->m_bank3.allocate(size);
fread(m_card->m_bank3, size);

6
src/emu/bus/gameboy/gb_slot.c
View File

@ -226,7 +226,7 @@ static int gb_get_pcb_id(const char *slot)
{
for (int i = 0; i < ARRAY_LENGTH(slot_list); i++)
{
if (!mame_stricmp(slot_list[i].slot_option, slot))
if (!core_stricmp(slot_list[i].slot_option, slot))
return slot_list[i].pcb_id;
}
@ -312,13 +312,13 @@ bool base_gb_cart_slot_device::call_load()
if (get_feature("rumble"))
{
if (!mame_stricmp(get_feature("rumble"), "yes"))
if (!core_stricmp(get_feature("rumble"), "yes"))
m_cart->set_has_rumble(true);
}
if (get_feature("rtc"))
{
if (!mame_stricmp(get_feature("rtc"), "yes"))
if (!core_stricmp(get_feature("rtc"), "yes"))
m_cart->set_has_timer(true);
}
}

2
src/emu/bus/gba/gba_slot.c
View File

@ -127,7 +127,7 @@ static int gba_get_pcb_id(const char *slot)
{
for (int i = 0; i < ARRAY_LENGTH(slot_list); i++)
{
if (!mame_stricmp(slot_list[i].slot_option, slot))
if (!core_stricmp(slot_list[i].slot_option, slot))
return slot_list[i].pcb_id;
}

2
src/emu/bus/megadrive/md_slot.c
View File

@ -288,7 +288,7 @@ static int md_get_pcb_id(const char *slot)
{
for (int i = 0; i < ARRAY_LENGTH(slot_list); i++)
{
if (!mame_stricmp(slot_list[i].slot_option, slot))
if (!core_stricmp(slot_list[i].slot_option, slot))
return slot_list[i].pcb_id;
}

2
src/emu/bus/nes/nes_pcb.inc
View File

@ -321,7 +321,7 @@ static const nes_pcb *nes_pcb_lookup( const char *slot )
{
for (int i = 0; i < ARRAY_LENGTH(pcb_list); i++)
{
if (!mame_stricmp(pcb_list[i].slot_opt, slot))
if (!core_stricmp(pcb_list[i].slot_opt, slot))
return &pcb_list[i];
}
return NULL;

2
src/emu/bus/nes/nes_unif.inc
View File

@ -148,7 +148,7 @@ const unif *nes_unif_lookup( const char *board )
int i;
for (i = 0; i < ARRAY_LENGTH(unif_list); i++)
{
if (!mame_stricmp(unif_list[i].board, board))
if (!core_stricmp(unif_list[i].board, board))
return &unif_list[i];
}
return NULL;

2
src/emu/bus/pce/pce_slot.c
View File

@ -188,7 +188,7 @@ static int pce_get_pcb_id(const char *slot)
{
for (int i = 0; i < ARRAY_LENGTH(slot_list); i++)
{
if (!mame_stricmp(slot_list[i].slot_option, slot))
if (!core_stricmp(slot_list[i].slot_option, slot))
return slot_list[i].pcb_id;
}

2
src/emu/bus/sega8/sega8_slot.c
View File

@ -195,7 +195,7 @@ static int sega8_get_pcb_id(const char *slot)
{
for (int i = 0; i < ARRAY_LENGTH(slot_list); i++)
{
if (!mame_stricmp(slot_list[i].slot_option, slot))
if (!core_stricmp(slot_list[i].slot_option, slot))
return slot_list[i].pcb_id;
}

2
src/emu/bus/snes/snes_slot.c
View File

@ -309,7 +309,7 @@ static int sns_get_pcb_id(const char *slot)
{
for (int i = 0; i < ARRAY_LENGTH(slot_list); i++)
{
if (!mame_stricmp(slot_list[i].slot_option, slot))
if (!core_stricmp(slot_list[i].slot_option, slot))
return slot_list[i].pcb_id;
}

8
src/emu/bus/vic10/exp.c
View File

@ -122,7 +122,7 @@ bool vic10_expansion_slot_device::call_load()
{
size = length();
if (!mame_stricmp(filetype(), "80"))
if (!core_stricmp(filetype(), "80"))
{
fread(m_card->m_lorom, 0x2000);
@ -131,11 +131,11 @@ bool vic10_expansion_slot_device::call_load()
fread(m_card->m_uprom, 0x2000);
}
}
else if (!mame_stricmp(filetype(), "e0"))
else if (!core_stricmp(filetype(), "e0"))
{
fread(m_card->m_uprom, size);
}
else if (!mame_stricmp(filetype(), "crt"))
else if (!core_stricmp(filetype(), "crt"))
{
size_t roml_size = 0;
size_t romh_size = 0;
@ -189,7 +189,7 @@ void vic10_expansion_slot_device::get_default_card_software(astring &result)
{
if (open_image_file(mconfig().options()))
{
if (!mame_stricmp(filetype(), "crt"))
if (!core_stricmp(filetype(), "crt"))
{
cbm_crt_get_card(result, m_file);
return;

14
src/emu/bus/vic20/exp.c
View File

@ -116,13 +116,13 @@ bool vic20_expansion_slot_device::call_load()
{
if (software_entry() == NULL)
{
if (!mame_stricmp(filetype(), "20")) fread(m_card->m_blk1, 0x2000);
else if (!mame_stricmp(filetype(), "40")) fread(m_card->m_blk2, 0x2000);
else if (!mame_stricmp(filetype(), "60")) fread(m_card->m_blk3, 0x2000);
else if (!mame_stricmp(filetype(), "70")) fread(m_card->m_blk3, 0x2000, 0x1000);
else if (!mame_stricmp(filetype(), "a0")) fread(m_card->m_blk5, 0x2000);
else if (!mame_stricmp(filetype(), "b0")) fread(m_card->m_blk5, 0x2000, 0x1000);
else if (!mame_stricmp(filetype(), "crt"))
if (!core_stricmp(filetype(), "20")) fread(m_card->m_blk1, 0x2000);
else if (!core_stricmp(filetype(), "40")) fread(m_card->m_blk2, 0x2000);
else if (!core_stricmp(filetype(), "60")) fread(m_card->m_blk3, 0x2000);
else if (!core_stricmp(filetype(), "70")) fread(m_card->m_blk3, 0x2000, 0x1000);
else if (!core_stricmp(filetype(), "a0")) fread(m_card->m_blk5, 0x2000);
else if (!core_stricmp(filetype(), "b0")) fread(m_card->m_blk5, 0x2000, 0x1000);
else if (!core_stricmp(filetype(), "crt"))
{
// read the header
UINT8 header[2];

8
src/emu/clifront.c
View File

@ -854,7 +854,7 @@ void cli_frontend::verifyroms(const char *gamename)
for (device_t *dev = iter.first(); dev != NULL; dev = iter.next())
{
if (dev->owner() != NULL && (*(dev->shortname()) != 0) && dev->rom_region() != NULL && (device_map.add(dev->shortname(), 0, false) != TMERR_DUPLICATE)) {
if (mame_strwildcmp(gamename, dev->shortname()) == 0)
if (core_strwildcmp(gamename, dev->shortname()) == 0)
{
matched++;
@ -917,7 +917,7 @@ void cli_frontend::verifyroms(const char *gamename)
device->config_complete();
if (device_map.add(dev->shortname(), 0, false) != TMERR_DUPLICATE) {
if (mame_strwildcmp(gamename, dev->shortname()) == 0)
if (core_strwildcmp(gamename, dev->shortname()) == 0)
{
matched++;
if (dev->rom_region() != NULL)
@ -1419,7 +1419,7 @@ void cli_frontend::getsoftlist(const char *gamename)
{
software_list_device_iterator iter(drivlist.config().root_device());
for (software_list_device *swlistdev = iter.first(); swlistdev != NULL; swlistdev = iter.next())
if (mame_strwildcmp(swlistdev->list_name(), gamename) == 0 && list_map.add(swlistdev->list_name(), 0, false) != TMERR_DUPLICATE)
if (core_strwildcmp(swlistdev->list_name(), gamename) == 0 && list_map.add(swlistdev->list_name(), 0, false) != TMERR_DUPLICATE)
if (swlistdev->first_software_info() != NULL)
{
if (isfirst) { fprintf( out, SOFTLIST_XML_BEGIN); isfirst = FALSE; }
@ -1452,7 +1452,7 @@ void cli_frontend::verifysoftlist(const char *gamename)
{
software_list_device_iterator iter(drivlist.config().root_device());
for (software_list_device *swlistdev = iter.first(); swlistdev != NULL; swlistdev = iter.next())
if (mame_strwildcmp(swlistdev->list_name(), gamename) == 0 && list_map.add(swlistdev->list_name(), 0, false) != TMERR_DUPLICATE)
if (core_strwildcmp(swlistdev->list_name(), gamename) == 0 && list_map.add(swlistdev->list_name(), 0, false) != TMERR_DUPLICATE)
if (swlistdev->first_software_info() != NULL)
{
matched++;

2
src/emu/cpu/es5510/es5510.c
View File

@ -357,7 +357,7 @@ READ8_MEMBER(es5510_device::host_r)
// printf("%06x: DSP read offset %04x (data is %04x)\n",space.device().safe_pc(),offset,dsp_ram[offset]);
// VFX hack
if (mame_stricmp(space.machine().system().name, "vfx") == 0)
if (core_stricmp(space.machine().system().name, "vfx") == 0)
{
if (space.device().safe_pc() == 0xc091f0)
{

10
src/emu/cpu/psx/dismips.c
View File

@ -164,11 +164,11 @@ int main( int argc, char *argv[] )
{
usage();
}
if( mame_stricmp( argv[ i ], "bin" ) == 0 )
if( core_stricmp( argv[ i ], "bin" ) == 0 )
{
format = FORMAT_BIN;
}
else if( mame_stricmp( argv[ i ], "psx" ) == 0 )
else if( core_stricmp( argv[ i ], "psx" ) == 0 )
{
format = FORMAT_PSX;
}
@ -183,15 +183,15 @@ int main( int argc, char *argv[] )
{
usage();
}
if( mame_stricmp( argv[ i ], "psx" ) == 0 )
if( core_stricmp( argv[ i ], "psx" ) == 0 )
{
cpu = CPU_PSX;
}
else if( mame_stricmp( argv[ i ], "r3000" ) == 0 )
else if( core_stricmp( argv[ i ], "r3000" ) == 0 )
{
cpu = CPU_R3000;
}
else if( mame_stricmp( argv[ i ], "r4000" ) == 0 )
else if( core_stricmp( argv[ i ], "r4000" ) == 0 )
{
cpu = CPU_R4000;
}

6
src/emu/cpu/z8000/8000dasm.c
View File

@ -90,17 +90,17 @@ void z8k_disass_mode(running_machine &machine, int ref, int params, const char *
if (params == 1)
{
len = strlen(param[0]);
if (!mame_strnicmp(param[0], "segmented", len) || !mame_stricmp(param[0], "z8001")) {
if (!core_strnicmp(param[0], "segmented", len) || !core_stricmp(param[0], "z8001")) {
z8k_segm = true;
z8k_segm_mode = Z8K_SEGM_MODE_SEG;
debug_console_printf(machine, "Disassembler mode set to Z8001/segmented\n");
}
else if (!mame_strnicmp(param[0], "non-segmented", len) || !mame_stricmp(param[0], "z8002")) {
else if (!core_strnicmp(param[0], "non-segmented", len) || !core_stricmp(param[0], "z8002")) {
z8k_segm = false;
z8k_segm_mode = Z8K_SEGM_MODE_NONSEG;
debug_console_printf(machine, "Disassembler mode set to Z8002/non-segmented\n");
}
else if (!mame_strnicmp(param[0], "automatic", len)) {
else if (!core_strnicmp(param[0], "automatic", len)) {
z8k_segm_mode = Z8K_SEGM_MODE_AUTO;
debug_console_printf(machine, "Disassembler mode set to automatic\n");
}

2
src/emu/debug/debugcmd.c
View File

@ -2584,7 +2584,7 @@ static void execute_trace_internal(running_machine &machine, int ref, int params
return;
/* open the file */
if (mame_stricmp(filename, "off") != 0)
if (core_stricmp(filename, "off") != 0)
{
mode = "w";

6
src/emu/diimage.c
View File

@ -118,7 +118,7 @@ iodevice_t device_image_interface::device_typeid(const char *name)
int i;
for (i = 0; i < ARRAY_LENGTH(device_image_interface::m_device_info_array); i++)
{
if (!mame_stricmp(name, m_device_info_array[i].m_name) || !mame_stricmp(name, m_device_info_array[i].m_shortname))
if (!core_stricmp(name, m_device_info_array[i].m_name) || !core_stricmp(name, m_device_info_array[i].m_shortname))
return m_device_info_array[i].m_type;
}
return (iodevice_t)-1;
@ -299,7 +299,7 @@ bool device_image_interface::try_change_working_directory(const char *subdir)
{
while(!done && (entry = osd_readdir(directory)) != NULL)
{
if (!mame_stricmp(subdir, entry->name))
if (!core_stricmp(subdir, entry->name))
{
done = TRUE;
success = entry->type == ENTTYPE_DIR;
@ -535,7 +535,7 @@ bool device_image_interface::uses_file_extension(const char *file_extension) con
char *ext = strtok((char*)extensions.cstr(),",");
while (ext != NULL)
{
if (!mame_stricmp(ext, file_extension))
if (!core_stricmp(ext, file_extension))
{
result = TRUE;
break;

4
src/emu/drivenum.c
View File

@ -60,7 +60,7 @@ bool driver_list::matches(const char *wildstring, const char *string)
return false;
// match everything else normally
return (wildstring == NULL || mame_strwildcmp(wildstring, string) == 0);
return (wildstring == NULL || core_strwildcmp(wildstring, string) == 0);
}
@ -73,7 +73,7 @@ int driver_list::driver_sort_callback(const void *elem1, const void *elem2)
{
const game_driver * const *item1 = reinterpret_cast<const game_driver * const *>(elem1);
const game_driver * const *item2 = reinterpret_cast<const game_driver * const *>(elem2);
return mame_stricmp((*item1)->name, (*item2)->name);
return core_stricmp((*item1)->name, (*item2)->name);
}

7
src/emu/emucore.h
View File

@ -227,13 +227,6 @@ inline void operator--(_Type &value, int) { value = (_Type)((int)value - 1); }
#endif
// map mame_* helpers to core_* helpers */
#define mame_stricmp core_stricmp
#define mame_strnicmp core_strnicmp
#define mame_strdup core_strdup
#define mame_strwildcmp core_strwildcmp
// macros to convert radians to degrees and degrees to radians
#define RADIAN_TO_DEGREE(x) ((180.0 / M_PI) * (x))
#define DEGREE_TO_RADIAN(x) ((M_PI / 180.0) * (x))

2
src/emu/ioport.c
View File

@ -4411,7 +4411,7 @@ input_seq_type ioport_manager::token_to_seq_type(const char *string)
{
// look up the string in the table of possible sequence types and return the index
for (int seqindex = 0; seqindex < ARRAY_LENGTH(seqtypestrings); seqindex++)
if (!mame_stricmp(string, seqtypestrings[seqindex]))
if (!core_stricmp(string, seqtypestrings[seqindex]))
return input_seq_type(seqindex);
return SEQ_TYPE_INVALID;
}

2
src/emu/machine/ram.c
View File

@ -110,7 +110,7 @@ void ram_device::device_validity_check(validity_checker &valid) const
{
int j;
int size = strlen(m_extra_options);
char * const s = mame_strdup(m_extra_options);
char * const s = core_strdup(m_extra_options);
char * const e = s + size;
char *p = s;
for (j=0;j<size;j++) {

2
src/emu/mconfig.c
View File

@ -34,7 +34,7 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options)
// construct the config
(*gamedrv.machine_config)(*this, NULL, NULL);
bool is_selected_driver = mame_stricmp(gamedrv.name,options.system_name())==0;
bool is_selected_driver = core_stricmp(gamedrv.name,options.system_name())==0;
// intialize slot devices - make sure that any required devices have been allocated
slot_interface_iterator slotiter(root_device());
for (device_slot_interface *slot = slotiter.first(); slot != NULL; slot = slotiter.next())

2
src/emu/render.c
View File

@ -1053,7 +1053,7 @@ int render_target::configured_view(const char *viewname, int targetindex, int nu
{
// scan for a matching view name
for (view = view_by_index(viewindex = 0); view != NULL; view = view_by_index(++viewindex))
if (mame_strnicmp(view->name(), viewname, strlen(viewname)) == 0)
if (core_strnicmp(view->name(), viewname, strlen(viewname)) == 0)
break;
}

2
src/emu/rendfont.c
View File

@ -98,7 +98,7 @@ render_font::render_font(render_manager &manager, const char *filename)
}
// if the filename is 'default' default to 'ui.bdf' for backwards compatibility
if (filename != NULL && mame_stricmp(filename, "default") == 0)
if (filename != NULL && core_stricmp(filename, "default") == 0)
filename = "ui.bdf";
// attempt to load the cached version of the font first

4
src/emu/romload.c
View File

@ -306,9 +306,9 @@ static void determine_bios_rom(romload_private *romdata, device_t *device, const
/* Allow '-bios n' to still be used */
sprintf(bios_number, "%d", bios_flags - 1);
if (mame_stricmp(bios_number, specbios) == 0 || mame_stricmp(biosname, specbios) == 0)
if (core_stricmp(bios_number, specbios) == 0 || core_stricmp(biosname, specbios) == 0)
device->set_system_bios(bios_flags);
if (defaultname != NULL && mame_stricmp(biosname, defaultname) == 0)
if (defaultname != NULL && core_stricmp(biosname, defaultname) == 0)
default_no = bios_flags;
bios_count++;
}

2
src/emu/softlist.c
View File

@ -541,7 +541,7 @@ software_info *software_list_device::find(const char *look_for, software_info *p
// find a match (will cause a parse if needed when calling first_software_info)
for (prev = (prev != NULL) ? prev->next() : first_software_info(); prev != NULL; prev = prev->next())
if (mame_strwildcmp(look_for, prev->shortname()) == 0)
if (core_strwildcmp(look_for, prev->shortname()) == 0)
break;
return prev;

2
src/emu/sound/spu.c
View File

@ -2545,7 +2545,7 @@ void spu_device::update_reverb()
// printf("spu: reverb=%s\n",cur_reverb_preset->name);
spu_reverb_cfg=&cur_reverb_preset->cfg;
if ((mame_stricmp("reverb off",cur_reverb_preset->name)) && (spu_reverb_cfg->band_gain<=0.0f))
if ((core_stricmp("reverb off",cur_reverb_preset->name)) && (spu_reverb_cfg->band_gain<=0.0f))
{
// printf("spu: no reverb config for %s\n",cur_reverb_preset->name);
}

8
src/emu/ui/filesel.c
View File

@ -399,7 +399,7 @@ int ui_menu_file_selector::compare_entries(const file_selector_entry *e1, const
}
else
{
result = mame_stricmp(e1_basename, e2_basename);
result = core_stricmp(e1_basename, e2_basename);
if (result == 0)
{
result = strcmp(e1_basename, e2_basename);
@ -592,7 +592,7 @@ void ui_menu_file_selector::populate()
selected_entry = entry;
// do we have to select this file?
if (!mame_stricmp(m_current_file, dirent->name))
if (!core_stricmp(m_current_file, dirent->name))
selected_entry = entry;
}
}
@ -716,7 +716,7 @@ void ui_menu_file_selector::handle()
int match = 0;
for (int i = 0; i < ARRAY_LENGTH(m_filename_buffer); i++)
{
if (mame_strnicmp(entry->basename, m_filename_buffer, i) == 0)
if (core_strnicmp(entry->basename, m_filename_buffer, i) == 0)
match = i;
}
@ -735,7 +735,7 @@ void ui_menu_file_selector::handle()
int match = 0;
for (int i = 0; i < ARRAY_LENGTH(m_filename_buffer); i++)
{
if (mame_strnicmp(entry->basename, m_filename_buffer, i) == 0)
if (core_strnicmp(entry->basename, m_filename_buffer, i) == 0)
match = i;
}

2
src/emu/ui/imginfo.c
View File

@ -156,7 +156,7 @@ void ui_menu_image_info::image_info_astring(running_machine &machine, astring &s
// display long filename, if present and doesn't correspond to name
info = image->longname();
if (info && (!base_filename_noextension || mame_stricmp(info, base_filename_noextension)))
if (info && (!base_filename_noextension || core_stricmp(info, base_filename_noextension)))
string.catprintf("%s\n", info);
// display manufacturer, if available

4
src/emu/ui/miscmenu.c
View File

@ -949,7 +949,7 @@ void ui_menu_settings::populate()
dip->mask = dip->state = 0;
*diplist_tailptr = dip;
diplist_tailptr = &dip->next;
if (mame_stricmp(dip->name, "FAKE") != 0)
if (core_stricmp(dip->name, "FAKE") != 0)
dipcount++;
}
@ -995,7 +995,7 @@ void ui_menu_settings_dip_switches::custom_render(void *selectedref, float top,
/* iterate over DIP switches */
for (dip = diplist; dip != NULL; dip = dip->next)
{
if (mame_stricmp(dip->name, "FAKE") != 0)
if (core_stricmp(dip->name, "FAKE") != 0)
{
const ioport_diplocation *diploc;
UINT32 selectedmask = 0;

6
src/emu/ui/swlist.c
View File

@ -149,7 +149,7 @@ int ui_menu_software_list::compare_entries(const entry_info *e1, const entry_inf
e2_basename = (e2->long_name != NULL) ? e2->long_name : "";
}
result = mame_stricmp(e1_basename, e2_basename);
result = core_stricmp(e1_basename, e2_basename);
if (result == 0)
{
result = strcmp(e1_basename, e2_basename);
@ -309,7 +309,7 @@ void ui_menu_software_list::handle()
int match = 0;
for (int i = 0; i < ARRAY_LENGTH(m_filename_buffer); i++)
{
if (mame_strnicmp(compare_name, m_filename_buffer, i) == 0)
if (core_strnicmp(compare_name, m_filename_buffer, i) == 0)
match = i;
}
@ -330,7 +330,7 @@ void ui_menu_software_list::handle()
int match = 0;
for (int i = 0; i < ARRAY_LENGTH(m_filename_buffer); i++)
{
if (mame_strnicmp(compare_name, m_filename_buffer, i) == 0)
if (core_strnicmp(compare_name, m_filename_buffer, i) == 0)
match = i;
}

2
src/mame/drivers/cdi.c
View File

@ -308,7 +308,7 @@ static DEVICE_IMAGE_DISPLAY_INFO(cdi_cdinfo)
const char *compatibility = image.get_feature("compatibility");
if (compatibility)
{
if (!mame_stricmp(compatibility, "DVC"))
if (!core_stricmp(compatibility, "DVC"))
{
mame_printf_warning("This software requires the Digital Video Cartridge to work.\n");
mame_printf_warning("Therefore, it might not work in MESS at present.\n");

6
src/mame/drivers/firebeat.c
View File

@ -603,7 +603,7 @@ UINT32 firebeat_state::update_screen(screen_device &screen, bitmap_ind16 &bitmap
{
bitmap.fill(0, cliprect);
if ((mame_strnicmp(screen.machine().system().name, "popn", 4) == 0) || (mame_strnicmp(screen.machine().system().name, "bm3", 3) == 0))
if ((core_strnicmp(screen.machine().system().name, "popn", 4) == 0) || (core_strnicmp(screen.machine().system().name, "bm3", 3) == 0))
{
gcu_exec_display_list( bitmap, cliprect, chip, 0x1f80000);
}
@ -751,7 +751,7 @@ void firebeat_state::GCU_w(int chip, UINT32 offset, UINT32 data, UINT32 mem_mask
case 0x40: /* framebuffer config */
// HACK: switch display lists at the right times for the ParaParaParadise games until we
// do the video emulation properly
if (mame_strnicmp(machine().system().name, "pp", 2) == 0)
if (core_strnicmp(machine().system().name, "pp", 2) == 0)
{
switch (data)
{
@ -771,7 +771,7 @@ void firebeat_state::GCU_w(int chip, UINT32 offset, UINT32 data, UINT32 mem_mask
break;
}
}
else if (mame_strnicmp(machine().system().name, "kbm", 3) == 0)
else if (core_strnicmp(machine().system().name, "kbm", 3) == 0)
{
switch (data)
{

6
src/mame/drivers/jaguar.c
View File

@ -2019,11 +2019,11 @@ int jaguar_state::quickload(device_image_interface &image, const char *file_type
skip = 96;
else /* ABS binary */
if (!mame_stricmp(image.filetype(), "abs"))
if (!core_stricmp(image.filetype(), "abs"))
start = 0xc000;
else /* JAG binary */
if (!mame_stricmp(image.filetype(), "jag"))
if (!core_stricmp(image.filetype(), "jag"))
start = 0x5000;
@ -2069,7 +2069,7 @@ int jaguar_state::cart_load(device_image_interface &image)
size = image.length();
/* .rom files load & run at 802000 */
if (!mame_stricmp(image.filetype(), "rom"))
if (!core_stricmp(image.filetype(), "rom"))
{
load_offset = 0x2000; // fix load address
m_cart_base[0x101]=0x802000; // fix exec address

4
src/mame/drivers/megatech.c
View File

@ -581,12 +581,12 @@ DEVICE_IMAGE_LOAD_MEMBER( mtech_state, megatech_cart )
return IMAGE_INIT_FAIL;
else
{
if (!mame_stricmp("genesis", pcb_name))
if (!core_stricmp("genesis", pcb_name))
{
mame_printf_debug("%s is genesis\n", mt_cart->tag);
m_cart_is_genesis[this_cart->slot] = 1;
}
else if (!mame_stricmp("sms", pcb_name))
else if (!core_stricmp("sms", pcb_name))
{
mame_printf_debug("%s is sms\n", mt_cart->tag);
m_cart_is_genesis[this_cart->slot] = 0;

30
src/mame/drivers/model3.c
View File

@ -1262,9 +1262,9 @@ static void model3_init(running_machine &machine, int step)
model3_tap_reset(machine);
if(step < 0x20) {
if( mame_stricmp(machine.system().name, "vs215") == 0 ||
mame_stricmp(machine.system().name, "vs29815") == 0 ||
mame_stricmp(machine.system().name, "bass") == 0 )
if( core_stricmp(machine.system().name, "vs215") == 0 ||
core_stricmp(machine.system().name, "vs29815") == 0 ||
core_stricmp(machine.system().name, "bass") == 0 )
{
mpc106_init(machine);
}
@ -1278,8 +1278,8 @@ static void model3_init(running_machine &machine, int step)
mpc106_init(machine);
// some step 2+ games need the older PCI ID (obvious symptom:
// vbl is enabled briefly then disabled so the game hangs)
if (mame_stricmp(machine.system().name, "magtruck") == 0 ||
mame_stricmp(machine.system().name, "von254g") == 0)
if (core_stricmp(machine.system().name, "magtruck") == 0 ||
core_stricmp(machine.system().name, "von254g") == 0)
{
state->m_real3d_device_id = 0x16c311db; /* PCI Vendor ID (11db = SEGA), Device ID (16c3 = 315-5827) */
}
@ -1750,13 +1750,13 @@ READ64_MEMBER(model3_state::model3_security_r)
case 0x00/8: return 0; /* status */
case 0x1c/8: /* security board data read */
{
if (mame_stricmp(machine().system().name, "vs299") == 0 ||
mame_stricmp(machine().system().name, "vs2v991") == 0)
if (core_stricmp(machine().system().name, "vs299") == 0 ||
core_stricmp(machine().system().name, "vs2v991") == 0)
{
return (UINT64)vs299_prot_data[m_prot_data_ptr++] << 48;
}
else if (mame_stricmp(machine().system().name, "swtrilgy") == 0 ||
mame_stricmp(machine().system().name, "swtrilgya") == 0)
else if (core_stricmp(machine().system().name, "swtrilgy") == 0 ||
core_stricmp(machine().system().name, "swtrilgya") == 0)
{
UINT64 data = (UINT64)swt_prot_data[m_prot_data_ptr++] << 16;
if (m_prot_data_ptr > 0x38)
@ -1765,7 +1765,7 @@ READ64_MEMBER(model3_state::model3_security_r)
}
return data;
}
else if (mame_stricmp(machine().system().name, "fvipers2") == 0)
else if (core_stricmp(machine().system().name, "fvipers2") == 0)
{
UINT64 data = (UINT64)fvipers2_prot_data[m_prot_data_ptr++] << 16;
if (m_prot_data_ptr >= 0x41)
@ -1774,8 +1774,8 @@ READ64_MEMBER(model3_state::model3_security_r)
}
return data;
}
else if (mame_stricmp(machine().system().name, "spikeout") == 0 ||
mame_stricmp(machine().system().name, "spikeofe") == 0)
else if (core_stricmp(machine().system().name, "spikeout") == 0 ||
core_stricmp(machine().system().name, "spikeofe") == 0)
{
UINT64 data = (UINT64)spikeout_prot_data[m_prot_data_ptr++] << 16;
if (m_prot_data_ptr >= 0x55)
@ -1784,8 +1784,8 @@ READ64_MEMBER(model3_state::model3_security_r)
}
return data;
}
else if (mame_stricmp(machine().system().name, "eca") == 0 ||
mame_stricmp(machine().system().name, "ecax") == 0)
else if (core_stricmp(machine().system().name, "eca") == 0 ||
core_stricmp(machine().system().name, "ecax") == 0)
{
UINT64 data = (UINT64)eca_prot_data[m_prot_data_ptr++] << 16;
if (m_prot_data_ptr >= 0x31)
@ -1794,7 +1794,7 @@ READ64_MEMBER(model3_state::model3_security_r)
}
return data;
}
else if (mame_stricmp(machine().system().name, "oceanhun") == 0)
else if (core_stricmp(machine().system().name, "oceanhun") == 0)
{
UINT64 data = (UINT64)oceanhun_prot_data[m_prot_data_ptr++] << 16;
if (m_prot_data_ptr >= 58)

2
src/mame/drivers/mpu4hw.c
View File

@ -945,7 +945,7 @@ WRITE8_MEMBER(mpu4_state::pia_ic5_porta_w)
awp_draw_reel(2);
}
if (mame_stricmp(machine().system().name, "m4gambal") == 0)
if (core_stricmp(machine().system().name, "m4gambal") == 0)
{
/* The 'Gamball' device is a unique piece of mechanical equipment, designed to
provide a truly fair hi-lo gamble for an AWP. Functionally, it consists of

8
src/mame/drivers/nwk-tr.c
View File

@ -501,9 +501,9 @@ WRITE32_MEMBER(nwktr_state::lanc2_w)
{
// TODO: check if these should be transferred via PPC DMA.
if (mame_stricmp(machine().system().name, "thrilld") == 0 ||
mame_stricmp(machine().system().name, "thrilldb") == 0 ||
mame_stricmp(machine().system().name, "thrilldae") == 0)
if (core_stricmp(machine().system().name, "thrilld") == 0 ||
core_stricmp(machine().system().name, "thrilldb") == 0 ||
core_stricmp(machine().system().name, "thrilldae") == 0)
{
m_work_ram[(0x3ffed0/4) + 0] = 0x472a3731; // G*71
m_work_ram[(0x3ffed0/4) + 1] = 0x33202020; // 3
@ -515,7 +515,7 @@ WRITE32_MEMBER(nwktr_state::lanc2_w)
m_work_ram[(0x3fff40/4) + 2] = 0x19994a41; // JA
m_work_ram[(0x3fff40/4) + 3] = 0x4100a9b1; // A
}
else if (mame_stricmp(machine().system().name, "racingj2") == 0)
else if (core_stricmp(machine().system().name, "racingj2") == 0)
{
m_work_ram[(0x3ffc80/4) + 0] = 0x47453838; // GE88
m_work_ram[(0x3ffc80/4) + 1] = 0x38003030; // 8 00

2
src/mess/drivers/a2600.c
View File

@ -614,7 +614,7 @@ DEVICE_IMAGE_LOAD_MEMBER( a2600_state, a2600_cart )
for (int i = 0; i < ARRAY_LENGTH(mapper_types) && m_banking_mode == 0xff; i++)
{
if (!mame_stricmp(mapper, mapper_types[i].mapper_name))
if (!core_stricmp(mapper, mapper_types[i].mapper_name))
{
m_banking_mode = mapper_types[i].mapper_type;
}

2
src/mess/drivers/atari400.c
View File

@ -1874,7 +1874,7 @@ int a400_state::a800_get_pcb_id(const char *pcb)
for (i = 0; i < ARRAY_LENGTH(pcb_list); i++)
{
if (!mame_stricmp(pcb_list[i].pcb_name, pcb))
if (!core_stricmp(pcb_list[i].pcb_name, pcb))
return pcb_list[i].pcb_id;
}

2
src/mess/drivers/esq5505.c
View File

@ -293,7 +293,7 @@ void esq5505_state::machine_reset()
// on VFX, bit 0 is 1 for 'cartridge present'.
// on VFX-SD and later, bit 0 is 1 for floppy present, bit 1 is 1 for cartridge present
if (mame_stricmp(machine().system().name, "vfx") == 0)
if (core_stricmp(machine().system().name, "vfx") == 0)
{
// todo: handle VFX cart-in when we support cartridges
m_duart->ip0_w(ASSERT_LINE);

4
src/mess/drivers/microvsn.c
View File

@ -572,7 +572,7 @@ DEVICE_IMAGE_LOAD_MEMBER(microvision_state,microvision_cart)
for (int i = 0; i < ARRAY_LENGTH(pcb_types) && m_pcb_type == microvision_state::PCB_TYPE_UNKNOWN; i++ )
{
if (!mame_stricmp(pcb, pcb_types[i].pcb_name))
if (!core_stricmp(pcb, pcb_types[i].pcb_name))
{
m_pcb_type = pcb_types[i].pcbtype;
}
@ -593,7 +593,7 @@ DEVICE_IMAGE_LOAD_MEMBER(microvision_state,microvision_cart)
for ( int i = 0; i < ARRAY_LENGTH(rc_types) && m_rc_type == microvision_state::RC_TYPE_UNKNOWN; i++ )
{
if (!mame_stricmp(rc, rc_types[i].rc_name))
if (!core_stricmp(rc, rc_types[i].rc_name))
{
m_rc_type = rc_types[i].rctype;
}

4
src/mess/drivers/vc4000.c
View File

@ -579,7 +579,7 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000)
}
else
{
if (mame_stricmp(image.filetype(), "tvc")==0)
if (core_stricmp(image.filetype(), "tvc")==0)
{
if (quick_data[0] != 2)
{
@ -620,7 +620,7 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000)
}
}
else
if (mame_stricmp(image.filetype(), "pgm")==0)
if (core_stricmp(image.filetype(), "pgm")==0)
{
if (quick_data[0] != 0)
{

2
src/mess/machine/a7800.c
View File

@ -238,7 +238,7 @@ UINT16 a7800_state::a7800_get_pcb_id(const char *pcb)
for (i = 0; i < ARRAY_LENGTH(pcb_list); i++)
{
if (!mame_stricmp(pcb_list[i].pcb_name, pcb))
if (!core_stricmp(pcb_list[i].pcb_name, pcb))
return pcb_list[i].type;
}

8
src/mess/machine/cbm_snqk.c
View File

@ -34,11 +34,11 @@ int general_cbm_loadsnap( device_image_interface &image, const char *file_type,
if (!file_type)
goto error;
if (!mame_stricmp(file_type, "prg"))
if (!core_stricmp(file_type, "prg"))
{
/* prg files */
}
else if (!mame_stricmp(file_type, "p00"))
else if (!core_stricmp(file_type, "p00"))
{
/* p00 files */
if (image.fread( buffer, sizeof(buffer)) != sizeof(buffer))
@ -48,7 +48,7 @@ int general_cbm_loadsnap( device_image_interface &image, const char *file_type,
image.fseek(26, SEEK_SET);
snapshot_size -= 26;
}
else if (!mame_stricmp(file_type, "t64"))
else if (!core_stricmp(file_type, "t64"))
{
/* t64 files - for GB64 Single T64s loading to x0801 - header is always the same size */
if (image.fread( buffer, sizeof(buffer)) != sizeof(buffer))
@ -65,7 +65,7 @@ int general_cbm_loadsnap( device_image_interface &image, const char *file_type,
image.fread( &address, 2);
address = LITTLE_ENDIANIZE_INT16(address);
if (!mame_stricmp(file_type, "t64"))
if (!core_stricmp(file_type, "t64"))
address = 2049;
snapshot_size -= 2;

2
src/mess/machine/intv.c
View File

@ -410,7 +410,7 @@ int intv_state::intv_load_rom_file(device_image_interface &image)
const char *filetype = image.filetype();
/* if it is in .rom format, we enter here */
if (!mame_stricmp (filetype, "rom"))
if (!core_stricmp (filetype, "rom"))
{
image.fread( &temp, 1); /* header */
if (temp != 0xa8)

4
src/mess/machine/lynx.c
View File

@ -2087,7 +2087,7 @@ DEVICE_IMAGE_LOAD_MEMBER( lynx_state, lynx_cart )
filetype = image.filetype();
if (!mame_stricmp (filetype, "lnx"))
if (!core_stricmp (filetype, "lnx"))
{
if (image.fread( header, 0x40) != 0x40)
return IMAGE_INIT_FAIL;
@ -2106,7 +2106,7 @@ DEVICE_IMAGE_LOAD_MEMBER( lynx_state, lynx_cart )
size -= 0x40;
}
else if (!mame_stricmp (filetype, "lyx"))
else if (!core_stricmp (filetype, "lyx"))
{
/* 2008-10 FP: FIXME: .lyx file don't have an header, hence they miss "lynx_granularity"
(see above). What if bank 0 has to be loaded elsewhere? And what about bank 1?

6
src/mess/machine/mbee.c
View File

@ -767,7 +767,7 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee )
UINT16 i, j;
UINT8 data, sw = ioport("CONFIG")->read() & 1; /* reading the dipswitch: 1 = autorun */
if (!mame_stricmp(image.filetype(), "mwb"))
if (!core_stricmp(image.filetype(), "mwb"))
{
/* mwb files - standard basic files */
for (i = 0; i < quickload_size; i++)
@ -797,7 +797,7 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee )
else
space.write_word(0xa2,0x8517);
}
else if (!mame_stricmp(image.filetype(), "com"))
else if (!core_stricmp(image.filetype(), "com"))
{
/* com files - most com files are just machine-language games with a wrapper and don't need cp/m to be present */
for (i = 0; i < quickload_size; i++)
@ -821,7 +821,7 @@ QUICKLOAD_LOAD_MEMBER( mbee_state, mbee )
if (sw) m_maincpu->set_pc(0x100);
}
else if (!mame_stricmp(image.filetype(), "bee"))
else if (!core_stricmp(image.filetype(), "bee"))
{
/* bee files - machine-language games that start at 0900 */
for (i = 0; i < quickload_size; i++)

2
src/mess/machine/msx.c
View File

@ -125,7 +125,7 @@ DEVICE_IMAGE_LOAD_MEMBER(msx_state,msx_cart)
for (int i = 0; i < ARRAY_LENGTH(mapper_types) && type < 0; i++)
{
if (!mame_stricmp(mapper, mapper_types[i].mapper_name))
if (!core_stricmp(mapper, mapper_types[i].mapper_name))
type = mapper_types[i].mapper_type;
}

28
src/mess/machine/spec_snqk.c
View File

@ -54,7 +54,7 @@ static void log_quickload(running_machine &machine, const char *type, UINT32 sta
tempstring.catprintf("Start: 0x%04X End: 0x%04X Exec: ", start, start + length - 1);
logerror("Quickload loaded.\n");
if (!mame_stricmp(exec_format, EXEC_NA))
if (!core_stricmp(exec_format, EXEC_NA))
tempstring.cat("N/A");
else
{
@ -120,7 +120,7 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum)
image.fread(snapshot_data, snapshot_size);
if (!mame_stricmp(file_type, "sna"))
if (!core_stricmp(file_type, "sna"))
{
if ((snapshot_size != SNA48_SIZE) && (snapshot_size != SNA128_SIZE_1) && (snapshot_size != SNA128_SIZE_2))
{
@ -129,7 +129,7 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum)
}
spectrum_setup_sna(machine(), snapshot_data, snapshot_size);
}
else if (!mame_stricmp(file_type, "sp"))
else if (!core_stricmp(file_type, "sp"))
{
if ((snapshot_data[0] != 'S' && snapshot_data[1] != 'P') && (snapshot_size != SP_NEW_SIZE_16K && snapshot_size != SP_NEW_SIZE_48K))
{
@ -141,7 +141,7 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum)
}
spectrum_setup_sp(machine(), snapshot_data, snapshot_size);
}
else if (!mame_stricmp(file_type, "ach"))
else if (!core_stricmp(file_type, "ach"))
{
if (snapshot_size != ACH_SIZE)
{
@ -150,7 +150,7 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum)
}
spectrum_setup_ach(machine(), snapshot_data, snapshot_size);
}
else if (!mame_stricmp(file_type, "prg"))
else if (!core_stricmp(file_type, "prg"))
{
if (snapshot_size != PRG_SIZE)
{
@ -159,7 +159,7 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum)
}
spectrum_setup_prg(machine(), snapshot_data, snapshot_size);
}
else if (!mame_stricmp(file_type, "plusd"))
else if (!core_stricmp(file_type, "plusd"))
{
if ((snapshot_size != PLUSD48_SIZE) && (snapshot_size != PLUSD128_SIZE))
{
@ -168,7 +168,7 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum)
}
spectrum_setup_plusd(machine(), snapshot_data, snapshot_size);
}
else if (!mame_stricmp(file_type, "sem"))
else if (!core_stricmp(file_type, "sem"))
{
if (snapshot_data[0] != 0x05 && snapshot_data[1] != 'S' && \
snapshot_data[2] != 'P' && snapshot_data[3] != 'E' && \
@ -182,7 +182,7 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum)
}
spectrum_setup_sem(machine(), snapshot_data, snapshot_size);
}
else if (!mame_stricmp(file_type, "sit"))
else if (!core_stricmp(file_type, "sit"))
{
if (snapshot_size != SIT_SIZE)
{
@ -191,7 +191,7 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum)
}
spectrum_setup_sit(machine(), snapshot_data, snapshot_size);
}
else if (!mame_stricmp(file_type, "zx"))
else if (!core_stricmp(file_type, "zx"))
{
if (snapshot_size != ZX_SIZE)
{
@ -200,7 +200,7 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum)
}
spectrum_setup_zx(machine(), snapshot_data, snapshot_size);
}
else if (!mame_stricmp(file_type, "snp"))
else if (!core_stricmp(file_type, "snp"))
{
if (snapshot_size != SNP_SIZE)
{
@ -209,7 +209,7 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum)
}
spectrum_setup_snp(machine(), snapshot_data, snapshot_size);
}
else if (!mame_stricmp(file_type, "snx"))
else if (!core_stricmp(file_type, "snx"))
{
if (snapshot_data[0] != 'X' && snapshot_data[1] != 'S' && \
snapshot_data[2] != 'N' && snapshot_data[3] != 'A')
@ -219,7 +219,7 @@ SNAPSHOT_LOAD_MEMBER( spectrum_state,spectrum)
}
spectrum_setup_snx(machine(), snapshot_data, snapshot_size);
}
else if (!mame_stricmp(file_type, "frz"))
else if (!core_stricmp(file_type, "frz"))
{
if (snapshot_size != FRZ_SIZE)
{
@ -2461,7 +2461,7 @@ QUICKLOAD_LOAD_MEMBER( spectrum_state,spectrum)
image.fread(quickload_data, quickload_size);
if (!mame_stricmp(file_type, "scr"))
if (!core_stricmp(file_type, "scr"))
{
if ((quickload_size != SCR_SIZE) && (quickload_size != SCR_BITMAP))
{
@ -2470,7 +2470,7 @@ QUICKLOAD_LOAD_MEMBER( spectrum_state,spectrum)
}
spectrum_setup_scr(machine(), quickload_data, quickload_size);
}
else if (!mame_stricmp(file_type, "raw"))
else if (!core_stricmp(file_type, "raw"))
{
if (quickload_size != RAW_SIZE)
{

2
src/osd/windows/winmain.c
View File

@ -795,7 +795,7 @@ osd_font windows_osd_interface::font_open(const char *_name, int &height)
// if it doesn't match our request, fail
char *utf = utf8_from_tstring(realname);
int result = mame_stricmp(utf, name);
int result = core_stricmp(utf, name);
osd_free(utf);
// if we didn't match, nuke our font and fall back