qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

screenFd -> consoleFd conversions that were missed in xserver 1.12 import.

Browse Source
This commit is contained in:
matthieu 2012-06-16 15:08:08 +00:00
parent aacc4fff98
commit baeff29842
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xserver/hw/xfree86/os-support/bsd/hp300_video.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: hp300_video.c,v 1.3 2008/02/16 21:40:29 miod Exp $ */ /* $OpenBSD: hp300_video.c,v 1.4 2012/06/16 15:08:08 matthieu Exp $ */
/* /*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
* Copyright 1993 by David Wexelblat <dwex@goblin.org> * Copyright 1993 by David Wexelblat <dwex@goblin.org>
@ -60,7 +60,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
static pointer static pointer
hp300MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) hp300MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
{ {
int fd = xf86Info.screenFd; int fd = xf86Info.consoleFd;
pointer base; pointer base;
#ifdef DEBUG #ifdef DEBUG

6
xserver/hw/xfree86/os-support/bsd/hppa_video.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: hppa_video.c,v 1.6 2012/06/10 13:21:25 matthieu Exp $ */ /* $OpenBSD: hppa_video.c,v 1.7 2012/06/16 15:08:08 matthieu Exp $ */
/* /*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
* Copyright 1993 by David Wexelblat <dwex@goblin.org> * Copyright 1993 by David Wexelblat <dwex@goblin.org>
@ -57,7 +57,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
pVidMem->mapMem = hppaMapVidMem; pVidMem->mapMem = hppaMapVidMem;
pVidMem->unmapMem = hppaUnmapVidMem; pVidMem->unmapMem = hppaUnmapVidMem;
#if HAVE_PCI_SYSTEM_INIT_DEV_MEM #if HAVE_PCI_SYSTEM_INIT_DEV_MEM
pci_system_init_dev_mem(xf86Info.screenFd); pci_system_init_dev_mem(xf86Info.consoleFd);
#endif #endif
pVidMem->initialised = TRUE; pVidMem->initialised = TRUE;
} }
@ -68,7 +68,7 @@ volatile unsigned char *ioBase = MAP_FAILED;
static pointer static pointer
hppaMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) hppaMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
{ {
int fd = xf86Info.screenFd; int fd = xf86Info.consoleFd;
pointer base; pointer base;
#ifdef DEBUG #ifdef DEBUG

2
xserver/hw/xfree86/os-support/bsd/sgi_video.c
View File

@ -58,7 +58,7 @@ static pointer
sgiMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, sgiMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size,
int flags) int flags)
{ {
int fd = xf86Info.screenFd; int fd = xf86Info.consoleFd;
pointer base; pointer base;
#ifdef DEBUG #ifdef DEBUG