diff options
Diffstat (limited to 'src/emu/machine')
| -rw-r--r-- | src/emu/machine/i6300esb.c | 8 | ||||
| -rw-r--r-- | src/emu/machine/i6300esb.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/i82875p.h | 4 | ||||
| -rw-r--r-- | src/emu/machine/intelfsh.c | 6 | ||||
| -rw-r--r-- | src/emu/machine/intelfsh.h | 4 | ||||
| -rw-r--r-- | src/emu/machine/lpc-acpi.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/lpc-rtc.c | 4 | ||||
| -rw-r--r-- | src/emu/machine/lpc-rtc.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/lpc.c | 1 | ||||
| -rw-r--r-- | src/emu/machine/lpc.h | 1 | ||||
| -rw-r--r-- | src/emu/machine/omti5100.c | 4 | ||||
| -rw-r--r-- | src/emu/machine/omti5100.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/pci.c | 22 | ||||
| -rw-r--r-- | src/emu/machine/pci.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/pla.c | 14 | ||||
| -rw-r--r-- | src/emu/machine/pla.h | 4 |
16 files changed, 39 insertions, 43 deletions
diff --git a/src/emu/machine/i6300esb.c b/src/emu/machine/i6300esb.c index 8dcfbd6cec5..725c03534e0 100644 --- a/src/emu/machine/i6300esb.c +++ b/src/emu/machine/i6300esb.c @@ -86,8 +86,8 @@ ADDRESS_MAP_END i6300esb_lpc_device::i6300esb_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pci_device(mconfig, I6300ESB_LPC, "i6300ESB southbridge ISA/LPC bridge", tag, owner, clock, "i6300esb_lpc", __FILE__), - acpi(*this, "acpi"), - rtc (*this, "rtc") + acpi(*this, "acpi"), + rtc (*this, "rtc") { } @@ -661,7 +661,7 @@ void i6300esb_lpc_device::map_bios(address_space *memory_space, UINT32 start, UI { // Ignore idsel, a16 inversion for now UINT32 mask = m_region->bytes() - 1; - memory_space->install_rom(start, end, m_region->base() + (start & mask)); + memory_space->install_rom(start, end, m_region->base() + (start & mask)); } void i6300esb_lpc_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, @@ -750,5 +750,3 @@ void i6300esb_lpc_device::map_extra(UINT64 memory_window_start, UINT64 memory_wi if(rtc_conf & 4) rtc->map_extdevice(memory_window_start, memory_window_end, 0, memory_space, io_window_start, io_window_end, 0, io_space); } - - diff --git a/src/emu/machine/i6300esb.h b/src/emu/machine/i6300esb.h index 79a7bb376b3..3f7bb286678 100644 --- a/src/emu/machine/i6300esb.h +++ b/src/emu/machine/i6300esb.h @@ -19,7 +19,7 @@ public: virtual void reset_all_mappings(); virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); virtual DECLARE_ADDRESS_MAP(config_map, 32); diff --git a/src/emu/machine/i82875p.h b/src/emu/machine/i82875p.h index 138b489c02e..998c1e51ed9 100644 --- a/src/emu/machine/i82875p.h +++ b/src/emu/machine/i82875p.h @@ -5,7 +5,7 @@ #include "pci.h" -#define MCFG_I82875P_HOST_ADD(_tag, _subdevice_id, _cpu_tag, _ram_size) \ +#define MCFG_I82875P_HOST_ADD(_tag, _subdevice_id, _cpu_tag, _ram_size) \ MCFG_PCI_HOST_ADD(_tag, I82875P_HOST, 0x80862578, 0x02, _subdevice_id) \ downcast<i82875p_host_device *>(device)->set_cpu_tag(_cpu_tag); \ downcast<i82875p_host_device *>(device)->set_ram_size(_ram_size); @@ -21,7 +21,7 @@ public: void set_ram_size(int ram_size); virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); virtual DECLARE_ADDRESS_MAP(config_map, 32); diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c index c7c2fe6d6c2..8d15e34ff2c 100644 --- a/src/emu/machine/intelfsh.c +++ b/src/emu/machine/intelfsh.c @@ -379,7 +379,7 @@ intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, cons fujitsu_29f160t_device::fujitsu_29f160t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : intelfsh8_device(mconfig, FUJITSU_29F160T, "Fujitsu 29F160 Flash", tag, owner, clock, FLASH_FUJITSU_29F160T, "fujitsu_29f160t", __FILE__) { } - + fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : intelfsh8_device(mconfig, FUJITSU_29F016A, "Fujitsu 29F016A Flash", tag, owner, clock, FLASH_FUJITSU_29F016A, "fujitsu_29f016a", __FILE__) { } @@ -400,10 +400,10 @@ amd_29f040_device::amd_29f040_device(const machine_config &mconfig, const char * amd_29f080_device::amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : intelfsh8_device(mconfig, AMD_29F080, "AMD 29F080 Flash", tag, owner, clock, FLASH_AMD_29F080, "amd_29f080", __FILE__) { } - + amd_29f400t_device::amd_29f400t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : intelfsh8_device(mconfig, AMD_29F080, "AMD 29F400 Flash", tag, owner, clock, FLASH_AMD_29F400T, "amd_29f400t", __FILE__) { } - + amd_29f800t_device::amd_29f800t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : intelfsh8_device(mconfig, AMD_29F080, "AMD 29F800 Flash", tag, owner, clock, FLASH_AMD_29F080, "amd_29f800t", __FILE__) { } diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h index 0f95237fd55..95fce17b2ee 100644 --- a/src/emu/machine/intelfsh.h +++ b/src/emu/machine/intelfsh.h @@ -39,7 +39,7 @@ #define MCFG_FUJITSU_29F160T_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, FUJITSU_29F160T, 0) - + #define MCFG_FUJITSU_29F016A_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, FUJITSU_29F016A, 0) @@ -161,7 +161,7 @@ protected: UINT8 m_maker_id; bool m_sector_is_4k; bool m_sector_is_16k; - bool m_top_boot_sector; + bool m_top_boot_sector; UINT8 m_page_size; // internal state diff --git a/src/emu/machine/lpc-acpi.c b/src/emu/machine/lpc-acpi.c index e30c6d36094..5493fa5ecf6 100644 --- a/src/emu/machine/lpc-acpi.c +++ b/src/emu/machine/lpc-acpi.c @@ -40,7 +40,7 @@ lpc_acpi_device::lpc_acpi_device(const machine_config &mconfig, const char *tag, } void lpc_acpi_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) { io_space->install_device(io_offset, io_window_end, *this, &lpc_acpi_device::map); } diff --git a/src/emu/machine/lpc-rtc.c b/src/emu/machine/lpc-rtc.c index c296504d1a6..0f51234c3a2 100644 --- a/src/emu/machine/lpc-rtc.c +++ b/src/emu/machine/lpc-rtc.c @@ -18,13 +18,13 @@ lpc_rtc_device::lpc_rtc_device(const machine_config &mconfig, const char *tag, d } void lpc_rtc_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) { io_space->install_device(io_offset, io_window_end, *this, &lpc_rtc_device::map); } void lpc_rtc_device::map_extdevice(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) { io_space->install_device(io_offset, io_window_end, *this, &lpc_rtc_device::extmap); } diff --git a/src/emu/machine/lpc-rtc.h b/src/emu/machine/lpc-rtc.h index 9135d1a590b..b2d4ea3155f 100644 --- a/src/emu/machine/lpc-rtc.h +++ b/src/emu/machine/lpc-rtc.h @@ -14,7 +14,7 @@ public: UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); virtual void map_extdevice(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); DECLARE_READ8_MEMBER( index_r); DECLARE_WRITE8_MEMBER( index_w); diff --git a/src/emu/machine/lpc.c b/src/emu/machine/lpc.c index 7921542adf1..fd9aeee275e 100644 --- a/src/emu/machine/lpc.c +++ b/src/emu/machine/lpc.c @@ -4,4 +4,3 @@ lpc_device::lpc_device(const machine_config &mconfig, device_type type, const ch device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } - diff --git a/src/emu/machine/lpc.h b/src/emu/machine/lpc.h index 7cb9587da59..75af5ffb612 100644 --- a/src/emu/machine/lpc.h +++ b/src/emu/machine/lpc.h @@ -12,4 +12,3 @@ public: }; #endif - diff --git a/src/emu/machine/omti5100.c b/src/emu/machine/omti5100.c index 84d00f178e9..8e4e8fcfa53 100644 --- a/src/emu/machine/omti5100.c +++ b/src/emu/machine/omti5100.c @@ -51,7 +51,7 @@ const rom_entry *omti5100_device::device_rom_region() const //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( omti5100_z8 ) -// MCFG_CPU_ADD("z8", Z8681, XTAL_20MHz / 3 /* ??? */) +// MCFG_CPU_ADD("z8", Z8681, XTAL_20MHz / 3 /* ??? */) MACHINE_CONFIG_END machine_config_constructor omti5100_device::device_mconfig_additions() const @@ -70,7 +70,7 @@ machine_config_constructor omti5100_device::device_mconfig_additions() const omti5100_device::omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, OMTI5100, "OMTI 5100 SCSI/SASI Controller", tag, owner, clock, "omti5100", __FILE__), -// m_cpu(*this, "z8"), +// m_cpu(*this, "z8"), m_bsy_w(*this), m_cd_w(*this), m_io_w(*this), diff --git a/src/emu/machine/omti5100.h b/src/emu/machine/omti5100.h index ede9493880f..ecb8d460d2c 100644 --- a/src/emu/machine/omti5100.h +++ b/src/emu/machine/omti5100.h @@ -88,7 +88,7 @@ protected: virtual void device_reset(); private: -// required_device<z8681_device> m_cpu; +// required_device<z8681_device> m_cpu; devcb_write_line m_bsy_w; devcb_write_line m_cd_w; diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c index 1e823dc319f..abad1e64426 100644 --- a/src/emu/machine/pci.c +++ b/src/emu/machine/pci.c @@ -226,11 +226,11 @@ void pci_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end } map_extra(memory_window_start, memory_window_end, memory_offset, memory_space, - io_window_start, io_window_end, io_offset, io_space); + io_window_start, io_window_end, io_offset, io_space); } void pci_device::map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) { } @@ -291,15 +291,15 @@ void agp_device::device_reset() pci_bridge_device::pci_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : pci_device(mconfig, PCI_BRIDGE, "PCI-PCI Bridge", tag, owner, clock, "pci_bridge", __FILE__), - device_memory_interface(mconfig, *this), - configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20) + device_memory_interface(mconfig, *this), + configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20) { } pci_bridge_device::pci_bridge_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) : pci_device(mconfig, type, name, tag, owner, clock, shortname, source), - device_memory_interface(mconfig, *this), - configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20) + device_memory_interface(mconfig, *this), + configure_space_config("configuration_space", ENDIANNESS_LITTLE, 32, 20) { } @@ -373,15 +373,15 @@ void pci_bridge_device::reset_all_mappings() void pci_bridge_device::map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) { for(int i = all_devices.count()-1; i>=0; i--) if(all_devices[i] != this) all_devices[i]->map_device(memory_window_start, memory_window_end, memory_offset, memory_space, - io_window_start, io_window_end, io_offset, io_space); + io_window_start, io_window_end, io_offset, io_space); map_extra(memory_window_start, memory_window_end, memory_offset, memory_space, - io_window_start, io_window_end, io_offset, io_space); + io_window_start, io_window_end, io_offset, io_space); } @@ -458,7 +458,7 @@ void pci_host_device::regenerate_mapping() io_space->unmap_readwrite(io_window_start, io_window_end); map_device(memory_window_start, memory_window_end, memory_offset, memory_space, - io_window_start, io_window_end, io_offset, io_space); + io_window_start, io_window_end, io_offset, io_space); } READ32_MEMBER(pci_host_device::config_address_r) @@ -492,7 +492,7 @@ UINT32 pci_host_device::config_read(UINT8 bus, UINT8 device, UINT16 reg, UINT32 } } else abort(); - + return data; } diff --git a/src/emu/machine/pci.h b/src/emu/machine/pci.h index ea6d861311c..a10b28d1a8a 100644 --- a/src/emu/machine/pci.h +++ b/src/emu/machine/pci.h @@ -37,7 +37,7 @@ public: virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); void map_config(UINT8 device, address_space *config_space); diff --git a/src/emu/machine/pla.c b/src/emu/machine/pla.c index 09c799fa1ee..4d0a3978161 100644 --- a/src/emu/machine/pla.c +++ b/src/emu/machine/pla.c @@ -59,7 +59,7 @@ void pla_device::device_start() m_cache.resize(csize); for (int i = 0; i < csize; i++) m_cache[i] = read(i); - + m_cache_size = csize; } @@ -72,19 +72,19 @@ void pla_device::parse_fusemap() { jed_data jed; int result = JEDERR_NONE; - + // read pla file switch (m_format) { case PLA_FMT_JEDBIN: result = jedbin_parse(region()->base(), region()->bytes(), &jed); break; - + case PLA_FMT_BERKELEY: result = pla_parse(region()->base(), region()->bytes(), &jed); break; } - + if (result != JEDERR_NONE) { for (int p = 0; p < m_terms; p++) @@ -92,11 +92,11 @@ void pla_device::parse_fusemap() m_term[p].and_mask = 0; m_term[p].or_mask = 0; } - + logerror("%s PLA parse error %d!\n", tag(), result); return; } - + // parse it UINT32 fusenum = 0; @@ -148,7 +148,7 @@ UINT32 pla_device::read(UINT32 input) // try the cache first if (input < m_cache_size) return m_cache[input]; - + for (int i = 0; i < CACHE2_SIZE; ++i) { UINT64 cache2_entry = m_cache2[i]; diff --git a/src/emu/machine/pla.h b/src/emu/machine/pla.h index 96a33aaae43..411b1bec15b 100644 --- a/src/emu/machine/pla.h +++ b/src/emu/machine/pla.h @@ -99,7 +99,7 @@ public: static void set_num_terms(device_t &device, UINT32 t) { downcast<pla_device &>(device).m_terms = t; } static void set_inputmask(device_t &device, UINT32 mask) { downcast<pla_device &>(device).m_input_mask = mask; } // UINT32! static void set_format(device_t &device, int format) { downcast<pla_device &>(device).m_format = format; } - + UINT32 inputs() { return m_inputs; } UINT32 outputs() { return m_outputs; } @@ -113,7 +113,7 @@ private: void parse_fusemap(); int m_format; - + UINT32 m_inputs; UINT32 m_outputs; UINT32 m_terms; |
