Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 16:00:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

bus/pci: Make #include guards match paths, sort filenames.

Browse Source
This commit is contained in:
Vas Crabb 2024-01-20 06:42:23 +11:00
parent 705922f609
commit 8f98b61a7e
23 changed files with 118 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/src/bus.lua
View File

@ -5420,33 +5420,33 @@ if (BUSES["PCI"]~=null) then
files {
MAME_DIR .. "src/devices/bus/pci/pci_slot.cpp",
MAME_DIR .. "src/devices/bus/pci/pci_slot.h",
MAME_DIR .. "src/devices/bus/pci/virge_pci.cpp",
MAME_DIR .. "src/devices/bus/pci/virge_pci.h",
MAME_DIR .. "src/devices/bus/pci/riva128.cpp",
MAME_DIR .. "src/devices/bus/pci/riva128.h",
MAME_DIR .. "src/devices/bus/pci/rivatnt.cpp",
MAME_DIR .. "src/devices/bus/pci/rivatnt.h",
MAME_DIR .. "src/devices/bus/pci/ds2416.cpp",
MAME_DIR .. "src/devices/bus/pci/ds2416.h",
MAME_DIR .. "src/devices/bus/pci/geforce.cpp",
MAME_DIR .. "src/devices/bus/pci/geforce.h",
MAME_DIR .. "src/devices/bus/pci/mga2064w.cpp",
MAME_DIR .. "src/devices/bus/pci/mga2064w.h",
MAME_DIR .. "src/devices/bus/pci/opti82c861.cpp",
MAME_DIR .. "src/devices/bus/pci/opti82c861.h",
MAME_DIR .. "src/devices/bus/pci/promotion.cpp",
MAME_DIR .. "src/devices/bus/pci/promotion.h",
MAME_DIR .. "src/devices/bus/pci/ymp21.cpp",
MAME_DIR .. "src/devices/bus/pci/ymp21.h",
MAME_DIR .. "src/devices/bus/pci/sw1000xg.cpp",
MAME_DIR .. "src/devices/bus/pci/sw1000xg.h",
MAME_DIR .. "src/devices/bus/pci/ds2416.cpp",
MAME_DIR .. "src/devices/bus/pci/ds2416.h",
MAME_DIR .. "src/devices/bus/pci/sonicvibes.cpp",
MAME_DIR .. "src/devices/bus/pci/sonicvibes.h",
MAME_DIR .. "src/devices/bus/pci/zr36057.cpp",
MAME_DIR .. "src/devices/bus/pci/zr36057.h",
MAME_DIR .. "src/devices/bus/pci/riva128.cpp",
MAME_DIR .. "src/devices/bus/pci/riva128.h",
MAME_DIR .. "src/devices/bus/pci/rivatnt.cpp",
MAME_DIR .. "src/devices/bus/pci/rivatnt.h",
MAME_DIR .. "src/devices/bus/pci/rtl8029as_pci.cpp",
MAME_DIR .. "src/devices/bus/pci/rtl8029as_pci.h",
MAME_DIR .. "src/devices/bus/pci/rtl8139_pci.cpp",
MAME_DIR .. "src/devices/bus/pci/rtl8139_pci.h",
MAME_DIR .. "src/devices/bus/pci/opti82c861.cpp",
MAME_DIR .. "src/devices/bus/pci/opti82c861.h",
MAME_DIR .. "src/devices/bus/pci/sonicvibes.cpp",
MAME_DIR .. "src/devices/bus/pci/sonicvibes.h",
MAME_DIR .. "src/devices/bus/pci/sw1000xg.cpp",
MAME_DIR .. "src/devices/bus/pci/sw1000xg.h",
MAME_DIR .. "src/devices/bus/pci/virge_pci.cpp",
MAME_DIR .. "src/devices/bus/pci/virge_pci.h",
MAME_DIR .. "src/devices/bus/pci/ymp21.cpp",
MAME_DIR .. "src/devices/bus/pci/ymp21.h",
MAME_DIR .. "src/devices/bus/pci/zr36057.cpp",
MAME_DIR .. "src/devices/bus/pci/zr36057.h",
}
end

4
src/devices/bus/pci/ds2416.h
View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
#ifndef MAME_SOUND_DS2416_H
#define MAME_SOUND_DS2416_H
#ifndef MAME_BUS_PCI_DS2416_H
#define MAME_BUS_PCI_DS2416_H
#pragma once

10
src/devices/bus/pci/geforce.h
View File

@ -1,14 +1,16 @@
// license:BSD-3-Clause
// copyright-holders: Angelo Salese
#ifndef MAME_VIDEO_GEFORCE_H
#define MAME_VIDEO_GEFORCE_H
#ifndef MAME_BUS_PCI_GEFORCE_H
#define MAME_BUS_PCI_GEFORCE_H
#pragma once
#include "rivatnt.h"
#include "machine/pci.h"
#include "video/pc_vga_nvidia.h"
#include "rivatnt.h"
class geforce256_device : public rivatnt2_device
{
@ -47,4 +49,4 @@ DECLARE_DEVICE_TYPE(GEFORCE256_DDR, geforce256_ddr_device)
DECLARE_DEVICE_TYPE(QUADRO, quadro_device)
#endif // MAME_VIDEO_GEFORCE_H
#endif // MAME_BUS_PCI_GEFORCE_H

8
src/devices/bus/pci/mga2064w.h
View File

@ -1,13 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert, Angelo Salese
#ifndef MAME_VIDEO_MGA2064W_H
#define MAME_VIDEO_MGA2064W_H
#ifndef MAME_BUS_PCI_MGA2064W_H
#define MAME_BUS_PCI_MGA2064W_H
#pragma once
#include "pci_slot.h"
#include "video/pc_vga_matrox.h"
class mga2064w_device : public pci_card_device, public device_memory_interface {
public:
mga2064w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@ -92,4 +94,4 @@ private:
DECLARE_DEVICE_TYPE(MGA2064W, mga2064w_device);
#endif // MAME_VIDEO_MGA2064W_H
#endif // MAME_BUS_PCI_MGA2064W_H

14
src/devices/bus/pci/opti82c861.cpp
View File

@ -37,7 +37,7 @@ void opti_82c861_device::mem_map(address_map& map)
NAME([this] (offs_t offset, u32 data, u32 mem_mask) {
COMBINE_DATA(&m_HcRhDescriptorA);
if (ACCESSING_BITS_24_31)
LOG("HcRhDescriptorA: set Power-On to Power-Good Time %d msec\n", (m_HcRhDescriptorA >> 24) * 2);
LOG("HcRhDescriptorA: set Power-On to Power-Good Time %d msec\n", (m_HcRhDescriptorA >> 24) * 2);
if (ACCESSING_BITS_8_15)
LOG("HcRhDescriptorA: set status %02x\n", (m_HcRhDescriptorA & 0x1b00) >> 8);
})
@ -47,12 +47,12 @@ void opti_82c861_device::mem_map(address_map& map)
void opti_82c861_device::config_map(address_map &map)
{
pci_card_device::config_map(map);
// map(0x4e, 0x4e) i2c Control Register
// map(0x50, 0x50) PCI Host Feature Control Register
// map(0x51, 0x51) Interrupt Assignment Register
// map(0x52, 0x52) Strap Option Enable
// map(0x54, 0x57) IRQ Driveback Address Register
// map(0x6c, 0x6f) Test Mode Enable Register
// map(0x4e, 0x4e) i2c Control Register
// map(0x50, 0x50) PCI Host Feature Control Register
// map(0x51, 0x51) Interrupt Assignment Register
// map(0x52, 0x52) Strap Option Enable
// map(0x54, 0x57) IRQ Driveback Address Register
// map(0x6c, 0x6f) Test Mode Enable Register
}
void opti_82c861_device::device_start()

4
src/devices/bus/pci/opti82c861.h
View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders: R. Belmont
#ifndef MAME_MACHINE_OPTI82C861_H
#define MAME_MACHINE_OPTI82C861_H
#ifndef MAME_BUS_PCI_OPTI82C861_H
#define MAME_BUS_PCI_OPTI82C861_H
#pragma once

30
src/devices/bus/pci/pci_slot.cpp
View File

@ -5,19 +5,21 @@
#include "emu.h"
#include "pci_slot.h"
#include "virge_pci.h"
#include "riva128.h"
#include "rivatnt.h"
#include "ds2416.h"
#include "geforce.h"
#include "mga2064w.h"
#include "opti82c861.h"
#include "promotion.h"
#include "ds2416.h"
#include "sonicvibes.h"
#include "sw1000xg.h"
#include "zr36057.h"
#include "riva128.h"
#include "rivatnt.h"
#include "rtl8029as_pci.h"
#include "rtl8139_pci.h"
#include "opti82c861.h"
#include "sonicvibes.h"
#include "sw1000xg.h"
#include "virge_pci.h"
#include "zr36057.h"
DEFINE_DEVICE_TYPE(PCI_SLOT, pci_slot_device, "pci_slot", "PCI extension motherboard port")
@ -47,18 +49,10 @@ pci_card_device *pci_slot_device::get_card() const
pci_card_interface::pci_card_interface(const machine_config &mconfig, device_t &device) :
device_interface(device, "pci_card"),
m_pci_slot(nullptr)
m_pci_slot(dynamic_cast<pci_slot_device *>(device.owner())) // Beware, the owner may not be a pci_slot_device, in which case the cast returns nullptr
{
}
void pci_card_interface::interface_pre_start()
{
// Beware, the owner may not be a pci_slot_device, in which case
// the cast is expected to return nullptr.
m_pci_slot = dynamic_cast<pci_slot_device *>(device().owner());
}
pci_card_device::pci_card_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
pci_device(mconfig, type, tag, owner, clock),
pci_card_interface(mconfig, *this)
@ -98,7 +92,7 @@ void pci_card_device::irq_pin_w(offs_t line, int state)
return;
m_pin_state = (m_pin_state & ~(1 << line)) | (state << line);
m_pci_root->irq_pin_w(m_irq_map[line], state);
m_pci_root->irq_pin_w(m_irq_map[line], state);
}
void pci_cards(device_slot_interface &device)

15
src/devices/bus/pci/pci_slot.h
View File

@ -8,6 +8,9 @@
#include "machine/pci.h"
#include <array>
class pci_card_interface;
class pci_slot_device: public device_t, public device_single_card_slot_interface<pci_card_interface>
@ -17,7 +20,7 @@ public:
template <typename T>
pci_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, u8 slot, u8 irqa, u8 irqb, u8 irqc, u8 irqd, const char *dflt)
: pci_slot_device(mconfig, tag, owner, (uint32_t)0)
: pci_slot_device(mconfig, tag, owner, (uint32_t)0)
{
option_reset();
opts(*this);
@ -47,21 +50,19 @@ private:
u8 m_slot;
};
class pci_card_interface : public device_interface
{
public:
protected:
pci_slot_device *m_pci_slot;
pci_slot_device *const m_pci_slot;
pci_card_interface(const machine_config &mconfig, device_t &device);
virtual void interface_pre_start() override;
};
class pci_card_device : public pci_device, public pci_card_interface
{
public:
pci_card_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
virtual ~pci_card_device();
void set_irq_map(u8 irqa, u8 irqb = 0xff, u8 irqc = 0xff, u8 irqd = 0xff) {
@ -78,6 +79,8 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
pci_card_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
void irq_pin_w(offs_t line, int state);
};

2
src/devices/bus/pci/promotion.cpp
View File

@ -135,7 +135,7 @@ void promotion3210_device::vram_w(offs_t offset, uint8_t data)
void promotion3210_device::map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space)
{
// if (1)
// if (1)
{
memory_space->install_readwrite_handler(0xa0000, 0xbffff, read8sm_delegate(*this, FUNC(promotion3210_device::vram_r)), write8sm_delegate(*this, FUNC(promotion3210_device::vram_w)));

8
src/devices/bus/pci/promotion.h
View File

@ -1,14 +1,16 @@
// license:BSD-3-Clause
// copyright-holders:
#ifndef MAME_VIDEO_PROMOTION_H
#define MAME_VIDEO_PROMOTION_H
#ifndef MAME_BUS_PCI_PROMOTION_H
#define MAME_BUS_PCI_PROMOTION_H
#pragma once
#include "pci_slot.h"
#include "video/pc_vga.h"
class promotion3210_device : public pci_card_device
{
public:
@ -44,4 +46,4 @@ private:
DECLARE_DEVICE_TYPE(PROMOTION3210, promotion3210_device)
#endif // MAME_VIDEO_PROMOTION_H
#endif // MAME_BUS_PCI_PROMOTION_H

7
src/devices/bus/pci/riva128.h
View File

@ -1,14 +1,15 @@
// license:BSD-3-Clause
// copyright-holders: Angelo Salese
#ifndef MAME_VIDEO_RIVA128_H
#define MAME_VIDEO_RIVA128_H
#ifndef MAME_BUS_PCI_RIVA128_H
#define MAME_BUS_PCI_RIVA128_H
#pragma once
#include "pci_slot.h"
#include "video/pc_vga_nvidia.h"
class riva128_device : public pci_card_device
{
public:
@ -61,4 +62,4 @@ protected:
DECLARE_DEVICE_TYPE(RIVA128, riva128_device)
DECLARE_DEVICE_TYPE(RIVA128ZX, riva128zx_device)
#endif // MAME_VIDEO_RIVA128_H
#endif // MAME_BUS_PCI_RIVA128_H

8
src/devices/bus/pci/rivatnt.h
View File

@ -1,14 +1,16 @@
// license:BSD-3-Clause
// copyright-holders: Angelo Salese
#ifndef MAME_VIDEO_RIVATNT_H
#define MAME_VIDEO_RIVATNT_H
#ifndef MAME_BUS_VIDEO_RIVATNT_H
#define MAME_BUS_VIDEO_RIVATNT_H
#pragma once
#include "riva128.h"
#include "machine/pci.h"
#include "video/pc_vga_nvidia.h"
#include "riva128.h"
class rivatnt_device : public riva128_device
{

2
src/devices/bus/pci/rtl8029as_pci.cpp
View File

@ -55,7 +55,7 @@ void rtl8029as_pci_device::device_start()
// TODO: verify 16 being of the right size
// documentation puts 3 bits in BAR0 as size but then all the "pages" are 16,
// then one note also claims 32 bytes wtf
// add_map( 16, M_IO, FUNC(rtl8029as_pci_device::map));
// add_map( 16, M_IO, FUNC(rtl8029as_pci_device::map));
// INTA#
intr_pin = 1;

10
src/devices/bus/pci/rtl8029as_pci.h
View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:
#ifndef MAME_NETWORK_RTL8029AS_PCI_H
#define MAME_NETWORK_RTL8029AS_PCI_H
#ifndef MAME_BUS_PCI_RTL8029AS_PCI_H
#define MAME_BUS_PCI_RTL8029AS_PCI_H
#pragma once
@ -22,10 +22,10 @@ protected:
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
// virtual const tiny_rom_entry *device_rom_region() const override;
// virtual const tiny_rom_entry *device_rom_region() const override;
// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
virtual void config_map(address_map &map) override;

4
src/devices/bus/pci/rtl8139_pci.cpp
View File

@ -62,8 +62,8 @@ void rtl8139_pci_device::device_start()
{
pci_card_device::device_start();
// add_map( 256, M_IO, FUNC(rtl8139_pci_device::ioar_map));
// add_map( 256, M_MEM, FUNC(rtl8139_pci_device::memar_map));
// add_map( 256, M_IO, FUNC(rtl8139_pci_device::ioar_map));
// add_map( 256, M_MEM, FUNC(rtl8139_pci_device::memar_map));
// INTA#
intr_pin = 1;

10
src/devices/bus/pci/rtl8139_pci.h
View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:
#ifndef MAME_NETWORK_RTL8129_PCI_H
#define MAME_NETWORK_RTL8129_PCI_H
#ifndef MAME_BUS_PCI_RTL8129_PCI_H
#define MAME_BUS_PCI_RTL8129_PCI_H
#pragma once
@ -22,10 +22,10 @@ protected:
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
// virtual const tiny_rom_entry *device_rom_region() const override;
// virtual const tiny_rom_entry *device_rom_region() const override;
// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
virtual void config_map(address_map &map) override;

12
src/devices/bus/pci/sonicvibes.cpp
View File

@ -124,13 +124,13 @@ void sonicvibes_device::config_map(address_map &map)
void sonicvibes_device::games_legacy_map(address_map &map)
{
map(0x00, 0x03).rw(m_opl3, FUNC(ymf262_device::read), FUNC(ymf262_device::write));
// map(0x04, 0x04) Mixer Register Index (w/o)
// map(0x05, 0x05) Mixer Register Data
// map(0x06, 0x06) Reset
// map(0x04, 0x04) Mixer Register Index (w/o)
// map(0x05, 0x05) Mixer Register Data
// map(0x06, 0x06) Reset
map(0x08, 0x09).rw(m_opl3, FUNC(ymf262_device::read), FUNC(ymf262_device::write));
// map(0x0a, 0x0a) Input Data (r/o)
// map(0x0c, 0x0c) Write Data/Command (w) Write Buffer Status (r)
// map(0x0e, 0x0e) Read Output Buffer Status (r/o)
// map(0x0a, 0x0a) Input Data (r/o)
// map(0x0c, 0x0c) Write Data/Command (w) Write Buffer Status (r)
// map(0x0e, 0x0e) Read Output Buffer Status (r/o)
}
// 530h

8
src/devices/bus/pci/sonicvibes.h
View File

@ -1,15 +1,17 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
#ifndef MAME__SONICVIBES_H
#define MAME__SONICVIBES_H
#ifndef MAME_BUS_PCI_SONICVIBES_H
#define MAME_BUS_PCI_SONICVIBES_H
#pragma once
#include "pci_slot.h"
#include "bus/pc_joy/pc_joy.h"
#include "sound/ymopl.h"
class sonicvibes_device : public pci_card_device
{
public:
@ -39,4 +41,4 @@ private:
DECLARE_DEVICE_TYPE(SONICVIBES, sonicvibes_device)
#endif // MAME__SONICVIBES_H
#endif // MAME_BUS_PCI_SONICVIBES_H

6
src/devices/bus/pci/sw1000xg.cpp
View File

@ -36,9 +36,9 @@ void sw1000xg_device::h8_map(address_map &map)
void sw1000xg_device::swp30_map(address_map &map)
{
// map(0x000000, 0x1fffff).rom().region("swp30", 0).mirror(0x200000);
// map(0x400000, 0x4fffff).rom().region("swp30", 0x800000).mirror(0x300000);
// map(0x800000, 0x9fffff).rom().region("swp30", 0x1000000).mirror(0x200000);
// map(0x000000, 0x1fffff).rom().region("swp30", 0).mirror(0x200000);
// map(0x400000, 0x4fffff).rom().region("swp30", 0x800000).mirror(0x300000);
// map(0x800000, 0x9fffff).rom().region("swp30", 0x1000000).mirror(0x200000);
}
#define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \

5
src/devices/bus/pci/sw1000xg.h
View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
#ifndef MAME_SOUND_SW1000XG_H
#define MAME_SOUND_SW1000XG_H
#ifndef MAME_BUS_PCI_SW1000XG_H
#define MAME_BUS_PCI_SW1000XG_H
#pragma once
@ -11,6 +11,7 @@
#include "cpu/h8/h83002.h"
#include "sound/swp30.h"
class sw1000xg_device : public ymp21_device {
public:
sw1000xg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);

4
src/devices/bus/pci/virge_pci.h
View File

@ -5,8 +5,8 @@
* S3 ViRGE 3D accelerator card
*/
#ifndef MAME_VIDEO_VIRGE_PCI_H
#define MAME_VIDEO_VIRGE_PCI_H
#ifndef MAME_BUS_PCI_VIRGE_PCI_H
#define MAME_BUS_PCI_VIRGE_PCI_H
#pragma once

11
src/devices/bus/pci/ymp21.h
View File

@ -3,13 +3,16 @@
// PCI interfacing gate array common to the sw1000xg and the ds2416
#ifndef MAME_SOUND_YMP21_H
#define MAME_SOUND_YMP21_H
#ifndef MAME_BUS_PCI_YMP21_H
#define MAME_BUS_PCI_YMP21_H
#pragma once
#include "pci_slot.h"
#include <array>
class ymp21_device : public pci_card_device {
protected:
devcb_write_line::array<2> m_tx_cb;
@ -28,8 +31,8 @@ private:
void map(address_map &map);
TIMER_CALLBACK_MEMBER(uart_rx);
TIMER_CALLBACK_MEMBER(uart_tx);
TIMER_CALLBACK_MEMBER(uart_rx);
TIMER_CALLBACK_MEMBER(uart_tx);
void uart_data_w(offs_t offset, u8 data);
u8 uart_data_r(offs_t offset);

6
src/devices/bus/pci/zr36057.h
View File

@ -22,10 +22,10 @@ protected:
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
// virtual const tiny_rom_entry *device_rom_region() const override;
// virtual const tiny_rom_entry *device_rom_region() const override;
// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
virtual void config_map(address_map &map) override;