diff options
author | 2011-02-12 03:47:37 +0000 | |
---|---|---|
committer | 2011-02-12 03:47:37 +0000 | |
commit | 1b54456be5fd090b039b3e9f691ac0464ffdff12 (patch) | |
tree | 3839c21fada7804940b1c828dcceb6a57ff9c74f /src/emu/romload.h | |
parent | 061548d2bec629c46712844ffe459292f3c745f4 (diff) |
mame_file is now emu_file and is a class. It is required
to pass a core_options object to the constructor, along with
a search path. This required pushing either a running_machine
or a core_options through some code that wasn't previously
ready to handle it. emu_files can be reused over multiple
open/close sessions, and a lot of core code cleaned up
nicely as things were converted to them.
Also created a file_enumerator class for iterating over files
in a searchpath. This replaces the old mame_openpath functions.
Changed machine->options() to return a reference.
Removed public nvram_open() and fixed jchan/kaneko16 to
stop directly saving NVRAM.
Removed most of the mame_options() calls; this will soon go
away entirely, so don't add any more.
Added core_options to device_validity_check() so they can be
used to validate things.
Diffstat (limited to 'src/emu/romload.h')
-rw-r--r-- | src/emu/romload.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/emu/romload.h b/src/emu/romload.h index b4d8584f7f2..cab3a18cf95 100644 --- a/src/emu/romload.h +++ b/src/emu/romload.h @@ -285,8 +285,8 @@ int rom_load_knownbad(running_machine *machine); /* ----- Helpers ----- */ -file_error common_process_file_options(core_options *options, const char *location, const char *ext, const rom_entry *romp, mame_file **image_file); -file_error common_process_file(const char *location, bool has_crc, UINT32 crc, const rom_entry *romp, mame_file **image_file); +file_error common_process_file(core_options &options, const char *location, const char *ext, const rom_entry *romp, emu_file **image_file); +file_error common_process_file(core_options &options, const char *location, bool has_crc, UINT32 crc, const rom_entry *romp, emu_file **image_file); /* ----- ROM iteration ----- */ @@ -323,16 +323,13 @@ astring &rom_region_name(astring &result, const game_driver *drv, const rom_sour /* ----- disk handling ----- */ /* open a disk image, searching up the parent and loading by checksum */ -chd_error open_disk_image(const game_driver *gamedrv, const rom_entry *romp, mame_file **image_file, chd_file **image_chd,const char *locationtag); - -/* open a disk image, searching up the parent and loading by checksum */ -chd_error open_disk_image_options(core_options *options, const game_driver *gamedrv, const rom_entry *romp, mame_file **image_file, chd_file **image_chd,const char *locationtag); +chd_error open_disk_image(core_options &options, const game_driver *gamedrv, const rom_entry *romp, emu_file **image_file, chd_file **image_chd,const char *locationtag); /* return a pointer to the CHD file associated with the given region */ chd_file *get_disk_handle(running_machine *machine, const char *region); /* set a pointer to the CHD file associated with the given region */ -void set_disk_handle(running_machine *machine, const char *region, mame_file *file, chd_file *chd); +void set_disk_handle(running_machine &machine, const char *region, emu_file &file, chd_file &chdfile); void load_software_part_region(device_t *device, char *swlist, char *swname, rom_entry *start_region); |