|
1 From 570835b9a89187a36e08defbccc56051bb349b52 Mon Sep 17 00:00:00 2001 |
|
2 From: Alan Coopersmith <[email protected]> |
|
3 Date: Wed, 19 Nov 2008 10:19:20 -0800 |
|
4 Subject: [PATCH] Use bsd_pci stub routines on Solaris too, since we use pciaccess for real work |
|
5 |
|
6 Depends on commit 70e18a3b6b9d52169bca650f6cd4ef5d8ab40d95 to get |
|
7 definition of xf86InitVidMem on Solaris. |
|
8 --- |
|
9 configure.ac | 5 ++++- |
|
10 hw/xfree86/os-support/bus/Pci.h | 2 +- |
|
11 2 files changed, 5 insertions(+), 2 deletions(-) |
|
12 |
|
13 diff --git a/configure.ac b/configure.ac |
|
14 index 4bea8ac..048416f 100644 |
|
15 --- a/configure.ac |
|
16 +++ b/configure.ac |
|
17 @@ -1278,6 +1278,9 @@ if test "x$XORG" = xyes; then |
|
18 solaris*) |
|
19 XORG_OS="solaris" |
|
20 XORG_OS_SUBDIR="solaris" |
|
21 + # Use the same stubs as BSD for old functions, since we now |
|
22 + # use libpciaccess for PCI |
|
23 + xorg_bus_bsdpci="yes" |
|
24 AC_CHECK_HEADERS([sys/kd.h]) |
|
25 # This really should be tests for specific features, but the #ifdef's |
|
26 # were done as a simple version check in XFree86 4.x and haven't been |
|
27 @@ -1346,7 +1349,7 @@ if test "x$XORG" = xyes; then |
|
28 ;; |
|
29 i*86|x86_64*|amd64*) |
|
30 case $host_os in |
|
31 - *bsd*|linux*) |
|
32 + *bsd*|linux*|solaris*) |
|
33 ;; |
|
34 *) |
|
35 xorg_bus_ix86pci="yes" |
|
36 diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h |
|
37 index 31a7fbf..2eb1745 100644 |
|
38 --- a/hw/xfree86/os-support/bus/Pci.h |
|
39 +++ b/hw/xfree86/os-support/bus/Pci.h |
|
40 @@ -179,7 +179,7 @@ |
|
41 #define PCI_CFGMECH1_MAXDEV 32 |
|
42 |
|
43 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ |
|
44 - defined(__DragonFly__) |
|
45 + defined(__DragonFly__) || defined(__sun) |
|
46 #define ARCH_PCI_INIT bsdPciInit |
|
47 #endif |
|
48 |
|
49 -- |
|
50 1.5.6.5 |
|
51 |