summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine/pci.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
committer ImJezze <jezze@gmx.net>2015-05-02 19:41:03 +0200
commitcc3b682e52bf097d31db78032aad01d6a0b12e94 (patch)
tree860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/emu/machine/pci.h
parent7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff)
parenta649a95488e1fc85813dda747dc74c596496bd1c (diff)
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/emu/machine/pci.h')
-rw-r--r--src/emu/machine/pci.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/emu/machine/pci.h b/src/emu/machine/pci.h
index 67aad0e0038..e678b2eb689 100644
--- a/src/emu/machine/pci.h
+++ b/src/emu/machine/pci.h
@@ -85,11 +85,14 @@ protected:
M_IO = 1,
M_64D = 2,
M_64A = 4,
- M_PREF = 8
+ M_PREF = 8,
+ M_DISABLED = 16
};
struct bank_info {
+ // One of the two
address_map_delegate map;
+
UINT64 adr;
UINT32 size;
int flags;
@@ -124,6 +127,14 @@ protected:
void add_rom(const UINT8 *data, UINT32 size);
void add_rom_from_region();
+
+ void set_map_address(int id, UINT64 adr);
+ void set_map_size(int id, UINT64 size);
+ void set_map_flags(int id, int flags);
+
+private:
+ void add_map_finish(int bid, UINT64 size, int flags);
+
};
class agp_device : public pci_device {