2003-11-14 17:48:57 +01:00
|
|
|
/*
|
|
|
|
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
|
|
|
|
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
|
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
|
|
|
* documentation for any purpose is hereby granted without fee, provided that
|
|
|
|
* the above copyright notice appear in all copies and that both that
|
|
|
|
* copyright notice and this permission notice appear in supporting
|
|
|
|
* documentation, and that the names of Rich Murphey and David Wexelblat
|
|
|
|
* not be used in advertising or publicity pertaining to distribution of
|
|
|
|
* the software without specific, written prior permission. Rich Murphey and
|
|
|
|
* David Wexelblat make no representations about the suitability of this
|
|
|
|
* software for any purpose. It is provided "as is" without express or
|
|
|
|
* implied warranty.
|
|
|
|
*
|
|
|
|
* RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
|
|
|
|
* THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
|
|
* FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
|
|
|
|
* ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
|
|
|
|
* RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
|
|
|
|
* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2005-07-03 09:02:09 +02:00
|
|
|
#ifdef HAVE_XORG_CONFIG_H
|
|
|
|
#include <xorg-config.h>
|
|
|
|
#endif
|
|
|
|
|
2005-04-20 14:25:48 +02:00
|
|
|
#include <X11/X.h>
|
2003-11-14 17:48:57 +01:00
|
|
|
#include "xf86.h"
|
|
|
|
#include "xf86Priv.h"
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
#ifndef __NetBSD__
|
|
|
|
# include <sys/sysctl.h>
|
2005-10-03 18:46:14 +02:00
|
|
|
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
2003-11-14 17:48:57 +01:00
|
|
|
# include <machine/sysarch.h>
|
|
|
|
# endif
|
|
|
|
# else
|
|
|
|
# include <machine/sysarch.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "xf86Axp.h"
|
|
|
|
|
|
|
|
#include "xf86_OSlib.h"
|
|
|
|
#include "xf86OSpriv.h"
|
|
|
|
|
|
|
|
#if defined(__NetBSD__) && !defined(MAP_FILE)
|
|
|
|
#define MAP_FLAGS MAP_SHARED
|
|
|
|
#else
|
|
|
|
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef MAP_FAILED
|
|
|
|
#define MAP_FAILED ((caddr_t)-1)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
axpDevice bsdGetAXP(void);
|
|
|
|
|
|
|
|
#ifndef __NetBSD__
|
|
|
|
extern unsigned long dense_base(void);
|
|
|
|
|
|
|
|
static int axpSystem = -1;
|
|
|
|
static unsigned long hae_thresh;
|
|
|
|
static unsigned long hae_mask;
|
|
|
|
static unsigned long bus_base;
|
|
|
|
static unsigned long sparse_size;
|
|
|
|
|
|
|
|
static unsigned long
|
|
|
|
memory_base(void)
|
|
|
|
{
|
|
|
|
static unsigned long base = 0;
|
|
|
|
|
|
|
|
if (base == 0) {
|
|
|
|
size_t len = sizeof(base);
|
|
|
|
int error;
|
|
|
|
#ifdef __OpenBSD__
|
|
|
|
int mib[3];
|
|
|
|
|
|
|
|
mib[0] = CTL_MACHDEP;
|
|
|
|
mib[1] = CPU_CHIPSET;
|
|
|
|
mib[2] = CPU_CHIPSET_MEM;
|
|
|
|
|
|
|
|
if ((error = sysctl(mib, 3, &base, &len, NULL, 0)) < 0)
|
|
|
|
#else
|
|
|
|
if ((error = sysctlbyname("hw.chipset.memory", &base, &len,
|
|
|
|
0, 0)) < 0)
|
|
|
|
#endif
|
|
|
|
FatalError("xf86MapVidMem: can't find memory\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
return base;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
has_bwx(void)
|
|
|
|
{
|
|
|
|
static int bwx = 0;
|
|
|
|
size_t len = sizeof(bwx);
|
|
|
|
int error;
|
|
|
|
#ifdef __OpenBSD__
|
|
|
|
int mib[3];
|
|
|
|
|
|
|
|
mib[0] = CTL_MACHDEP;
|
|
|
|
mib[1] = CPU_CHIPSET;
|
|
|
|
mib[2] = CPU_CHIPSET_BWX;
|
|
|
|
|
|
|
|
if ((error = sysctl(mib, 3, &bwx, &len, NULL, 0)) < 0)
|
|
|
|
return FALSE;
|
|
|
|
else
|
|
|
|
return bwx;
|
|
|
|
#else
|
|
|
|
if ((error = sysctlbyname("hw.chipset.bwx", &bwx, &len, 0, 0)) < 0)
|
|
|
|
return FALSE;
|
|
|
|
else
|
|
|
|
return bwx;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#else /* __NetBSD__ */
|
2005-01-28 17:13:00 +01:00
|
|
|
static unsigned long hae_thresh = (1UL << 24);
|
|
|
|
static unsigned long hae_mask = 0xf8000000UL; /* XXX - should use xf86AXP.c */
|
2003-11-14 17:48:57 +01:00
|
|
|
static struct alpha_bus_window *abw;
|
|
|
|
static int abw_count = -1;
|
|
|
|
|
|
|
|
static void
|
2005-01-28 17:13:00 +01:00
|
|
|
init_abw(void)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
|
|
|
if (abw_count < 0) {
|
|
|
|
abw_count = alpha_bus_getwindows(ALPHA_BUS_TYPE_PCI_MEM, &abw);
|
|
|
|
if (abw_count <= 0)
|
|
|
|
FatalError("init_abw: alpha_bus_getwindows failed\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
has_bwx(void)
|
|
|
|
{
|
|
|
|
if (abw_count < 0)
|
|
|
|
init_abw();
|
|
|
|
|
|
|
|
xf86Msg(X_INFO, "has_bwx = %d\n",
|
|
|
|
abw[0].abw_abst.abst_flags & ABST_BWX ? 1 : 0); /* XXXX */
|
|
|
|
return abw[0].abw_abst.abst_flags & ABST_BWX;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long
|
2005-01-28 17:13:00 +01:00
|
|
|
dense_base(void)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
|
|
|
if (abw_count < 0)
|
|
|
|
init_abw();
|
|
|
|
|
|
|
|
/* XXX check abst_flags for ABST_DENSE just to be safe? */
|
|
|
|
xf86Msg(X_INFO, "dense base = %#lx\n",
|
|
|
|
abw[0].abw_abst.abst_sys_start); /* XXXX */
|
|
|
|
return abw[0].abw_abst.abst_sys_start;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long
|
2005-01-28 17:13:00 +01:00
|
|
|
memory_base(void)
|
2003-11-14 17:48:57 +01:00
|
|
|
{
|
|
|
|
if (abw_count < 0)
|
|
|
|
init_abw();
|
|
|
|
|
2009-02-01 18:12:21 +01:00
|
|
|
if (abw_count > 1) {
|
2003-11-14 17:48:57 +01:00
|
|
|
xf86Msg(X_INFO, "memory base = %#lx\n",
|
|
|
|
abw[1].abw_abst.abst_sys_start); /* XXXX */
|
|
|
|
return abw[1].abw_abst.abst_sys_start;
|
2009-02-01 18:12:21 +01:00
|
|
|
} else if (abw_count == 1) {
|
|
|
|
/* assume memory_base == dense_base */
|
|
|
|
xf86Msg(X_INFO, "memory base = %#lx\n",
|
|
|
|
abw[0].abw_abst.abst_sys_start); /* XXXX */
|
|
|
|
return abw[0].abw_abst.abst_sys_start;
|
2003-11-14 17:48:57 +01:00
|
|
|
} else {
|
|
|
|
xf86Msg(X_INFO, "no memory base\n"); /* XXXX */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* __NetBSD__ */
|
|
|
|
|
|
|
|
#define BUS_BASE dense_base()
|
|
|
|
#define BUS_BASE_BWX memory_base()
|
|
|
|
|
|
|
|
/***************************************************************************/
|
|
|
|
/* Video Memory Mapping section */
|
|
|
|
/***************************************************************************/
|
|
|
|
|
|
|
|
#ifdef __OpenBSD__
|
|
|
|
#define SYSCTL_MSG "\tCheck that you have set 'machdep.allowaperture=1'\n"\
|
|
|
|
"\tin /etc/sysctl.conf and reboot your machine\n" \
|
|
|
|
"\trefer to xf86(4) for details"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static Bool useDevMem = FALSE;
|
|
|
|
static int devMemFd = -1;
|
|
|
|
|
|
|
|
#ifdef HAS_APERTURE_DRV
|
|
|
|
#define DEV_APERTURE "/dev/xf86"
|
|
|
|
#endif
|
|
|
|
#define DEV_MEM "/dev/mem"
|
|
|
|
|
|
|
|
static pointer mapVidMem(int, unsigned long, unsigned long, int);
|
|
|
|
static void unmapVidMem(int, pointer, unsigned long);
|
|
|
|
static pointer mapVidMemSparse(int, unsigned long, unsigned long, int);
|
|
|
|
static void unmapVidMemSparse(int, pointer, unsigned long);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if /dev/mem can be mmap'd. If it can't print a warning when
|
|
|
|
* "warn" is TRUE.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
checkDevMem(Bool warn)
|
|
|
|
{
|
|
|
|
static Bool devMemChecked = FALSE;
|
|
|
|
int fd;
|
|
|
|
pointer base;
|
|
|
|
|
|
|
|
if (devMemChecked)
|
|
|
|
return;
|
|
|
|
devMemChecked = TRUE;
|
|
|
|
|
|
|
|
#ifdef HAS_APERTURE_DRV
|
|
|
|
/* Try the aperture driver first */
|
|
|
|
if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0) {
|
|
|
|
/* Try to map a page at the VGA address */
|
2003-11-25 20:29:01 +01:00
|
|
|
base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
|
2003-11-14 17:48:57 +01:00
|
|
|
MAP_FLAGS, fd, (off_t)0xA0000 + BUS_BASE);
|
|
|
|
|
|
|
|
if (base != MAP_FAILED) {
|
|
|
|
munmap((caddr_t)base, 4096);
|
|
|
|
devMemFd = fd;
|
|
|
|
useDevMem = TRUE;
|
|
|
|
xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
|
|
|
|
DEV_APERTURE);
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
if (warn) {
|
|
|
|
xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
|
|
|
|
DEV_APERTURE, strerror(errno));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if ((fd = open(DEV_MEM, O_RDWR)) >= 0) {
|
|
|
|
/* Try to map a page at the VGA address */
|
2003-11-25 20:29:01 +01:00
|
|
|
base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
|
2003-11-14 17:48:57 +01:00
|
|
|
MAP_FLAGS, fd, (off_t)0xA0000 + BUS_BASE);
|
|
|
|
|
|
|
|
if (base != MAP_FAILED) {
|
|
|
|
munmap((caddr_t)base, 4096);
|
|
|
|
devMemFd = fd;
|
|
|
|
useDevMem = TRUE;
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
if (warn) {
|
|
|
|
xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
|
|
|
|
DEV_MEM, strerror(errno));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (warn) {
|
|
|
|
#ifndef HAS_APERTURE_DRV
|
|
|
|
xf86Msg(X_WARNING, "checkDevMem: failed to open/mmap %s (%s)\n",
|
|
|
|
DEV_MEM, strerror(errno));
|
|
|
|
#else
|
|
|
|
#ifndef __OpenBSD__
|
|
|
|
xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
|
|
|
|
"\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno));
|
|
|
|
#else /* __OpenBSD__ */
|
|
|
|
xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
|
|
|
|
"\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
|
|
|
|
SYSCTL_MSG);
|
|
|
|
#endif /* __OpenBSD__ */
|
|
|
|
#endif
|
|
|
|
xf86ErrorF("\tlinear framebuffer access unavailable\n");
|
|
|
|
}
|
|
|
|
useDevMem = FALSE;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
xf86OSInitVidMem(VidMemInfoPtr pVidMem)
|
|
|
|
{
|
|
|
|
checkDevMem(TRUE);
|
|
|
|
pVidMem->linearSupported = useDevMem;
|
|
|
|
|
|
|
|
if (has_bwx()) {
|
|
|
|
xf86Msg(X_PROBED,"Machine type has 8/16 bit access\n");
|
|
|
|
pVidMem->mapMem = mapVidMem;
|
|
|
|
pVidMem->unmapMem = unmapVidMem;
|
|
|
|
} else {
|
|
|
|
xf86Msg(X_PROBED,"Machine needs sparse mapping\n");
|
|
|
|
pVidMem->mapMem = mapVidMemSparse;
|
|
|
|
pVidMem->unmapMem = unmapVidMemSparse;
|
2005-01-28 17:13:00 +01:00
|
|
|
#ifndef __NetBSD__
|
2003-11-14 17:48:57 +01:00
|
|
|
if (axpSystem == -1)
|
|
|
|
axpSystem = bsdGetAXP();
|
|
|
|
hae_thresh = xf86AXPParams[axpSystem].hae_thresh;
|
|
|
|
hae_mask = xf86AXPParams[axpSystem].hae_mask;
|
|
|
|
sparse_size = xf86AXPParams[axpSystem].size;
|
2005-01-28 17:13:00 +01:00
|
|
|
#endif /* __NetBSD__ */
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
pVidMem->initialised = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static pointer
|
|
|
|
mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
|
|
|
|
{
|
|
|
|
pointer base;
|
|
|
|
|
|
|
|
checkDevMem(FALSE);
|
|
|
|
Base = Base & ((1L<<32) - 1);
|
|
|
|
|
|
|
|
if (useDevMem)
|
|
|
|
{
|
|
|
|
if (devMemFd < 0)
|
|
|
|
{
|
|
|
|
FatalError("xf86MapVidMem: failed to open %s (%s)\n",
|
|
|
|
DEV_MEM, strerror(errno));
|
|
|
|
}
|
2003-11-25 20:29:01 +01:00
|
|
|
base = mmap((caddr_t)0, Size,
|
|
|
|
(flags & VIDMEM_READONLY) ?
|
|
|
|
PROT_READ : (PROT_READ | PROT_WRITE),
|
|
|
|
MAP_FLAGS, devMemFd, (off_t)Base + BUS_BASE_BWX);
|
2003-11-14 17:48:57 +01:00
|
|
|
if (base == MAP_FAILED)
|
|
|
|
{
|
2005-01-28 17:13:00 +01:00
|
|
|
FatalError("%s: could not mmap %s [s=%lx,a=%lx] (%s)\n",
|
2003-11-14 17:48:57 +01:00
|
|
|
"xf86MapVidMem", DEV_MEM, Size, Base,
|
|
|
|
strerror(errno));
|
|
|
|
}
|
2010-06-06 16:18:40 +02:00
|
|
|
return base;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* else, mmap /dev/vga */
|
|
|
|
if ((unsigned long)Base < 0xA0000 || (unsigned long)Base >= 0xC0000)
|
|
|
|
{
|
2005-01-28 17:13:00 +01:00
|
|
|
FatalError("%s: Address 0x%lx outside allowable range\n",
|
2003-11-14 17:48:57 +01:00
|
|
|
"xf86MapVidMem", Base);
|
|
|
|
}
|
2003-11-25 20:29:01 +01:00
|
|
|
base = mmap(0, Size,
|
|
|
|
(flags & VIDMEM_READONLY) ?
|
|
|
|
PROT_READ : (PROT_READ | PROT_WRITE),
|
2011-08-26 14:54:01 +02:00
|
|
|
MAP_FLAGS, xf86Info.consoleFd,
|
2003-11-25 20:29:01 +01:00
|
|
|
(unsigned long)Base + BUS_BASE);
|
2003-11-14 17:48:57 +01:00
|
|
|
if (base == MAP_FAILED)
|
|
|
|
{
|
|
|
|
FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n",
|
|
|
|
strerror(errno));
|
|
|
|
}
|
2010-06-06 16:18:40 +02:00
|
|
|
return base;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
|
|
|
|
{
|
|
|
|
munmap((caddr_t)Base, Size);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read BIOS via mmap()ing DEV_MEM
|
|
|
|
*/
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2003-11-14 17:48:57 +01:00
|
|
|
xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
|
|
|
|
int Len)
|
|
|
|
{
|
|
|
|
unsigned char *ptr;
|
|
|
|
int psize;
|
|
|
|
int mlen;
|
|
|
|
|
|
|
|
checkDevMem(TRUE);
|
|
|
|
if (devMemFd == -1) {
|
2010-06-06 16:18:40 +02:00
|
|
|
return -1;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
|
2007-12-04 00:34:40 +01:00
|
|
|
psize = getpagesize();
|
2003-11-14 17:48:57 +01:00
|
|
|
Offset += Base & (psize - 1);
|
|
|
|
Base &= ~(psize - 1);
|
|
|
|
mlen = (Offset + Len + psize - 1) & ~(psize - 1);
|
|
|
|
ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ,
|
|
|
|
MAP_SHARED, devMemFd, (off_t)Base+BUS_BASE);
|
|
|
|
if ((long)ptr == -1)
|
|
|
|
{
|
|
|
|
xf86Msg(X_WARNING,
|
2005-01-28 17:13:00 +01:00
|
|
|
"xf86ReadBIOS: %s mmap[s=%x,a=%lx,o=%lx] failed (%s)\n",
|
2003-11-14 17:48:57 +01:00
|
|
|
DEV_MEM, Len, Base, Offset, strerror(errno));
|
2010-06-06 16:18:40 +02:00
|
|
|
return -1;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
|
|
xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
|
|
|
|
Base, ptr[0] | (ptr[1] << 8));
|
|
|
|
#endif
|
|
|
|
(void)memcpy(Buf, (void *)(ptr + Offset), Len);
|
|
|
|
(void)munmap((caddr_t)ptr, mlen);
|
|
|
|
#ifdef DEBUG
|
|
|
|
xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
|
|
|
|
"-> %02x %02x %02x %02x...\n",
|
|
|
|
Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
|
|
|
|
#endif
|
2010-06-06 16:18:40 +02:00
|
|
|
return Len;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-10-03 18:46:14 +02:00
|
|
|
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
|
2003-11-14 17:48:57 +01:00
|
|
|
|
|
|
|
extern int ioperm(unsigned long from, unsigned long num, int on);
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2003-11-14 17:48:57 +01:00
|
|
|
xf86EnableIO()
|
|
|
|
{
|
2005-01-28 17:13:00 +01:00
|
|
|
if (!ioperm(0, 65536, TRUE))
|
|
|
|
return TRUE;
|
|
|
|
return FALSE;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2003-11-14 17:48:57 +01:00
|
|
|
xf86DisableIO()
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-10-03 18:46:14 +02:00
|
|
|
#endif /* __FreeBSD_kernel__ || __OpenBSD__ */
|
2003-11-14 17:48:57 +01:00
|
|
|
|
|
|
|
#ifdef USE_ALPHA_PIO
|
|
|
|
|
2005-01-28 17:13:00 +01:00
|
|
|
Bool
|
2003-11-14 17:48:57 +01:00
|
|
|
xf86EnableIO()
|
|
|
|
{
|
|
|
|
alpha_pci_io_enable(1);
|
2005-01-28 17:13:00 +01:00
|
|
|
return TRUE;
|
2003-11-14 17:48:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
xf86DisableIO()
|
|
|
|
{
|
|
|
|
alpha_pci_io_enable(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* USE_ALPHA_PIO */
|
|
|
|
|
|
|
|
#define vuip volatile unsigned int *
|
|
|
|
|
|
|
|
static unsigned long msb_set = 0;
|
|
|
|
static pointer memSBase = 0;
|
|
|
|
static pointer memBase = 0;
|
|
|
|
|
|
|
|
extern int readDense8(pointer Base, register unsigned long Offset);
|
|
|
|
extern int readDense16(pointer Base, register unsigned long Offset);
|
|
|
|
extern int readDense32(pointer Base, register unsigned long Offset);
|
|
|
|
extern void
|
|
|
|
writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
extern void
|
|
|
|
writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
extern void
|
|
|
|
writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
extern void
|
|
|
|
writeDense8(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
extern void
|
|
|
|
writeDense16(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
extern void
|
|
|
|
writeDense32(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
|
|
|
|
static int readSparse8(pointer Base, register unsigned long Offset);
|
|
|
|
static int readSparse16(pointer Base, register unsigned long Offset);
|
|
|
|
static int readSparse32(pointer Base, register unsigned long Offset);
|
|
|
|
static void
|
|
|
|
writeSparseNB8(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
static void
|
|
|
|
writeSparseNB16(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
static void
|
|
|
|
writeSparseNB32(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
static void
|
|
|
|
writeSparse8(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
static void
|
|
|
|
writeSparse16(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
static void
|
|
|
|
writeSparse32(int Value, pointer Base, register unsigned long Offset);
|
|
|
|
|
2005-10-03 18:46:14 +02:00
|
|
|
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
2005-05-10 01:42:26 +02:00
|
|
|
extern int sysarch(int, void *);
|
2003-11-14 17:48:57 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
struct parms {
|
|
|
|
u_int64_t hae;
|
|
|
|
};
|
|
|
|
|
2005-01-28 17:13:00 +01:00
|
|
|
#ifndef __NetBSD__
|
2003-11-14 17:48:57 +01:00
|
|
|
static int
|
|
|
|
sethae(u_int64_t hae)
|
|
|
|
{
|
2005-10-03 18:46:14 +02:00
|
|
|
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
2003-11-14 17:48:57 +01:00
|
|
|
#ifndef ALPHA_SETHAE
|
|
|
|
#define ALPHA_SETHAE 0
|
|
|
|
#endif
|
|
|
|
struct parms p;
|
|
|
|
p.hae = hae;
|
|
|
|
return (sysarch(ALPHA_SETHAE, (char *)&p));
|
|
|
|
#endif
|
|
|
|
#ifdef __OpenBSD__
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
}
|
2005-01-28 17:13:00 +01:00
|
|
|
#endif /* __NetBSD__ */
|
2003-11-14 17:48:57 +01:00
|
|
|
|
|
|
|
static pointer
|
|
|
|
mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
|
|
|
|
{
|
|
|
|
static Bool was_here = FALSE;
|
|
|
|
|
|
|
|
if (!was_here) {
|
|
|
|
was_here = TRUE;
|
|
|
|
|
|
|
|
checkDevMem(FALSE);
|
|
|
|
|
|
|
|
xf86WriteMmio8 = writeSparse8;
|
|
|
|
xf86WriteMmio16 = writeSparse16;
|
|
|
|
xf86WriteMmio32 = writeSparse32;
|
|
|
|
xf86WriteMmioNB8 = writeSparseNB8;
|
|
|
|
xf86WriteMmioNB16 = writeSparseNB16;
|
|
|
|
xf86WriteMmioNB32 = writeSparseNB32;
|
|
|
|
xf86ReadMmio8 = readSparse8;
|
|
|
|
xf86ReadMmio16 = readSparse16;
|
|
|
|
xf86ReadMmio32 = readSparse32;
|
|
|
|
|
|
|
|
memBase = mmap((caddr_t)0, 0x100000000,
|
|
|
|
PROT_READ | PROT_WRITE,
|
|
|
|
MAP_SHARED, devMemFd,
|
|
|
|
(off_t) BUS_BASE);
|
|
|
|
memSBase = mmap((caddr_t)0, 0x100000000,
|
|
|
|
PROT_READ | PROT_WRITE,
|
|
|
|
MAP_SHARED, devMemFd,
|
|
|
|
(off_t) BUS_BASE_BWX);
|
|
|
|
|
|
|
|
if (memSBase == MAP_FAILED || memBase == MAP_FAILED) {
|
|
|
|
FatalError("xf86MapVidMem: Could not mmap framebuffer (%s)\n",
|
|
|
|
strerror(errno));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (pointer)((unsigned long)memBase + Base);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
unmapVidMemSparse(int ScreenNum, pointer Base, unsigned long Size)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
readSparse8(pointer Base, register unsigned long Offset)
|
|
|
|
{
|
|
|
|
register unsigned long result, shift;
|
|
|
|
register unsigned long msb;
|
|
|
|
mem_barrier();
|
|
|
|
Offset += (unsigned long)Base - (unsigned long)memBase;
|
|
|
|
shift = (Offset & 0x3) << 3;
|
|
|
|
if (Offset >= (hae_thresh)) {
|
|
|
|
msb = Offset & hae_mask;
|
|
|
|
Offset -= msb;
|
|
|
|
if (msb_set != msb) {
|
2005-01-28 17:13:00 +01:00
|
|
|
#ifndef __NetBSD__
|
2003-11-14 17:48:57 +01:00
|
|
|
sethae(msb);
|
2005-01-28 17:13:00 +01:00
|
|
|
#endif
|
2003-11-14 17:48:57 +01:00
|
|
|
msb_set = msb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
result = *(vuip) ((unsigned long)memSBase + (Offset << 5));
|
|
|
|
result >>= shift;
|
|
|
|
return 0xffUL & result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
readSparse16(pointer Base, register unsigned long Offset)
|
|
|
|
{
|
|
|
|
register unsigned long result, shift;
|
|
|
|
register unsigned long msb;
|
|
|
|
|
|
|
|
mem_barrier();
|
|
|
|
Offset += (unsigned long)Base - (unsigned long)memBase;
|
|
|
|
shift = (Offset & 0x2) << 3;
|
|
|
|
if (Offset >= (hae_thresh)) {
|
|
|
|
msb = Offset & hae_mask;
|
|
|
|
Offset -= msb;
|
|
|
|
if (msb_set != msb) {
|
2005-01-28 17:13:00 +01:00
|
|
|
#ifndef __NetBSD__
|
2003-11-14 17:48:57 +01:00
|
|
|
sethae(msb);
|
2005-01-28 17:13:00 +01:00
|
|
|
#endif
|
2003-11-14 17:48:57 +01:00
|
|
|
msb_set = msb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
result = *(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2)));
|
|
|
|
result >>= shift;
|
|
|
|
return 0xffffUL & result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
readSparse32(pointer Base, register unsigned long Offset)
|
|
|
|
{
|
|
|
|
mem_barrier();
|
|
|
|
return *(vuip)((unsigned long)Base+(Offset));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
writeSparse8(int Value, pointer Base, register unsigned long Offset)
|
|
|
|
{
|
|
|
|
register unsigned long msb;
|
|
|
|
register unsigned int b = Value & 0xffU;
|
|
|
|
|
|
|
|
write_mem_barrier();
|
|
|
|
Offset += (unsigned long)Base - (unsigned long)memBase;
|
|
|
|
if (Offset >= (hae_thresh)) {
|
|
|
|
msb = Offset & hae_mask;
|
|
|
|
Offset -= msb;
|
|
|
|
if (msb_set != msb) {
|
2005-01-28 17:13:00 +01:00
|
|
|
#ifndef __NetBSD__
|
2003-11-14 17:48:57 +01:00
|
|
|
sethae(msb);
|
2005-01-28 17:13:00 +01:00
|
|
|
#endif
|
2003-11-14 17:48:57 +01:00
|
|
|
msb_set = msb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*(vuip) ((unsigned long)memSBase + (Offset << 5)) = b * 0x01010101;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
writeSparse16(int Value, pointer Base, register unsigned long Offset)
|
|
|
|
{
|
|
|
|
register unsigned long msb;
|
|
|
|
register unsigned int w = Value & 0xffffU;
|
|
|
|
|
|
|
|
write_mem_barrier();
|
|
|
|
Offset += (unsigned long)Base - (unsigned long)memBase;
|
|
|
|
if (Offset >= (hae_thresh)) {
|
|
|
|
msb = Offset & hae_mask;
|
|
|
|
Offset -= msb;
|
|
|
|
if (msb_set != msb) {
|
2005-01-28 17:13:00 +01:00
|
|
|
#ifndef __NetBSD__
|
2003-11-14 17:48:57 +01:00
|
|
|
sethae(msb);
|
2005-01-28 17:13:00 +01:00
|
|
|
#endif
|
2003-11-14 17:48:57 +01:00
|
|
|
msb_set = msb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2))) =
|
|
|
|
w * 0x00010001;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
writeSparse32(int Value, pointer Base, register unsigned long Offset)
|
|
|
|
{
|
|
|
|
write_mem_barrier();
|
|
|
|
*(vuip)((unsigned long)Base + (Offset)) = Value;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
writeSparseNB8(int Value, pointer Base, register unsigned long Offset)
|
|
|
|
{
|
|
|
|
register unsigned long msb;
|
|
|
|
register unsigned int b = Value & 0xffU;
|
|
|
|
|
|
|
|
Offset += (unsigned long)Base - (unsigned long)memBase;
|
|
|
|
if (Offset >= (hae_thresh)) {
|
|
|
|
msb = Offset & hae_mask;
|
|
|
|
Offset -= msb;
|
|
|
|
if (msb_set != msb) {
|
2005-01-28 17:13:00 +01:00
|
|
|
#ifndef __NetBSD__
|
2003-11-14 17:48:57 +01:00
|
|
|
sethae(msb);
|
2005-01-28 17:13:00 +01:00
|
|
|
#endif
|
2003-11-14 17:48:57 +01:00
|
|
|
msb_set = msb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*(vuip) ((unsigned long)memSBase + (Offset << 5)) = b * 0x01010101;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
writeSparseNB16(int Value, pointer Base, register unsigned long Offset)
|
|
|
|
{
|
|
|
|
register unsigned long msb;
|
|
|
|
register unsigned int w = Value & 0xffffU;
|
|
|
|
|
|
|
|
Offset += (unsigned long)Base - (unsigned long)memBase;
|
|
|
|
if (Offset >= (hae_thresh)) {
|
|
|
|
msb = Offset & hae_mask ;
|
|
|
|
Offset -= msb;
|
|
|
|
if (msb_set != msb) {
|
2005-01-28 17:13:00 +01:00
|
|
|
#ifndef __NetBSD__
|
2003-11-14 17:48:57 +01:00
|
|
|
sethae(msb);
|
2005-01-28 17:13:00 +01:00
|
|
|
#endif
|
2003-11-14 17:48:57 +01:00
|
|
|
msb_set = msb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2))) =
|
|
|
|
w * 0x00010001;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
writeSparseNB32(int Value, pointer Base, register unsigned long Offset)
|
|
|
|
{
|
|
|
|
*(vuip)((unsigned long)Base + (Offset)) = Value;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset)
|
2003-11-14 17:48:57 +01:00
|
|
|
= writeDense8;
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset)
|
2003-11-14 17:48:57 +01:00
|
|
|
= writeDense16;
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset)
|
2003-11-14 17:48:57 +01:00
|
|
|
= writeDense32;
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset)
|
2003-11-14 17:48:57 +01:00
|
|
|
= writeDenseNB8;
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset)
|
2003-11-14 17:48:57 +01:00
|
|
|
= writeDenseNB16;
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset)
|
2003-11-14 17:48:57 +01:00
|
|
|
= writeDenseNB32;
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int (*xf86ReadMmio8)(pointer Base, unsigned long Offset)
|
2003-11-14 17:48:57 +01:00
|
|
|
= readDense8;
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int (*xf86ReadMmio16)(pointer Base, unsigned long Offset)
|
2003-11-14 17:48:57 +01:00
|
|
|
= readDense16;
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int (*xf86ReadMmio32)(pointer Base, unsigned long Offset)
|
2003-11-14 17:48:57 +01:00
|
|
|
= readDense32;
|
|
|
|
|