diff options
author | marha <marha@users.sourceforge.net> | 2009-12-02 17:33:15 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-12-02 17:33:15 +0000 |
commit | 314d225f3a60cc0ea63c292a2c2ffe3609e7c739 (patch) | |
tree | 181562a86ee74db9182bd9b60d258d3fed6642ee /xorg-server/hw/xfree86/os-support/linux/lnx_video.c | |
parent | 4ac4a5b7ce8cc8f195d69a42da10d386eaa5c056 (diff) | |
download | vcxsrv-314d225f3a60cc0ea63c292a2c2ffe3609e7c739.tar.gz vcxsrv-314d225f3a60cc0ea63c292a2c2ffe3609e7c739.tar.bz2 vcxsrv-314d225f3a60cc0ea63c292a2c2ffe3609e7c739.zip |
Xserver git update
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/linux/lnx_video.c')
-rw-r--r-- | xorg-server/hw/xfree86/os-support/linux/lnx_video.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c index e159f4691..26a17425a 100644 --- a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c +++ b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c @@ -73,15 +73,9 @@ extern int iopl(int __level); #endif #ifdef __alpha__ - -extern void sethae(unsigned long hae); - # define BUS_BASE bus_base - #else - #define BUS_BASE (0) - #endif /* __alpha__ */ /***************************************************************************/ @@ -91,6 +85,10 @@ extern void sethae(unsigned long hae); static pointer mapVidMem(int, unsigned long, unsigned long, int); static void unmapVidMem(int, pointer, unsigned long); #if defined (__alpha__) +extern void sethae(unsigned long hae); +extern unsigned long _bus_base __P ((void)) __attribute__ ((const)); +extern unsigned long _bus_base_sparse __P ((void)) __attribute__ ((const)); + static pointer mapVidMemSparse(int, unsigned long, unsigned long, int); extern axpDevice lnxGetAXP(void); static void unmapVidMemSparse(int, pointer, unsigned long); @@ -99,7 +97,6 @@ static Bool needSparse; static unsigned long hae_thresh; static unsigned long hae_mask; static unsigned long bus_base; -static unsigned long sparse_size; #endif #ifdef HAS_MTRR_SUPPORT @@ -375,7 +372,6 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) if ((needSparse = (_bus_base_sparse() > 0))) { hae_thresh = xf86AXPParams[axpSystem].hae_thresh; hae_mask = xf86AXPParams[axpSystem].hae_mask; - sparse_size = xf86AXPParams[axpSystem].size; } bus_base = _bus_base(); } |