diff --git a/src/emu/machine/linflash.c b/src/emu/machine/linflash.c index fc273b0d672..dee209a546a 100644 --- a/src/emu/machine/linflash.c +++ b/src/emu/machine/linflash.c @@ -1,39 +1,39 @@ #include "linflash.h" -linear_flash_card_device::linear_flash_card_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) : +linear_flash_pccard_device::linear_flash_pccard_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_memory_interface(mconfig, *this), device_slot_card_interface(mconfig, *this) { } -void linear_flash_card_device::device_start() +void linear_flash_pccard_device::device_start() { m_space = &space(AS_0); } -const address_space_config *linear_flash_card_device::memory_space_config( address_spacenum spacenum ) const +const address_space_config *linear_flash_pccard_device::memory_space_config( address_spacenum spacenum ) const { return ( spacenum == AS_0 ) ? &m_space_config : NULL; } -READ16_MEMBER( linear_flash_card_device::read_memory ) +READ16_MEMBER( linear_flash_pccard_device::read_memory ) { UINT16 data = m_space->read_word(offset * 2, mem_mask); //printf( "<%08x %04x %04x\n", offset, data, mem_mask ); return data; } -WRITE16_MEMBER( linear_flash_card_device::write_memory ) +WRITE16_MEMBER( linear_flash_pccard_device::write_memory ) { //printf( ">%08x %04x %04x\n", offset, data, mem_mask ); m_space->write_word(offset * 2, data, mem_mask); } -const device_type LINEAR_FLASH_16MB = &device_creator; +const device_type LINEAR_FLASH_PCCARD_16MB = &device_creator; -static ADDRESS_MAP_START(linear_flash_card_16mb, AS_0, 16, linear_flash_card_16mb_device) +static ADDRESS_MAP_START(linear_flash_pccard_16mb, AS_0, 16, linear_flash_pccard_16mb_device) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00000000, 0x003fffff) AM_DEVREADWRITE8("1l", intelfsh8_device, read, write, 0x00ff) AM_RANGE(0x00000000, 0x003fffff) AM_DEVREADWRITE8("1u", intelfsh8_device, read, write, 0xff00) @@ -45,13 +45,13 @@ static ADDRESS_MAP_START(linear_flash_card_16mb, AS_0, 16, linear_flash_card_16m AM_RANGE(0x00c00000, 0x00ffffff) AM_DEVREADWRITE8("4u", intelfsh8_device, read, write, 0xff00) ADDRESS_MAP_END -linear_flash_card_16mb_device::linear_flash_card_16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - linear_flash_card_device(mconfig, LINEAR_FLASH_16MB, "Linear Flash Card (16MB)", tag, owner, clock, "linearflash16mb", __FILE__) +linear_flash_pccard_16mb_device::linear_flash_pccard_16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_16MB, "Linear Flash PCCARD (16MB)", tag, owner, clock, "linearflash16mb", __FILE__) { - m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_card_16mb ) ); + m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_16mb ) ); } -static MACHINE_CONFIG_FRAGMENT( linear_flash_card_16mb ) +static MACHINE_CONFIG_FRAGMENT( linear_flash_pccard_16mb ) MCFG_FUJITSU_29F016A_ADD("1l") MCFG_FUJITSU_29F016A_ADD("1u") MCFG_FUJITSU_29F016A_ADD("2l") @@ -62,15 +62,15 @@ static MACHINE_CONFIG_FRAGMENT( linear_flash_card_16mb ) MCFG_FUJITSU_29F016A_ADD("4u") MACHINE_CONFIG_END -machine_config_constructor linear_flash_card_16mb_device::device_mconfig_additions() const +machine_config_constructor linear_flash_pccard_16mb_device::device_mconfig_additions() const { - return MACHINE_CONFIG_NAME( linear_flash_card_16mb ); + return MACHINE_CONFIG_NAME( linear_flash_pccard_16mb ); } -const device_type LINEAR_FLASH_32MB = &device_creator; +const device_type LINEAR_FLASH_PCCARD_32MB = &device_creator; -static ADDRESS_MAP_START(linear_flash_card_32mb, AS_0, 16, linear_flash_card_32mb_device) +static ADDRESS_MAP_START(linear_flash_pccard_32mb, AS_0, 16, linear_flash_pccard_32mb_device) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00000000, 0x003fffff) AM_DEVREADWRITE8("1l", intelfsh8_device, read, write, 0x00ff) AM_RANGE(0x00000000, 0x003fffff) AM_DEVREADWRITE8("1u", intelfsh8_device, read, write, 0xff00) @@ -90,13 +90,13 @@ static ADDRESS_MAP_START(linear_flash_card_32mb, AS_0, 16, linear_flash_card_32m AM_RANGE(0x01c00000, 0x01ffffff) AM_DEVREADWRITE8("8u", intelfsh8_device, read, write, 0xff00) ADDRESS_MAP_END -linear_flash_card_32mb_device::linear_flash_card_32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - linear_flash_card_device(mconfig, LINEAR_FLASH_32MB, "Linear Flash Card (32MB)", tag, owner, clock, "linearflash32mb", __FILE__) +linear_flash_pccard_32mb_device::linear_flash_pccard_32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_32MB, "Linear Flash PCCARD (32MB)", tag, owner, clock, "linearflash32mb", __FILE__) { - m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_card_32mb ) ); + m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_32mb ) ); } -static MACHINE_CONFIG_FRAGMENT( linear_flash_card_32mb ) +static MACHINE_CONFIG_FRAGMENT( linear_flash_pccard_32mb ) MCFG_FUJITSU_29F016A_ADD("1l") MCFG_FUJITSU_29F016A_ADD("1u") MCFG_FUJITSU_29F016A_ADD("2l") @@ -115,15 +115,15 @@ static MACHINE_CONFIG_FRAGMENT( linear_flash_card_32mb ) MCFG_FUJITSU_29F016A_ADD("8u") MACHINE_CONFIG_END -machine_config_constructor linear_flash_card_32mb_device::device_mconfig_additions() const +machine_config_constructor linear_flash_pccard_32mb_device::device_mconfig_additions() const { - return MACHINE_CONFIG_NAME( linear_flash_card_32mb ); + return MACHINE_CONFIG_NAME( linear_flash_pccard_32mb ); } -const device_type LINEAR_FLASH_64MB = &device_creator; +const device_type LINEAR_FLASH_PCCARD_64MB = &device_creator; -static ADDRESS_MAP_START(linear_flash_card_64mb, AS_0, 16, linear_flash_card_64mb_device) +static ADDRESS_MAP_START(linear_flash_pccard_64mb, AS_0, 16, linear_flash_pccard_64mb_device) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00000000, 0x003fffff) AM_DEVREADWRITE8("1l", intelfsh8_device, read, write, 0x00ff) AM_RANGE(0x00000000, 0x003fffff) AM_DEVREADWRITE8("1u", intelfsh8_device, read, write, 0xff00) @@ -159,13 +159,13 @@ static ADDRESS_MAP_START(linear_flash_card_64mb, AS_0, 16, linear_flash_card_64m AM_RANGE(0x03c00000, 0x03ffffff) AM_DEVREADWRITE8("16u", intelfsh8_device, read, write, 0xff00) ADDRESS_MAP_END -linear_flash_card_64mb_device::linear_flash_card_64mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - linear_flash_card_device(mconfig, LINEAR_FLASH_64MB, "Linear Flash Card (64MB)", tag, owner, clock, "linearflash64mb", __FILE__) +linear_flash_pccard_64mb_device::linear_flash_pccard_64mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : + linear_flash_pccard_device(mconfig, LINEAR_FLASH_PCCARD_64MB, "Linear Flash PCCARD (64MB)", tag, owner, clock, "linearflash64mb", __FILE__) { - m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_card_64mb ) ); + m_space_config = address_space_config("memory", ENDIANNESS_LITTLE, 16, 26, 0, *ADDRESS_MAP_NAME( linear_flash_pccard_64mb ) ); } -static MACHINE_CONFIG_FRAGMENT( linear_flash_card_64mb ) +static MACHINE_CONFIG_FRAGMENT( linear_flash_pccard_64mb ) MCFG_FUJITSU_29F016A_ADD("1l") MCFG_FUJITSU_29F016A_ADD("1u") MCFG_FUJITSU_29F016A_ADD("2l") @@ -200,7 +200,7 @@ static MACHINE_CONFIG_FRAGMENT( linear_flash_card_64mb ) MCFG_FUJITSU_29F016A_ADD("16u") MACHINE_CONFIG_END -machine_config_constructor linear_flash_card_64mb_device::device_mconfig_additions() const +machine_config_constructor linear_flash_pccard_64mb_device::device_mconfig_additions() const { - return MACHINE_CONFIG_NAME( linear_flash_card_64mb ); + return MACHINE_CONFIG_NAME( linear_flash_pccard_64mb ); } diff --git a/src/emu/machine/linflash.h b/src/emu/machine/linflash.h index b90ab25a295..33177d1ff72 100644 --- a/src/emu/machine/linflash.h +++ b/src/emu/machine/linflash.h @@ -2,7 +2,7 @@ #include "intelfsh.h" #include "machine/pccard.h" -class linear_flash_card_device : public device_t, +class linear_flash_pccard_device : public device_t, public pccard_interface, public device_memory_interface, public device_slot_card_interface @@ -12,7 +12,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_memory); protected: - linear_flash_card_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 = __FILE__); + linear_flash_pccard_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 = __FILE__); // device-level overrides virtual void device_start(); @@ -25,12 +25,12 @@ protected: }; -extern const device_type LINEAR_FLASH_16MB; +extern const device_type LINEAR_FLASH_PCCARD_16MB; -class linear_flash_card_16mb_device : public linear_flash_card_device +class linear_flash_pccard_16mb_device : public linear_flash_pccard_device { public: - linear_flash_card_16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + linear_flash_pccard_16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides @@ -38,24 +38,24 @@ protected: }; -extern const device_type LINEAR_FLASH_32MB; +extern const device_type LINEAR_FLASH_PCCARD_32MB; -class linear_flash_card_32mb_device : public linear_flash_card_device +class linear_flash_pccard_32mb_device : public linear_flash_pccard_device { public: - linear_flash_card_32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + linear_flash_pccard_32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides virtual machine_config_constructor device_mconfig_additions() const; }; -extern const device_type LINEAR_FLASH_64MB; +extern const device_type LINEAR_FLASH_PCCARD_64MB; -class linear_flash_card_64mb_device : public linear_flash_card_device +class linear_flash_pccard_64mb_device : public linear_flash_pccard_device { public: - linear_flash_card_64mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + linear_flash_pccard_64mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index 75c89577420..0285af8de97 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -2629,15 +2629,15 @@ static MACHINE_CONFIG_DERIVED(k573a, konami573) MACHINE_CONFIG_END SLOT_INTERFACE_START(slot_linflash16mb) - SLOT_INTERFACE("16mb", LINEAR_FLASH_16MB) + SLOT_INTERFACE("16mb", LINEAR_FLASH_PCCARD_16MB) SLOT_INTERFACE_END SLOT_INTERFACE_START(slot_linflash32mb) - SLOT_INTERFACE("32mb", LINEAR_FLASH_32MB) + SLOT_INTERFACE("32mb", LINEAR_FLASH_PCCARD_32MB) SLOT_INTERFACE_END SLOT_INTERFACE_START(slot_linflash64mb) - SLOT_INTERFACE("64mb", LINEAR_FLASH_64MB) + SLOT_INTERFACE("64mb", LINEAR_FLASH_PCCARD_64MB) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( pccard1_16mb )