Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-23 21:06:38 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Eliminated device_image_interface::make_readonly()

Browse Source 
Take note that I eliminated make_readonly(); here is why I think the calls were unnecessary:
1.  All image loads through softlists are done through common_process_file(), and thus going to be readonly anyways
2.  The cassette.cpp call to make_readonly() seems to be a residual hack, if a failure occurs the image will be unloaded anyways
This commit is contained in:
Nathan Woods 2016-08-09 22:27:24 -04:00
parent 6a3c13eb5b
commit 1cda375d5e
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/imagedev/cassette.cpp
View File

@ -285,10 +285,6 @@ image_init_result cassette_image_device::internal_load(bool is_create)
cassette_flags = is_writable ? (CASSETTE_FLAG_READWRITE|CASSETTE_FLAG_SAVEONEXIT) : CASSETTE_FLAG_READONLY; cassette_flags = is_writable ? (CASSETTE_FLAG_READWRITE|CASSETTE_FLAG_SAVEONEXIT) : CASSETTE_FLAG_READONLY;
std::string fname; std::string fname;
err = cassette_open_choices((void *)image, &image_ioprocs, filetype().c_str(), m_formats, cassette_flags, &m_cassette); err = cassette_open_choices((void *)image, &image_ioprocs, filetype().c_str(), m_formats, cassette_flags, &m_cassette);
/* this is kind of a hack */
if (err && is_writable)
make_readonly();
} }
while(err && is_writable); while(err && is_writable);

4
src/emu/diimage.cpp
View File

@ -510,7 +510,7 @@ void device_image_interface::image_checkhash()
// only calculate CRC if it hasn't been calculated, and the open_mode is read only // only calculate CRC if it hasn't been calculated, and the open_mode is read only
UINT32 crcval; UINT32 crcval;
if (!m_hash.crc(crcval) && m_readonly && !m_created) if (!m_hash.crc(crcval) && is_readonly() && !m_created)
{ {
// do not cause a linear read of 600 megs please // do not cause a linear read of 600 megs please
// TODO: use SHA1 in the CHD header as the hash // TODO: use SHA1 in the CHD header as the hash
@ -1060,8 +1060,6 @@ image_init_result device_image_interface::load_software(const std::string &softl
const char *read_only = get_feature("read_only"); const char *read_only = get_feature("read_only");
if (read_only && !strcmp(read_only, "true")) if (read_only && !strcmp(read_only, "true"))
{ {
make_readonly();
// Copy some image information when we have been loaded through a software list // Copy some image information when we have been loaded through a software list
if (m_software_info_ptr) if (m_software_info_ptr)
{ {

1
src/emu/diimage.h
View File

@ -180,7 +180,6 @@ public:
util::core_file &image_core_file() const { return *m_file; } util::core_file &image_core_file() const { return *m_file; }
UINT64 length() { check_for_file(); return m_file->size(); } UINT64 length() { check_for_file(); return m_file->size(); }
bool is_readonly() const { return m_readonly; } bool is_readonly() const { return m_readonly; }
void make_readonly() { m_readonly = true; }
UINT32 fread(void *buffer, UINT32 length) { check_for_file(); return m_file->read(buffer, length); } UINT32 fread(void *buffer, UINT32 length) { check_for_file(); return m_file->read(buffer, length); }
UINT32 fread(optional_shared_ptr<UINT8> &ptr, UINT32 length) { ptr.allocate(length); return fread(ptr.target(), length); } UINT32 fread(optional_shared_ptr<UINT8> &ptr, UINT32 length) { ptr.allocate(length); return fread(ptr.target(), length); }
UINT32 fread(optional_shared_ptr<UINT8> &ptr, UINT32 length, offs_t offset) { ptr.allocate(length); return fread(ptr + offset, length - offset); } UINT32 fread(optional_shared_ptr<UINT8> &ptr, UINT32 length, offs_t offset) { ptr.allocate(length); return fread(ptr + offset, length - offset); }