summaryrefslogtreecommitdiff
path: root/hw/xfree86/dummylib
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-05-18 23:52:51 +0000
committerAdam Jackson <ajax@nwnk.net>2006-05-18 23:52:51 +0000
commitdeebf6bd51117c01a3217f134bd952481b9e41ab (patch)
tree2f0a53c8615c86e5c8318517246d95f2ef371568 /hw/xfree86/dummylib
parent91239d83f4e27835cf871348b5ff6c892bd4f4f4 (diff)
Bug #4139: Fix a BAR remapping bug that could lead to IERR and system hang.
(Egbert Eich)
Diffstat (limited to 'hw/xfree86/dummylib')
-rw-r--r--hw/xfree86/dummylib/Makefile.am3
-rw-r--r--hw/xfree86/dummylib/getemptypci.c19
2 files changed, 21 insertions, 1 deletions
diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am
index c2cb8ef78..ab62a6b54 100644
--- a/hw/xfree86/dummylib/Makefile.am
+++ b/hw/xfree86/dummylib/Makefile.am
@@ -12,7 +12,7 @@ if NEED_STRLCAT
STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c
endif
-libdummy_a_SOURCES = getvalidbios.c \
+libdummy_a_SOURCES = getvalidbios.c getemptypci.c \
pcitestmulti.c xf86allocscripi.c \
xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \
xf86getverb.c \
@@ -24,6 +24,7 @@ libdummy_a_SOURCES = getvalidbios.c \
libdummy_nonserver_a_SOURCES = \
fatalerror.c \
getvalidbios.c \
+ getemptypci.c \
logvwrite.c \
pcitestmulti.c \
$(STRL_SRCS) \
diff --git a/hw/xfree86/dummylib/getemptypci.c b/hw/xfree86/dummylib/getemptypci.c
new file mode 100644
index 000000000..03119d3d9
--- /dev/null
+++ b/hw/xfree86/dummylib/getemptypci.c
@@ -0,0 +1,19 @@
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "os.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+
+/*
+ * Utility functions required by libxf86_os.
+ */
+
+memType
+getEmptyPciRange(PCITAG tag, int base_reg)
+{
+ return 0;
+}