summaryrefslogtreecommitdiff
path: root/util/vgabios/pci-userspace.h
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2015-09-28 13:12:04 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-10-25 21:33:32 +0100
commit850e7d48845ed78bc50f9d0d8caae8132d2ba38d (patch)
tree0ae333e7192debc5a8166d0dcd595969546f9a3b /util/vgabios/pci-userspace.h
parent3acece23621eb27abcce34a212344a12d80de500 (diff)
downloadcoreboot-850e7d48845ed78bc50f9d0d8caae8132d2ba38d.tar.xz
vgabios: fix compilation after x86emu changes
This utility links in coreboot code, and has been broken for a while again after removing some hacks from coreboot. I hadn't realized how bad it was broken last time, and since most of this stuff is still in a pretty bad shape, I decided to throw all of the changes together. Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Change-Id: If3e4399b1b0e947433b97caa29962ef66ea2993d Reviewed-on: http://review.coreboot.org/11736 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'util/vgabios/pci-userspace.h')
-rw-r--r--util/vgabios/pci-userspace.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/util/vgabios/pci-userspace.h b/util/vgabios/pci-userspace.h
index 094433070f..103a9ef3bc 100644
--- a/util/vgabios/pci-userspace.h
+++ b/util/vgabios/pci-userspace.h
@@ -1,9 +1,13 @@
-#include "pci.h"
+#ifndef __PCI_USERSPACE_H__
+#define __PCI_USERSPACE_H__
+
+#include <pci/pci.h>
typedef unsigned long pciaddr_t;
typedef u8 byte;
typedef u16 word;
+#if 0
struct pci_dev {
struct pci_dev *next; /* Next device in the chain */
word bus; /* Higher byte can select host bridges */
@@ -32,7 +36,7 @@ struct pci_filter {
int bus, slot, func; /* -1 = ANY */
int vendor, device;
};
-
+#endif
#define PCITAG struct pci_filter *
#define pciVideoPtr struct pci_dev *
@@ -44,7 +48,8 @@ int pciExit(void);
PCITAG findPci(unsigned short bx);
-u32 pciSlotBX(pciVideoPtr pvp);
+//u32 pciSlotBX(pciVideoPtr pvp);
+u32 pciSlotBX(PCITAG tag);
void pciWriteLong(PCITAG tag, u32 idx, u32 data);
void pciWriteWord(PCITAG tag, u32 idx, u16 data);
@@ -53,3 +58,5 @@ void pciWriteByte(PCITAG tag, u32 idx, u8 data);
u32 pciReadLong(PCITAG tag, u32 idx);
u16 pciReadWord(PCITAG tag, u32 idx);
u8 pciReadByte(PCITAG tag, u32 idx);
+
+#endif