Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-29 09:03:08 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compile errors due to option_resolution namespacing (nw)

Browse Source
This commit is contained in:
AJR 2016-07-07 23:50:46 -04:00
parent 1c0947a717
commit 4022874815
16 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/bus/psx/memcard.cpp
View File

@ -313,7 +313,7 @@ bool psxcard_device::call_load()
return IMAGE_INIT_PASS;
}
bool psxcard_device::call_create(int format_type, option_resolution *format_options)
bool psxcard_device::call_create(int format_type, util::option_resolution *format_options)
{
UINT8 block[block_size];
int i, ret;

2
src/devices/bus/psx/memcard.h
View File

@ -29,7 +29,7 @@ public:
virtual const option_guide *create_option_guide() const override { return nullptr; }
virtual bool call_load() override;
virtual bool call_create(int format_type, option_resolution *format_options) override;
virtual bool call_create(int format_type, util::option_resolution *format_options) override;
void disable(bool state) { m_disabled = state; if(state) unload(); }

2
src/devices/machine/hp_taco.cpp
View File

@ -1668,7 +1668,7 @@ bool hp_taco_device::call_load()
return IMAGE_INIT_PASS;
}
bool hp_taco_device::call_create(int format_type, option_resolution *format_options)
bool hp_taco_device::call_create(int format_type, util::option_resolution *format_options)
{
LOG(("call_create %d\n" , has_been_created()));
return call_load();

2
src/devices/machine/hp_taco.h
View File

@ -45,7 +45,7 @@ public:
// device_image_interface overrides
virtual bool call_load() override;
virtual bool call_create(int format_type, option_resolution *format_options) override;
virtual bool call_create(int format_type, util::option_resolution *format_options) override;
virtual void call_unload() override;
virtual std::string call_display() override;
virtual iodevice_t image_type() const override { return IO_MAGTAPE; }

2
src/mame/includes/apollo.h
View File

@ -372,7 +372,7 @@ public:
// image-level overrides
virtual bool call_load() override;
virtual bool call_create(int format_type, option_resolution *format_options) override;
virtual bool call_create(int format_type, util::option_resolution *format_options) override;
virtual void call_unload() override;
void set_node_id_from_disk();

2
src/mame/includes/hp48.h
View File

@ -196,7 +196,7 @@ public:
virtual bool call_load() override;
virtual void call_unload() override;
virtual bool call_create(int format_type, option_resolution *format_options) override;
virtual bool call_create(int format_type, util::option_resolution *format_options) override;
protected:
// device-level overrides
virtual void device_config_complete() override;

2
src/mame/machine/apollo.cpp
View File

@ -1000,7 +1000,7 @@ bool apollo_ni::call_load()
DEVICE_IMAGE_CREATE( rom )
-------------------------------------------------*/
bool apollo_ni::call_create(int format_type, option_resolution *format_options)
bool apollo_ni::call_create(int format_type, util::option_resolution *format_options)
{
CLOG1(("apollo_ni::call_create:"));

2
src/mame/machine/hp48.cpp
View File

@ -967,7 +967,7 @@ bool hp48_port_image_device::call_load()
return IMAGE_INIT_PASS;
}
bool hp48_port_image_device::call_create(int format_type, option_resolution *format_options)
bool hp48_port_image_device::call_create(int format_type, util::option_resolution *format_options)
{
hp48_state *state = machine().driver_data<hp48_state>();
int size = m_max_size;

2
src/mame/machine/ng_memcard.cpp
View File

@ -72,7 +72,7 @@ void ng_memcard_device::call_unload()
fwrite(m_memcard_data, 0x800);
}
bool ng_memcard_device::call_create(int format_type, option_resolution *format_options)
bool ng_memcard_device::call_create(int format_type, util::option_resolution *format_options)
{
memset(m_memcard_data, 0, 0x800);

2
src/mame/machine/ng_memcard.h
View File

@ -45,7 +45,7 @@ public:
virtual bool call_load() override;
virtual void call_unload() override;
virtual bool call_create(int format_type, option_resolution *format_options) override;
virtual bool call_create(int format_type, util::option_resolution *format_options) override;
// device-level overrides
virtual void device_start() override;

2
src/mame/machine/pce220_ser.cpp
View File

@ -240,7 +240,7 @@ bool pce220_serial_device::call_load()
DEVICE_IMAGE_CREATE( pce220_serial )
-------------------------------------------------*/
bool pce220_serial_device::call_create(int format_type, option_resolution *format_options)
bool pce220_serial_device::call_create(int format_type, util::option_resolution *format_options)
{
m_state = SIO_WAIT;
m_bytes_count = 0;

2
src/mame/machine/pce220_ser.h
View File

@ -29,7 +29,7 @@ public:
// image-level overrides
virtual bool call_load() override;
virtual void call_unload() override;
virtual bool call_create(int format_type, option_resolution *format_options) override;
virtual bool call_create(int format_type, util::option_resolution *format_options) override;
virtual iodevice_t image_type() const override { return IO_SERIAL; }

14
src/mame/machine/psion_pack.cpp
View File

@ -278,19 +278,19 @@ bool datapack_device::call_load()
DEVICE_IMAGE_CREATE( datapack )
-------------------------------------------------*/
bool datapack_device::call_create(int format_type, option_resolution *create_args)
bool datapack_device::call_create(int format_type, util::option_resolution *create_args)
{
static const UINT8 opk_head[6] = {'O', 'P', 'K', 0x00, 0x00, 0x00};
if (create_args != nullptr)
{
m_id = 0x40;
m_id |= (option_resolution_lookup_int(create_args, 'R')) ? 0x00 : 0x02;
m_id |= (option_resolution_lookup_int(create_args, 'P')) ? 0x04 : 0x00;
m_id |= (option_resolution_lookup_int(create_args, 'W')) ? 0x00 : 0x08;
m_id |= (option_resolution_lookup_int(create_args, 'B')) ? 0x00 : 0x10;
m_id |= (option_resolution_lookup_int(create_args, 'C')) ? 0x20 : 0x00;
m_size = option_resolution_lookup_int(create_args, 'S');
m_id |= (create_args->lookup_int('R')) ? 0x00 : 0x02;
m_id |= (create_args->lookup_int('P')) ? 0x04 : 0x00;
m_id |= (create_args->lookup_int('W')) ? 0x00 : 0x08;
m_id |= (create_args->lookup_int('B')) ? 0x00 : 0x10;
m_id |= (create_args->lookup_int('C')) ? 0x20 : 0x00;
m_size = create_args->lookup_int('S');
}
else
{

2
src/mame/machine/psion_pack.h
View File

@ -27,7 +27,7 @@ public:
// image-level overrides
virtual bool call_load() override;
virtual void call_unload() override;
virtual bool call_create(int format_type, option_resolution *create_args) override;
virtual bool call_create(int format_type, util::option_resolution *create_args) override;
virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); }
virtual iodevice_t image_type() const override { return IO_CARTSLOT; }

2
src/mame/machine/x68k_hdc.cpp
View File

@ -47,7 +47,7 @@ void x68k_hdc_image_device::device_start()
m_phase = SASI_PHASE_BUSFREE;
}
bool x68k_hdc_image_device::call_create(int format_type, option_resolution *format_options)
bool x68k_hdc_image_device::call_create(int format_type, util::option_resolution *format_options)
{
// create 20MB HD
int x;

2
src/mame/machine/x68k_hdc.h
View File

@ -95,7 +95,7 @@ public:
virtual const char *image_interface() const override { return nullptr; }
virtual const char *file_extensions() const override { return "hdf"; }
virtual const option_guide *create_option_guide() const override { return nullptr; }
virtual bool call_create(int format_type, option_resolution *format_options) override;
virtual bool call_create(int format_type, util::option_resolution *format_options) override;
DECLARE_WRITE16_MEMBER( hdc_w );
DECLARE_READ16_MEMBER( hdc_r );