/[gentoo-x86]/x11-base/xorg-server/files/1.1.1-remove-altix.patch
Gentoo

Contents of /x11-base/xorg-server/files/1.1.1-remove-altix.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Fri Sep 15 21:15:21 2006 UTC (8 years, 3 months ago) by dberkholz
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Use upstream's fix for sparc mach64 lockups. An 18-line patch instead of a 582-line patch is a good thing.
(Portage version: 2.1.1_rc1-r7)
 (Unsigned Manifest commit)

1 diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
2 index 39c8b8c..e9406d8 100644
3 --- a/hw/xfree86/common/compiler.h
4 +++ b/hw/xfree86/common/compiler.h
5 @@ -120,8 +120,7 @@ # if defined(NO_INLINE) || defined(DO_PR
6
7 # if !defined(__arm__)
8 # if !defined(__sparc__) && !defined(__arm32__) \
9 - && !(defined(__alpha__) && defined(linux)) \
10 - && !(defined(__ia64__) && defined(linux)) \
11 + && !(defined(__alpha__) && defined(linux))
12
13 extern void outb(unsigned short, unsigned char);
14 extern void outw(unsigned short, unsigned short);
15 @@ -159,7 +158,7 @@ # endif
16
17 # ifndef NO_INLINE
18 # ifdef __GNUC__
19 -# if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__alpha__))
20 +# if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__alpha__)
21
22 # ifdef linux
23 /* for Linux on Alpha, we use the LIBC _inx/_outx routines */
24 @@ -491,16 +490,11 @@ # endif
25 # undef outb
26 # undef outw
27 # undef outl
28 -# undef inb
29 -# undef inw
30 -# undef inl
31 -extern void outb(unsigned long port, unsigned char val);
32 -extern void outw(unsigned long port, unsigned short val);
33 -extern void outl(unsigned long port, unsigned int val);
34 -extern unsigned int inb(unsigned long port);
35 -extern unsigned int inw(unsigned long port);
36 -extern unsigned int inl(unsigned long port);
37
38 +# define outb(a,b) _outb(b,a)
39 +# define outw(a,b) _outw(b,a)
40 +# define outl(a,b) _outl(b,a)
41 +
42 # elif defined(linux) && defined(__amd64__)
43
44 # include <inttypes.h>
45 diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
46 index 057dfb0..3da549b 100644
47 --- a/hw/xfree86/common/xf86Bus.c
48 +++ b/hw/xfree86/common/xf86Bus.c
49 @@ -1860,7 +1860,7 @@ xf86RegisterResources(int entityIndex, r
50 range.type = (range.type & ~ResAccMask) | (access & ResAccMask);
51 }
52 range.type &= ~ResEstimated; /* Not allowed for drivers */
53 -#if !((defined(__alpha__) || (defined(__ia64__))) && defined(linux))
54 +#if !(defined(__alpha__) && defined(linux))
55 /* On Alpha Linux, do not check for conflicts, trust the kernel. */
56 if (checkConflict(&range, Acc, entityIndex, SETUP,TRUE))
57 res = xf86AddResToList(res,&range,entityIndex);
58 @@ -2480,8 +2480,8 @@ #ifdef REDUCER
59 #endif
60 }
61 xf86FreeResList(acc);
62 +
63 #if !(defined(__alpha__) && defined(linux)) && \
64 - !(defined(__ia64__) && defined(linux)) && \
65 !(defined(__sparc64__) && defined(__OpenBSD__))
66 /*
67 * No need to validate on Alpha Linux or OpenBSD/sparc64,
68 diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
69 index 4d587a1..177e354 100644
70 --- a/hw/xfree86/common/xf86pciBus.c
71 +++ b/hw/xfree86/common/xf86pciBus.c
72 @@ -1649,14 +1649,10 @@ getValidBIOSBase(PCITAG tag, int num)
73 /* Return a possible window */
74 ret = findPciRange(tag,m,avoid,biosSize);
75 } else {
76 -#if !defined(__ia64__) /* on ia64, trust the kernel, don't look for overlaps */
77 - if (mem)
78 - pciConvertListToHost(pvp->bus,pvp->device,pvp->func, mem);
79 if (!xf86IsSubsetOf(range, m) ||
80 ChkConflict(&range, avoid, SETUP)
81 || (mem && ChkConflict(&range, mem, SETUP)))
82 ret = 0;
83 -#endif
84 }
85
86 xf86FreeResList(avoid);
87 diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
88 index ad4f773..6536442 100644
89 --- a/hw/xfree86/loader/xf86sym.c
90 +++ b/hw/xfree86/loader/xf86sym.c
91 @@ -1098,12 +1098,12 @@ #if !defined(Lynx)
92 #endif
93 #endif
94 #if defined(__ia64__)
95 - SYMFUNC(outw)
96 - SYMFUNC(outb)
97 - SYMFUNC(outl)
98 - SYMFUNC(inb)
99 - SYMFUNC(inw)
100 - SYMFUNC(inl)
101 + SYMFUNC(_outw)
102 + SYMFUNC(_outb)
103 + SYMFUNC(_outl)
104 + SYMFUNC(_inb)
105 + SYMFUNC(_inw)
106 + SYMFUNC(_inl)
107 #endif
108 #if defined(__arm__)
109 SYMFUNC(outw)
110 diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
111 index a91c6b2..98ab31a 100644
112 --- a/hw/xfree86/os-support/bus/Pci.h
113 +++ b/hw/xfree86/os-support/bus/Pci.h
114 @@ -261,6 +261,7 @@ #elif defined(__ia64__)
115 # if defined(linux)
116 # define ARCH_PCI_INIT linuxPciInit
117 # define INCLUDE_XF86_MAP_PCI_MEM
118 +# define INCLUDE_XF86_NO_DOMAIN
119 # elif defined(FreeBSD)
120 # define ARCH_PCI_INIT freebsdPciInit
121 # define INCLUDE_XF86_MAP_PCI_MEM
122 diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
123 index 0714c9c..f5b41f1 100644
124 --- a/hw/xfree86/os-support/bus/linuxPci.c
125 +++ b/hw/xfree86/os-support/bus/linuxPci.c
126 @@ -63,7 +63,6 @@ #include "Pci.h"
127 static CARD32 linuxPciCfgRead(PCITAG tag, int off);
128 static void linuxPciCfgWrite(PCITAG, int off, CARD32 val);
129 static void linuxPciCfgSetBits(PCITAG tag, int off, CARD32 mask, CARD32 bits);
130 -static ADDRESS linuxTransAddrBusToHost(PCITAG tag, PciAddrType type, ADDRESS addr);
131 #if defined(__powerpc__)
132 static ADDRESS linuxPpcBusAddrToHostAddr(PCITAG, PciAddrType, ADDRESS);
133 static ADDRESS linuxPpcHostAddrToBusAddr(PCITAG, PciAddrType, ADDRESS);
134 @@ -84,7 +83,7 @@ #if defined(__powerpc__)
135 /* pciAddrBusToHost */ linuxPpcBusAddrToHostAddr,
136 #else
137 /* pciAddrHostToBus */ pciAddrNOOP,
138 -/* pciAddrBusToHost */ linuxTransAddrBusToHost,
139 +/* pciAddrBusToHost */ pciAddrNOOP,
140 #endif
141
142 /* pciControlBridge */ NULL,
143 @@ -236,26 +235,6 @@ linuxPciCfgSetBits(PCITAG tag, int off,
144 }
145 }
146
147 -/*
148 - * This function will convert a BAR address into a host address
149 - * suitable for passing into the mmap function of a /proc/bus
150 - * device.
151 - */
152 -ADDRESS linuxTransAddrBusToHost(PCITAG tag, PciAddrType type, ADDRESS addr)
153 -{
154 - ADDRESS ret = xf86GetOSOffsetFromPCI(tag, PCI_MEM|PCI_IO, addr);
155 -
156 - if (ret)
157 - return ret;
158 -
159 - /*
160 - * if it is not a BAR address, it must be legacy, (or wrong)
161 - * return it as is..
162 - */
163 - return addr;
164 -}
165 -
166 -
167 #if defined(__powerpc__)
168
169 #ifndef __NR_pciconfig_iobase
170 @@ -508,9 +487,6 @@ xf86GetPciDomain(PCITAG Tag)
171 if (pPCI && (result = PCI_DOM_FROM_BUS(pPCI->busnum)))
172 return result;
173
174 - if (!pPCI || pPCI->fakeDevice)
175 - return 1; /* Domain 0 is reserved */
176 -
177 if ((fd = linuxPciOpenFile(pPCI ? pPCI->tag : 0,FALSE)) < 0)
178 return 0;
179
180 @@ -551,7 +527,7 @@ # endif
181 if (Flags & VIDMEM_FRAMEBUFFER)
182 mmapflags = MAP_SHARED | MAP_WRITECOMBINED;
183 else
184 - mmapflags = MAP_SHARED | MAP_NONCACHED;
185 + mmapflags = MAP_SHARED | MAP_NONCACHED
186
187 #else /* !__ia64__ */
188
189 @@ -576,7 +552,7 @@ #endif /* ?__ia64__ */
190 result = mmap(NULL, Size + Offset, prot, mmapflags, fd, realBase);
191
192 if (!result || ((pointer)result == MAP_FAILED))
193 - return NULL;
194 + FatalError("linuxMapPci() mmap failure: %s\n", strerror(errno));
195
196 xf86MakeNewMapping(ScreenNum, Flags, realBase, Size + Offset, result);
197
198 @@ -647,37 +624,12 @@ _X_EXPORT pointer
199 xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag,
200 ADDRESS Base, unsigned long Size)
201 {
202 - int domain = xf86GetPciDomain(Tag);
203 - int fd;
204 -
205 - /*
206 - * We use /proc/bus/pci on non-legacy addresses or if the Linux sysfs
207 - * legacy_mem interface is unavailable.
208 - */
209 - if (Base > 1024*1024)
210 - return linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
211 - PCIIOC_MMAP_IS_MEM);
212 -
213 - if ((fd = linuxOpenLegacy(Tag, "legacy_mem")) < 0)
214 - return linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
215 - PCIIOC_MMAP_IS_MEM);
216 -
217 -
218 - /* If we haven't already mapped this legacy space, try to. */
219 - if (!DomainMmappedMem[domain]) {
220 - DomainMmappedMem[domain] = mmap(NULL, 1024*1024, PROT_READ|PROT_WRITE,
221 - MAP_SHARED, fd, 0);
222 - if (DomainMmappedMem[domain] == MAP_FAILED) {
223 - close(fd);
224 - perror("mmap failure");
225 - FatalError("xf86MapDomainMem(): mmap() failure\n");
226 - }
227 - }
228 -
229 - close(fd);
230 - return (pointer)((char *)DomainMmappedMem[domain] + Base);
231 + return linuxMapPci(ScreenNum, Flags, Tag, Base, Size, PCIIOC_MMAP_IS_MEM);
232 }
233
234 +#define MAX_DOMAINS 257
235 +static pointer DomainMmappedIO[MAX_DOMAINS];
236 +
237 /*
238 * xf86MapDomainIO - map I/O space in this domain
239 *
240 @@ -698,30 +650,23 @@ xf86MapDomainIO(int ScreenNum, int Flags
241 IOADDRESS Base, unsigned long Size)
242 {
243 int domain = xf86GetPciDomain(Tag);
244 - int fd;
245
246 if ((domain <= 0) || (domain >= MAX_DOMAINS))
247 FatalError("xf86MapDomainIO(): domain out of range\n");
248
249 - if (DomainMmappedIO[domain])
250 - return (IOADDRESS)DomainMmappedIO[domain] + Base;
251 -
252 /* Permanently map all of I/O space */
253 - if ((fd = linuxOpenLegacy(Tag, "legacy_io")) < 0) {
254 - DomainMmappedIO[domain] = linuxMapPci(ScreenNum, Flags, Tag,
255 - 0, linuxGetIOSize(Tag),
256 - PCIIOC_MMAP_IS_IO);
257 - /* ia64 can't mmap legacy IO port space */
258 - if (!DomainMmappedIO[domain])
259 - return Base;
260 - }
261 - else { /* legacy_io file exists, encode fd */
262 - DomainMmappedIO[domain] = (pointer)(fd << 24);
263 + if (!DomainMmappedIO[domain]) {
264 + DomainMmappedIO[domain] = linuxMapPci(ScreenNum, Flags, Tag,
265 + 0, linuxGetIOSize(Tag),
266 + PCIIOC_MMAP_IS_IO);
267 + if (!DomainMmappedIO[domain])
268 + FatalError("xf86MapDomainIO(): mmap() failure\n");
269 }
270
271 return (IOADDRESS)DomainMmappedIO[domain] + Base;
272 }
273
274 +/* +<<<<<<< .merge_file_1mFYhf */
275 /*
276 * xf86ReadDomainMemory - copy from domain memory into a caller supplied buffer
277 */
278 @@ -733,40 +678,6 @@ xf86ReadDomainMemory(PCITAG Tag, ADDRESS
279 unsigned long size;
280 int len, pagemask = getpagesize() - 1;
281
282 - unsigned int i, dom, bus, dev, func;
283 - unsigned int fd;
284 - char file[256];
285 - struct stat st;
286 -
287 - dom = PCI_DOM_FROM_TAG(Tag);
288 - bus = PCI_BUS_FROM_TAG(Tag);
289 - dev = PCI_DEV_FROM_TAG(Tag);
290 - func = PCI_FUNC_FROM_TAG(Tag);
291 - sprintf(file, "/sys/devices/pci%04x:%02x/%04x:%02x:%02x.%1x/rom",
292 - dom, bus, dom, bus, dev, func);
293 -
294 - /*
295 - * If the caller wants the ROM and the sysfs rom interface exists,
296 - * try to use it instead of reading it from /proc/bus/pci.
297 - */
298 - if (((Base & 0xfffff) == 0xC0000) && (stat(file, &st) == 0)) {
299 - if ((fd = open(file, O_RDWR)))
300 - Base = 0x0;
301 -
302 - /* enable the ROM first */
303 - write(fd, "1", 2);
304 - lseek(fd, 0, SEEK_SET);
305 -
306 - /* copy the ROM until we hit Len, EOF or read error */
307 - for (i = 0; i < Len && read(fd, Buf, 1) > 0; Buf++, i++)
308 - ;
309 -
310 - write(fd, "0", 2);
311 - close(fd);
312 -
313 - return Len;
314 - }
315 -
316 /* Ensure page boundaries */
317 offset = Base & ~pagemask;
318 size = ((Base + Len + pagemask) & ~pagemask) - offset;
319 diff --git a/hw/xfree86/os-support/linux/lnx_ia64.c b/hw/xfree86/os-support/linux/lnx_ia64.c
320 index 5f742d0..6580f2e 100644
321 --- a/hw/xfree86/os-support/linux/lnx_ia64.c
322 +++ b/hw/xfree86/os-support/linux/lnx_ia64.c
323 @@ -30,7 +30,6 @@ #endif
324
325 #include <sys/types.h>
326 #include <sys/stat.h>
327 -#include <sys/utsname.h>
328 #include <unistd.h>
329 #include <stdlib.h>
330
331 @@ -41,34 +40,11 @@ #if defined OS_PROBE_PCI_CHIPSET
332 IA64Chipset OS_PROBE_PCI_CHIPSET(scanpciWrapperOpt flags)
333 {
334 struct stat unused;
335 - struct utsname utsName;
336
337 if (!stat("/proc/bus/mckinley/zx1",&unused)
338 || !stat("/proc/bus/mckinley/zx2",&unused))
339 return ZX1_CHIPSET;
340
341 - if (!stat("/proc/sgi_sn/licenseID", &unused)) {
342 - int major, minor, patch;
343 - char *c;
344 -
345 - /* We need a 2.6.11 or better kernel for Altix support */
346 - uname(&utsName);
347 - c = utsName.release;
348 -
349 - major = atoi(c);
350 - c = strstr(c, ".") + 1;
351 - minor = atoi(c);
352 - c = strstr(c, ".") + 1;
353 - patch = atoi(c);
354 -
355 - if (major < 2 || (major == 2 && minor < 6) ||
356 - (major == 2 && minor == 6 && patch < 11)) {
357 - ErrorF("Kernel 2.6.11 or better needed for Altix support\n");
358 - return NONE_CHIPSET;
359 - }
360 - return ALTIX_CHIPSET;
361 - }
362 -
363 return NONE_CHIPSET;
364 }
365 #endif
366 diff --git a/hw/xfree86/os-support/shared/ia64Pci.c b/hw/xfree86/os-support/shared/ia64Pci.c
367 index 1fe119d..b8e13cd 100644
368 --- a/hw/xfree86/os-support/shared/ia64Pci.c
369 +++ b/hw/xfree86/os-support/shared/ia64Pci.c
370 @@ -33,165 +33,12 @@ #ifdef HAVE_XORG_CONFIG_H
371 #include <xorg-config.h>
372 #endif
373
374 -#include <fcntl.h>
375 -#include <unistd.h>
376 -#include <signal.h>
377 -#include <dirent.h>
378 -#include <sys/types.h>
379 -#include <sys/stat.h>
380 -#include <sys/ioctl.h>
381 -#include <linux/pci.h>
382 -
383 -#include "compiler.h"
384 #include "460gxPCI.h"
385 #include "e8870PCI.h"
386 #include "zx1PCI.h"
387 -#include "altixPCI.h"
388 #include "Pci.h"
389 #include "ia64Pci.h"
390
391 -/*
392 - * We use special in/out routines here since Altix platforms require the
393 - * use of the sysfs legacy_io interface. The legacy_io file maps to the I/O
394 - * space of a given PCI domain; reads and writes are used to do port I/O.
395 - * The file descriptor for the file is stored in the upper bits of the
396 - * value passed in by the caller, and is created and populated by
397 - * xf86MapDomainIO.
398 - *
399 - * If the legacy_io interface doesn't exist, we fall back to the glibc in/out
400 - * routines, which are prefixed by an underscore (e.g. _outb).
401 - */
402 -static int ia64_port_to_fd(unsigned long port)
403 -{
404 - return (port >> 24) & 0xffffffff;
405 -}
406 -
407 -_X_EXPORT void outb(unsigned long port, unsigned char val)
408 -{
409 - int fd = ia64_port_to_fd(port);
410 -
411 - if (!fd) {
412 - _outb(val, port & 0xffff);
413 - goto out;
414 - }
415 - if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
416 - ErrorF("I/O lseek failed\n");
417 - goto out;
418 - }
419 - if (write(fd, &val, 1) != 1) {
420 - ErrorF("I/O write failed\n");
421 - goto out;
422 - }
423 - out:
424 - return;
425 -}
426 -
427 -_X_EXPORT void outw(unsigned long port, unsigned short val)
428 -{
429 - int fd = ia64_port_to_fd(port);
430 -
431 - if (!fd) {
432 - _outw(val, port & 0xffff);
433 - goto out;
434 - }
435 - if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
436 - ErrorF("I/O lseek failed\n");
437 - goto out;
438 - }
439 - if (write(fd, &val, 2) != 2) {
440 - ErrorF("I/O write failed\n");
441 - goto out;
442 - }
443 - out:
444 - return;
445 -}
446 -
447 -_X_EXPORT void outl(unsigned long port, unsigned int val)
448 -{
449 - int fd = ia64_port_to_fd(port);
450 -
451 - if (!fd) {
452 - _outl(val, port & 0xffff);
453 - goto out;
454 - }
455 - if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
456 - ErrorF("I/O lseek failed\n");
457 - goto out;
458 - }
459 - if (write(fd, &val, 4) != 4) {
460 - ErrorF("I/O write failed\n");
461 - goto out;
462 - }
463 - out:
464 - return;
465 -}
466 -
467 -_X_EXPORT unsigned int inb(unsigned long port)
468 -{
469 - int fd = ia64_port_to_fd(port);
470 - unsigned char val;
471 -
472 - if (!fd)
473 - return _inb(port & 0xffff);
474 -
475 - if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
476 - ErrorF("I/O lseek failed\n");
477 - val = -1;
478 - goto out;
479 - }
480 - if (read(fd, &val, 1) != 1) {
481 - ErrorF("I/O read failed\n");
482 - val = -1;
483 - goto out;
484 - }
485 - out:
486 - return val;
487 -}
488 -
489 -_X_EXPORT unsigned int inw(unsigned long port)
490 -{
491 - int fd = ia64_port_to_fd(port);
492 - unsigned short val;
493 -
494 - if (!fd)
495 - return _inw(port & 0xffff);
496 -
497 - if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
498 - ErrorF("I/O lseek failed\n");
499 - val = -1;
500 - goto out;
501 - }
502 - if (read(fd, &val, 2) != 2) {
503 - ErrorF("I/O read failed\n");
504 - val = -1;
505 - goto out;
506 - }
507 - out:
508 - return val;
509 -}
510 -
511 -_X_EXPORT unsigned int inl(unsigned long port)
512 -{
513 - int fd = ia64_port_to_fd(port);
514 - unsigned int val;
515 -
516 - if (!fd)
517 - return _inl(port & 0xffff);
518 -
519 - if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
520 - ErrorF("I/O lseek failed\n");
521 - val = -1;
522 - goto out;
523 - }
524 - if (read(fd, &val, 4) != 4) {
525 - ErrorF("I/O read failed\n");
526 - val = -1;
527 - goto out;
528 - }
529 - out:
530 - return val;
531 -}
532 -
533 void
534 ia64ScanPCIWrapper(scanpciWrapperOpt flags)
535 {
536 @@ -215,9 +62,6 @@ #ifdef OS_PROBE_PCI_CHIPSET
537 case ZX1_CHIPSET:
538 xf86PreScanZX1();
539 return;
540 - case ALTIX_CHIPSET:
541 - xf86PreScanAltix();
542 - return;
543 default:
544 return;
545 }
546 @@ -234,9 +78,6 @@ #endif
547 case ZX1_CHIPSET:
548 xf86PostScanZX1();
549 return;
550 - case ALTIX_CHIPSET:
551 - xf86PostScanAltix();
552 - return;
553 default:
554 return;
555 }
556 diff --git a/hw/xfree86/os-support/shared/ia64Pci.h b/hw/xfree86/os-support/shared/ia64Pci.h
557 index 978c9ff..ccd6c24 100644
558 --- a/hw/xfree86/os-support/shared/ia64Pci.h
559 +++ b/hw/xfree86/os-support/shared/ia64Pci.h
560 @@ -36,8 +36,7 @@ typedef enum {
561 NONE_CHIPSET,
562 I460GX_CHIPSET,
563 E8870_CHIPSET,
564 - ZX1_CHIPSET,
565 - ALTIX_CHIPSET
566 + ZX1_CHIPSET
567 } IA64Chipset;
568
569 # ifdef OS_PROBE_PCI_CHIPSET
570 diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
571 index 83ce9ed..4d42917 100644
572 --- a/hw/xfree86/os-support/xf86_OSproc.h
573 +++ b/hw/xfree86/os-support/xf86_OSproc.h
574 @@ -262,8 +262,6 @@ resPtr xf86AccResFromOS(resPtr ret);
575 #endif /* NEED_OS_RAC_PROTOS */
576
577 extern Bool xf86GetPciSizeFromOS(PCITAG tag, int indx, int* bits);
578 -extern Bool xf86GetPciOffsetFromOS(PCITAG tag, int indx, unsigned long* bases);
579 -extern unsigned long xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base);
580
581 extern void xf86MakeNewMapping(int, int, unsigned long, unsigned long, pointer);
582 extern void xf86InitVidMem(void);

  ViewVC Help
Powered by ViewVC 1.1.20