diff options
author | 2016-01-20 21:42:13 +0100 | |
---|---|---|
committer | 2016-01-20 21:42:13 +0100 | |
commit | 4e8e3066f847cc0fa11539f4d9ab8a63f70ca475 (patch) | |
tree | 25d48b50f2b89dd5b9e7dbbfeeb85c534ec6852a /src/devices/machine/pci.h | |
parent | 3a8ccb89b426509be06089a19c51ecf55567ed1b (diff) |
reverting:
SHA-1: 1f90ceab075c4869298e963bf0a14a0aac2f1caa
* tags are now strings (nw)
fix start project for custom builds in Visual Studio (nw)
Diffstat (limited to 'src/devices/machine/pci.h')
-rw-r--r-- | src/devices/machine/pci.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/machine/pci.h b/src/devices/machine/pci.h index f0e663e85f9..a88f0a3b7fb 100644 --- a/src/devices/machine/pci.h +++ b/src/devices/machine/pci.h @@ -30,7 +30,7 @@ public: mapper_cb remap_cb, remap_config_cb; - pci_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pci_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); void set_ids(UINT32 main_id, UINT8 revision, UINT32 pclass, UINT32 subsystem_id); void set_multifunction_device(bool enable); @@ -137,7 +137,7 @@ protected: class agp_device : public pci_device { public: - agp_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + agp_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); protected: virtual void device_start() override; @@ -146,8 +146,8 @@ protected: class pci_bridge_device : public pci_device, public device_memory_interface { public: - pci_bridge_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); - pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pci_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + 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); virtual void set_remap_cb(mapper_cb _remap_cb) override; virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, @@ -226,7 +226,7 @@ private: class agp_bridge_device : public pci_bridge_device { public: - agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + agp_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); protected: virtual void device_start() override; @@ -237,7 +237,7 @@ class pci_host_device : public pci_bridge_device { public: DECLARE_ADDRESS_MAP(io_configuration_access_map, 32); - pci_host_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); + pci_host_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); protected: address_space *memory_space, *io_space; @@ -265,7 +265,7 @@ protected: class pci_root_device : public device_t { public: - pci_root_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock); + pci_root_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: virtual void device_start() override; |