Remove odd definition DEV_MEM
DEV_MEM defined in xf86_OSlib.h Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
parent
0481e9d3d1
commit
af56e502f5
|
@ -197,7 +197,6 @@ static int devMemFd = -1;
|
||||||
#ifdef HAS_APERTURE_DRV
|
#ifdef HAS_APERTURE_DRV
|
||||||
#define DEV_APERTURE "/dev/xf86"
|
#define DEV_APERTURE "/dev/xf86"
|
||||||
#endif
|
#endif
|
||||||
#define DEV_MEM "/dev/mem"
|
|
||||||
|
|
||||||
static pointer mapVidMem(int, unsigned long, unsigned long, int);
|
static pointer mapVidMem(int, unsigned long, unsigned long, int);
|
||||||
static void unmapVidMem(int, pointer, unsigned long);
|
static void unmapVidMem(int, pointer, unsigned long);
|
||||||
|
|
|
@ -113,8 +113,6 @@ struct memAccess ioMemInfo = { CONSOLE_GET_IO_INFO, NULL, NULL,
|
||||||
static Bool useDevMem = FALSE;
|
static Bool useDevMem = FALSE;
|
||||||
static int devMemFd = -1;
|
static int devMemFd = -1;
|
||||||
|
|
||||||
#define DEV_MEM "/dev/mem"
|
|
||||||
|
|
||||||
static pointer mapVidMem(int, unsigned long, unsigned long, int);
|
static pointer mapVidMem(int, unsigned long, unsigned long, int);
|
||||||
static void unmapVidMem(int, pointer, unsigned long);
|
static void unmapVidMem(int, pointer, unsigned long);
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,6 @@ static int devMemFd = -1;
|
||||||
#ifdef HAS_APERTURE_DRV
|
#ifdef HAS_APERTURE_DRV
|
||||||
#define DEV_APERTURE "/dev/xf86"
|
#define DEV_APERTURE "/dev/xf86"
|
||||||
#endif
|
#endif
|
||||||
#define DEV_MEM "/dev/mem"
|
|
||||||
|
|
||||||
static pointer mapVidMem(int, unsigned long, unsigned long, int);
|
static pointer mapVidMem(int, unsigned long, unsigned long, int);
|
||||||
static void unmapVidMem(int, pointer, unsigned long);
|
static void unmapVidMem(int, pointer, unsigned long);
|
||||||
|
|
|
@ -45,9 +45,7 @@
|
||||||
/* Video Memory Mapping section */
|
/* Video Memory Mapping section */
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
#ifndef __OpenBSD__
|
#ifdef __OpenBSD__
|
||||||
#define DEV_MEM "/dev/mem"
|
|
||||||
#else
|
|
||||||
#define DEV_MEM "/dev/xf86"
|
#define DEV_MEM "/dev/xf86"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue