tech-x11 archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
xorg for alpha: it's there !
Hi,
I got our in-tree xorg to work properly on alpha. I tested the
glint, mga, s3, s3virge, tga and vga drivers on both PWS500 (ev56, non-BWX)
and XP1000 (ev6, BWX) platforms. All of them works as expected, and
X -configure is working too. Some of them needs Int10 to be disabled,
I think because xorg's PC emulator is incomplete (it complains about
non-implemented instructions when running the adapter's BIOS).
There a 2 attached patches for this: the first one adds alpha support
to our Makefiles, sets lists, etc ...
The second one fixes 3 issues in the xorg distrib:
- xf86sym.c: in?/out? are macro to a function pointer on NetBSD/alpha, so
SYMFUNC can't work here. Just don't SYMFUNC() these on NetBSD/alpha.
Should be no problems to get it upstream
- alpha_video.c:
on the XP1000, the abw[] array is only one element (there's no
sparse mapping), so make memory_base() return the same as dense_base()
in this case instead of returning a bogus value read out of bound from
abw[] (checking FreeBSD and OpenBSD kernel sources it's the right thing
TO do). This is NetBSD-specific code so should be no problems to get it
upstream
- bsd_ev56.c: To read/write byte or word from the dense mapping we
have to use the appropriate assembly instructions. The C code here
would always read 32bits, discarding 16 or 24 or then, or write
32bits though a read/modify/write. This is bad because you don't know
what the registers next to the one you're reading/writing it.
If it's e.g. one side of a fifo, you write extra values or discard
data from it, and you loose.
This code is common to all BSDs/alpha (and so it broken for others too).
OpenBSD has <machine/bwx.h> and the alpha_* byte/word macros, so it
should work here. FreeBSD has dropped alpha support so I don't know
if we should really care.
Now before alpha can be switched to xorg we need to support the
turbochannel video adapters driven by XdecNetBSD or XalphaNetBSD.
I think the easiest would be to convert the kernel drivers for these
to wscons and use xorg's wsfb but I've not way to test this. Any
takers ?
--
Manuel Bouyer, LIP6, Universite Paris VI.
Manuel.Bouyer%lip6.fr@localhost
NetBSD: 26 ans d'experience feront toujours la difference
--
Index: distrib/sets/lists/xserver/md.alpha
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xserver/md.alpha,v
retrieving revision 1.12
diff -u -p -u -r1.12 md.alpha
--- distrib/sets/lists/xserver/md.alpha 2 Sep 2008 02:17:48 -0000 1.12
+++ distrib/sets/lists/xserver/md.alpha 15 Jan 2009 22:28:04 -0000
@@ -6,3 +6,367 @@
./usr/X11R6/man/cat1/Xvfb.0 -unknown- .cat,x11
./usr/X11R6/man/html1/Xvfb.html -unknown-
html,x11
./usr/X11R6/man/man1/Xvfb.1 -unknown- .man,x11
+./usr/X11R7/bin/X -unknown- xorg
+./usr/X11R7/bin/Xnest -unknown- xorg
+./usr/X11R7/bin/Xorg -unknown- xorg
+./usr/X11R7/bin/Xvfb -unknown- xorg
+./usr/X11R7/bin/gtf -unknown- xorg
+./usr/X11R7/bin/pcitweak -unknown- xorg
+./usr/X11R7/bin/scanpci -unknown-
xorg
+./usr/X11R7/bin/xorgconfig -unknown- xorg
+./usr/X11R7/lib/X11/doc/README.DRI -unknown- xorg
+./usr/X11R7/lib/X11/doc/README.fonts -unknown- xorg
+./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- xorg
+./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/r128_dri.so -unknown-
xorg
+./usr/X11R7/lib/modules/dri/r128_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/r200_dri.so -unknown-
xorg
+./usr/X11R7/lib/modules/dri/r200_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/r300_dri.so -unknown-
xorg
+./usr/X11R7/lib/modules/dri/r300_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/radeon_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/radeon_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/s3v_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/s3v_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/savage_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/savage_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/sis_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/sis_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown-
xorg
+./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/trident_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/trident_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/apm_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ark_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ast_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ast_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/chips_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1 -unknown-
xorg
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/glint_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/i128_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/i128_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/i740_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/i740_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/imstt_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/imstt_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mach64_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mach64_drv.so.6 -unknown-
xorg
+./usr/X11R7/lib/modules/drivers/mga_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mga_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/nv_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/nv_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/r128_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/r128_drv.so.6 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv.so.6 -unknown-
xorg
+./usr/X11R7/lib/modules/drivers/radeonhd_drv.so -unknown-
xorg
+./usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3virge_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3virge_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/savage_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/savage_drv.so.2 -unknown-
xorg
+./usr/X11R7/lib/modules/drivers/siliconmotion_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/sis_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/sis_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tdfx_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tdfx_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tga_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tga_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/trident_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/trident_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tseng_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libGLcore.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libGLcore_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libcfb.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libcfb.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libcfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libcfb32.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libcfb32.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libcfb32.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libcfb32_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libcfb_pic.a -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libdbe.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe_pic.a -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libdri.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libextmod.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libmfb.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libmfb.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libmfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libmfb_pic.a -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/librecord.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord.so -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/librecord.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libxtrap.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libxtrap.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libxtrap.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libxtrap_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/fonts/libfreetype.a -unknown- xorg
+./usr/X11R7/lib/modules/fonts/libfreetype.so -unknown- xorg
+./usr/X11R7/lib/modules/fonts/libfreetype.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/fonts/libfreetype_pic.a -unknown-
xorg
+./usr/X11R7/lib/modules/fonts/libtype1.a -unknown- xorg
+./usr/X11R7/lib/modules/fonts/libtype1.so -unknown- xorg
+./usr/X11R7/lib/modules/fonts/libtype1.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/fonts/libtype1_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libexa.a -unknown- xorg
+./usr/X11R7/lib/modules/libexa.so -unknown- xorg
+./usr/X11R7/lib/modules/libexa.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libexa_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libfb.a -unknown-
xorg
+./usr/X11R7/lib/modules/libfb.so -unknown- xorg
+./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libfb_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.a -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.so -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libi2c_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libint10.a -unknown- xorg
+./usr/X11R7/lib/modules/libint10.so -unknown- xorg
+./usr/X11R7/lib/modules/libint10.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libint10_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libpcidata.a -unknown- xorg
+./usr/X11R7/lib/modules/libpcidata.so -unknown- xorg
+./usr/X11R7/lib/modules/libpcidata.so.0 -unknown-
xorg
+./usr/X11R7/lib/modules/libpcidata_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libscanpci.a -unknown- xorg
+./usr/X11R7/lib/modules/libscanpci.so -unknown- xorg
+./usr/X11R7/lib/modules/libscanpci.so.0 -unknown-
xorg
+./usr/X11R7/lib/modules/libscanpci_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.a -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.so -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.a -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.so -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvbe_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.a -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.so -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.a -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.so -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxaa_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libxf1bpp.a -unknown- xorg
+./usr/X11R7/lib/modules/libxf1bpp.so -unknown- xorg
+./usr/X11R7/lib/modules/libxf1bpp.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxf1bpp_pic.a -unknown-
xorg
+./usr/X11R7/lib/modules/libxf4bpp.a -unknown- xorg
+./usr/X11R7/lib/modules/libxf4bpp.so -unknown- xorg
+./usr/X11R7/lib/modules/libxf4bpp.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxf4bpp_pic.a -unknown-
xorg
+./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown-
xorg
+./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_32bpp.a -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_32bpp.so -unknown-
xorg
+./usr/X11R7/lib/modules/libxf8_32bpp.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_32bpp_pic.a -unknown- xorg
+./usr/X11R7/man/cat1/Xvfb.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat1/gtf.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat1/pcitweak.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat1/scanpci.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat1/xorgconfig.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VM.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeDeleteModeLine.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetAllModeLines.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetDotClocks.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetGamma.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetGammaRamp.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetGammaRampSize.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetModeLine.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetMonitor.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetPermissions.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetViewPort.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeLockModeSwitch.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeModModeLine.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeQueryExtension.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeQueryVersion.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSetClientVersion.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSetGamma.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSetGammaRamp.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSetViewPort.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSwitchMode.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSwitchToMode.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeValidateModeLine.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/apm.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/ati.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/chips.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/cirrus.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/exa.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/glint.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/i128.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/i740.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/imstt.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/kbd.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/mga.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/mousedrv.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/nv.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/r128.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/radeon.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/radeonhd.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/s3virge.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/savage.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/siliconmotion.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/sis.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/tdfx.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/trident.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/tseng.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/vga.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/wsfb.0 -unknown-
.cat,xorg
+./usr/X11R7/man/html1/Xvfb.html -unknown-
html,xorg
+./usr/X11R7/man/html1/gtf.html -unknown-
html,xorg
+./usr/X11R7/man/html1/pcitweak.html -unknown-
html,xorg
+./usr/X11R7/man/html1/scanpci.html -unknown-
html,xorg
+./usr/X11R7/man/html1/xorgconfig.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VM.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeDeleteModeLine.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetAllModeLines.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetDotClocks.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetGamma.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetGammaRamp.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetGammaRampSize.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetModeLine.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetMonitor.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetPermissions.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetViewPort.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeLockModeSwitch.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeModModeLine.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeQueryExtension.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeQueryVersion.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeSetClientVersion.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeSetGamma.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeSetGammaRamp.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeSetViewPort.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeSwitchMode.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeSwitchToMode.html -unknown-
html,xorg
+./usr/X11R7/man/html3/XF86VidModeValidateModeLine.html -unknown-
html,xorg
+./usr/X11R7/man/html4/apm.html -unknown-
html,xorg
+./usr/X11R7/man/html4/ati.html -unknown-
html,xorg
+./usr/X11R7/man/html4/chips.html -unknown-
html,xorg
+./usr/X11R7/man/html4/cirrus.html -unknown-
html,xorg
+./usr/X11R7/man/html4/exa.html -unknown-
html,xorg
+./usr/X11R7/man/html4/glint.html -unknown-
html,xorg
+./usr/X11R7/man/html4/i128.html -unknown-
html,xorg
+./usr/X11R7/man/html4/i740.html -unknown-
html,xorg
+./usr/X11R7/man/html4/imstt.html -unknown-
html,xorg
+./usr/X11R7/man/html4/kbd.html -unknown-
html,xorg
+./usr/X11R7/man/html4/mga.html -unknown-
html,xorg
+./usr/X11R7/man/html4/mousedrv.html -unknown-
html,xorg
+./usr/X11R7/man/html4/nv.html -unknown-
html,xorg
+./usr/X11R7/man/html4/r128.html -unknown-
html,xorg
+./usr/X11R7/man/html4/radeon.html -unknown-
html,xorg
+./usr/X11R7/man/html4/radeonhd.html -unknown-
html,xorg
+./usr/X11R7/man/html4/s3virge.html -unknown-
html,xorg
+./usr/X11R7/man/html4/savage.html -unknown-
html,xorg
+./usr/X11R7/man/html4/siliconmotion.html -unknown-
html,xorg
+./usr/X11R7/man/html4/sis.html -unknown-
html,xorg
+./usr/X11R7/man/html4/tdfx.html -unknown-
html,xorg
+./usr/X11R7/man/html4/trident.html -unknown-
html,xorg
+./usr/X11R7/man/html4/tseng.html -unknown-
html,xorg
+./usr/X11R7/man/html4/vga.html -unknown-
html,xorg
+./usr/X11R7/man/html4/void.html -unknown-
html,xorg
+./usr/X11R7/man/html4/wsfb.html -unknown-
html,xorg
+./usr/X11R7/man/man1/Xvfb.1 -unknown-
.man,xorg
+./usr/X11R7/man/man1/gtf.1 -unknown-
.man,xorg
+./usr/X11R7/man/man1/pcitweak.1 -unknown-
.man,xorg
+./usr/X11R7/man/man1/scanpci.1 -unknown-
.man,xorg
+./usr/X11R7/man/man1/xorgconfig.1 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VM.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeDeleteModeLine.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetAllModeLines.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetDotClocks.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetGamma.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetGammaRamp.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetGammaRampSize.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetModeLine.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetMonitor.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetPermissions.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetViewPort.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeLockModeSwitch.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeModModeLine.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeQueryExtension.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeQueryVersion.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeSetClientVersion.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeSetGamma.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeSetGammaRamp.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeSetViewPort.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeSwitchMode.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeSwitchToMode.3 -unknown-
.man,xorg
+./usr/X11R7/man/man3/XF86VidModeValidateModeLine.3 -unknown-
.man,xorg
+./usr/X11R7/man/man4/apm.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/ati.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/chips.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/cirrus.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/exa.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/glint.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/i128.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/i740.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/imstt.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/kbd.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/mga.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/mousedrv.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/nv.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/r128.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/radeon.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/radeonhd.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/s3virge.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/savage.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/siliconmotion.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/sis.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/tdfx.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/trident.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/tseng.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/vga.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/void.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/wsfb.4 -unknown-
.man,xorg
Index: external/mit/xorg/lib/dri/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/dri/Makefile,v
retrieving revision 1.2.2.4
diff -u -p -u -r1.2.2.4 Makefile
--- external/mit/xorg/lib/dri/Makefile 1 Dec 2008 00:46:22 -0000 1.2.2.4
+++ external/mit/xorg/lib/dri/Makefile 15 Jan 2009 22:28:43 -0000
@@ -2,7 +2,9 @@
SUBDIR= libmesa .WAIT
-.if ${MACHINE} == "macppc"
+.if ${MACHINE} == "alpha"
+SUBDIR+= mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident
+.elif ${MACHINE} == "macppc"
SUBDIR+= mach64 mga r128 r200 r300 radeon tdfx
.elif ${MACHINE} == "sparc64" || ${MACHINE} == "sparc"
SUBDIR+= mach64 mga r128 r200 r300 radeon
Index: external/mit/xorg/server/drivers/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/drivers/Makefile,v
retrieving revision 1.18.2.2
diff -u -p -u -r1.18.2.2 Makefile
--- external/mit/xorg/server/drivers/Makefile 25 Nov 2008 17:58:08 -0000
1.18.2.2
+++ external/mit/xorg/server/drivers/Makefile 15 Jan 2009 22:28:47 -0000
@@ -43,6 +43,37 @@ SUBDIR+= \
SUBDIR+= \
xf86-video-chips \
xf86-video-wsfb
+.elif ${MACHINE} == "alpha"
+SUBDIR+= \
+ xf86-video-apm \
+ xf86-video-ark \
+ xf86-video-ast \
+ xf86-video-ati \
+ xf86-video-chips \
+ xf86-video-cirrus \
+ xf86-video-cirrus_alpine \
+ xf86-video-cirrus_laguna \
+ xf86-video-glint \
+ xf86-video-i128 \
+ xf86-video-i740 \
+ xf86-video-imstt \
+ xf86-video-mach64 \
+ xf86-video-mga \
+ xf86-video-nv \
+ xf86-video-r128 \
+ xf86-video-radeon \
+ xf86-video-radeonhd \
+ xf86-video-s3 \
+ xf86-video-s3virge \
+ xf86-video-savage \
+ xf86-video-siliconmotion \
+ xf86-video-sis \
+ xf86-video-tdfx \
+ xf86-video-tga \
+ xf86-video-trident \
+ xf86-video-tseng \
+ xf86-video-vga \
+ xf86-video-wsfb
.else
SUBDIR+= \
Index: external/mit/xorg/server/xorg-server/Makefile.common
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server/Makefile.common,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile.common
--- external/mit/xorg/server/xorg-server/Makefile.common 24 Oct 2008
19:45:54 -0000 1.4
+++ external/mit/xorg/server/xorg-server/Makefile.common 15 Jan 2009
22:28:48 -0000
@@ -46,7 +46,7 @@ XSERVER_XNEWSMIPS?= yes
${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || ${MACHINE} == "sparc64" || \
- ${MACHINE} == "sparc"
+ ${MACHINE} == "sparc" || ${MACHINE} == "alpha"
XSERVER_NEEDS_XFONT= yes
XSERVER_NEEDS_MIEXT= yes
XSERVER_XFREE86= yes
Index: external/mit/xorg/server/xorg-server/hw/vfb/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile,v
retrieving revision 1.4.4.1
diff -u -p -u -r1.4.4.1 Makefile
--- external/mit/xorg/server/xorg-server/hw/vfb/Makefile 24 Dec 2008
16:48:25 -0000 1.4.4.1
+++ external/mit/xorg/server/xorg-server/hw/vfb/Makefile 15 Jan 2009
22:28:49 -0000
@@ -101,5 +101,10 @@ LDADD+= -lx86_64
DPADD+= ${LIBX86_64}
.endif
+.if ${MACHINE_ARCH} == "alpha"
+LDADD+= -lalpha
+DPADD+= ${LIBALPHA}
+.endif
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
===================================================================
RCS file:
/cvsroot/src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile,v
retrieving revision 1.22.6.1
diff -u -p -u -r1.22.6.1 Makefile
--- external/mit/xorg/server/xorg-server/hw/xfree86/Makefile 24 Dec 2008
16:48:25 -0000 1.22.6.1
+++ external/mit/xorg/server/xorg-server/hw/xfree86/Makefile 15 Jan 2009
22:28:49 -0000
@@ -76,6 +76,9 @@ DPADD+= ${LIBI386}
.elif ${MACHINE_ARCH} == "x86_64"
LDADD+= -lx86_64
DPADD+= ${LIBX86_64}
+.elif ${MACHINE_ARCH} == "alpha"
+LDADD+= -lalpha
+DPADD+= ${LIBALPHA}
.endif
LDADD+= -lm
Index: external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
===================================================================
RCS file:
/cvsroot/src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile 24 Oct
2008 19:48:34 -0000 1.9
+++ external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile 15 Jan
2009 22:28:51 -0000
@@ -8,7 +8,7 @@ SUBDIR+=ioport pcitweak scanpci
.if ${MACHINE} == "cats" || ${MACHINE} == "macppc" || \
${MACHINE} == "netwinder" || ${MACHINE} == "sparc" || \
- ${MACHINE} == "sparc64"
+ ${MACHINE} == "sparc64" || ${MACHINE} == "alpha"
SUBDIR+=pcitweak scanpci
.endif
Index: external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile
===================================================================
RCS file:
/cvsroot/src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile
9 Aug 2008 03:26:39 -0000 1.3
+++ external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile
15 Jan 2009 22:28:51 -0000
@@ -26,6 +26,9 @@ DPADD+= ${LIBI386}
.elif ${MACHINE_ARCH} == "x86_64"
LDADD+= -lx86_64
DPADD+= ${LIBX86_64}
+.elif ${MACHINE_ARCH} == "alpha"
+LDADD+= -lalpha
+DPADD+= ${LIBALPHA}
.endif
LINKS= ${X11BINDIR}/ioport ${X11BINDIR}/inb \
Index: external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile
===================================================================
RCS file:
/cvsroot/src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile
14 Oct 2008 23:37:19 -0000 1.3
+++ external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile
15 Jan 2009 22:28:51 -0000
@@ -24,6 +24,9 @@ DPADD+= ${LIBI386}
.elif ${MACHINE_ARCH} == "x86_64"
LDADD+= -lx86_64
DPADD+= ${LIBX86_64}
+.elif ${MACHINE_ARCH} == "alpha"
+LDADD+= -lalpha
+DPADD+= ${LIBALPHA}
.endif
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/${PROG}
Index: external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile
===================================================================
RCS file:
/cvsroot/src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile,v
retrieving revision 1.3.4.1
diff -u -p -u -r1.3.4.1 Makefile
--- external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile
29 Nov 2008 23:12:11 -0000 1.3.4.1
+++ external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile
15 Jan 2009 22:28:51 -0000
@@ -27,6 +27,9 @@ DPADD+= ${LIBI386}
.elif ${MACHINE_ARCH} == "x86_64"
LDADD+= -lx86_64
DPADD+= ${LIBX86_64}
+.elif ${MACHINE_ARCH} == "alpha"
+LDADD+= -lalpha
+DPADD+= ${LIBALPHA}
.endif
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/${PROG}
Index: external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
===================================================================
RCS file:
/cvsroot/src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile
--- external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile 25 Oct
2008 03:47:00 -0000 1.10
+++ external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile 15 Jan
2009 22:28:52 -0000
@@ -39,6 +39,13 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES
.endfor
.endif
+.if ${MACHINE} == "alpha"
+SRCS.bsd+= alpha_video.c bsd_ev56.c bsdResource.c pm_noop.c agp_noop.c
+.for _FN in ${SRCS.bsd}
+CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
-DUSE_ALPHA_PIO
+.endfor
+.endif
+
.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c agp_noop.c
SRCS.bus+= netbsdSbus.c
@@ -76,7 +83,7 @@ SRCS.bus+= ix86Pci.c
.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || ${MACHINE} == "sparc" || \
- ${MACHINE} == "sparc64"
+ ${MACHINE} == "sparc64" || ${MACHINE} == "alpha"
SRCS.bus+= netbsdPci.c
.endif
@@ -100,7 +107,8 @@ CPPFLAGS.SlowBcopy.S= -DUSE_GAS
.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
${MACHINE} == "sgimips" || ${MACHINE} == "sparc64" || \
${MACHINE} == "sparc" || ${MACHINE} == "netwinder" || \
- ${MACHINE} == "shark" || ${MACHINE} == "ofppc"
+ ${MACHINE} == "shark" || ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "alpha"
SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
.endif
Index: external/mit/xorg/server/xorg-server/hw/xnest/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile,v
retrieving revision 1.6.4.1
diff -u -p -u -r1.6.4.1 Makefile
--- external/mit/xorg/server/xorg-server/hw/xnest/Makefile 24 Dec 2008
16:48:25 -0000 1.6.4.1
+++ external/mit/xorg/server/xorg-server/hw/xnest/Makefile 15 Jan 2009
22:28:52 -0000
@@ -104,5 +104,10 @@ LDADD+= -lx86_64
DPADD+= ${LIBX86_64}
.endif
+.if ${MACHINE_ARCH} == "alpha"
+LDADD+= -lalpha
+DPADD+= ${LIBALPHA}
+.endif
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: share/mk/bsd.x11.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.x11.mk,v
retrieving revision 1.70.2.1
diff -u -p -u -r1.70.2.1 bsd.x11.mk
--- share/mk/bsd.x11.mk 15 Nov 2008 22:05:12 -0000 1.70.2.1
+++ share/mk/bsd.x11.mk 15 Jan 2009 22:32:04 -0000
@@ -85,7 +85,7 @@ X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVE
-DDDXOSVERRORF -DDDXTIME -DUSB_HID
.if !(${MACHINE} == "acorn32" || \
- ${MACHINE} == "alpha" || \
+ (${MACHINE} == "alpha" && ${X11FLAVOUR} != "Xorg") || \
${MACHINE} == "amiga" || \
${MACHINE} == "pmax" || \
${MACHINE} == "sun3" || \
Index: external/mit/xorg-server/dist/hw/xfree86/loader/xf86sym.c
===================================================================
RCS file:
/cvsroot/xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/xf86sym.c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 xf86sym.c
--- external/mit/xorg-server/dist/hw/xfree86/loader/xf86sym.c 31 Jul 2008
19:49:52 -0000 1.1.1.1
+++ external/mit/xorg-server/dist/hw/xfree86/loader/xf86sym.c 15 Jan 2009
19:13:12 -0000
@@ -960,12 +960,14 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(_alpha_inw)
SYMFUNC(_alpha_inl)
# else
+# ifndef __NetBSD__
SYMFUNC(outw)
SYMFUNC(outb)
SYMFUNC(outl)
SYMFUNC(inb)
SYMFUNC(inw)
SYMFUNC(inl)
+# endif /* __NetBSD__ */
# endif
SYMFUNC(xf86ReadMmio32)
SYMFUNC(xf86ReadMmio16)
Index: external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c
===================================================================
RCS file:
/cvsroot/xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 alpha_video.c
--- external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c
31 Jul 2008 19:49:37 -0000 1.1.1.1
+++ external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c
15 Jan 2009 19:13:13 -0000
@@ -162,10 +162,15 @@ memory_base(void)
if (abw_count < 0)
init_abw();
- if (abw_count > 0) {
+ if (abw_count > 1) {
xf86Msg(X_INFO, "memory base = %#lx\n",
abw[1].abw_abst.abst_sys_start); /* XXXX */
return abw[1].abw_abst.abst_sys_start;
+ } 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;
} else {
xf86Msg(X_INFO, "no memory base\n"); /* XXXX */
return 0;
Index: external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c
===================================================================
RCS file:
/cvsroot/xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 bsd_ev56.c
--- external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c 31 Jul
2008 19:49:37 -0000 1.1.1.1
+++ external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c 15 Jan
2009 19:13:13 -0000
@@ -13,6 +13,15 @@
#include "xf86_OSlib.h"
#include "xf86OSpriv.h"
+#include <machine/bwx.h>
+
+/*
+ * The following functions are used only on EV56 and greater CPUs,
+ * and the assembler requires going to EV56 mode in order to emit
+ * these instructions.
+ */
+__asm(".arch ev56");
+
int readDense8(pointer Base, register unsigned long Offset);
int readDense16(pointer Base, register unsigned long Offset);
int readDense32(pointer Base, register unsigned long Offset);
@@ -33,14 +42,14 @@ int
readDense8(pointer Base, register unsigned long Offset)
{
mem_barrier();
- return *(volatile CARD8*) ((unsigned long)Base+(Offset));
+ return (alpha_ldbu((pointer)((unsigned long)Base+(Offset))));
}
int
readDense16(pointer Base, register unsigned long Offset)
{
mem_barrier();
- return *(volatile CARD16*) ((unsigned long)Base+(Offset));
+ return (alpha_ldwu((pointer)((unsigned long)Base+(Offset))));
}
int
@@ -53,13 +62,13 @@ readDense32(pointer Base, register unsig
void
writeDenseNB8(int Value, pointer Base, register unsigned long Offset)
{
- *(volatile CARD8*)((unsigned long)Base+(Offset)) = Value;
+ alpha_stb((pointer)((unsigned long)Base+(Offset)), Value);
}
void
writeDenseNB16(int Value, pointer Base, register unsigned long Offset)
{
- *(volatile CARD16*)((unsigned long)Base + (Offset)) = Value;
+ alpha_stw((pointer)((unsigned long)Base + (Offset)), Value);
}
void
@@ -72,14 +81,14 @@ void
writeDense8(int Value, pointer Base, register unsigned long Offset)
{
write_mem_barrier();
- *(volatile CARD8 *)((unsigned long)Base+(Offset)) = Value;
+ alpha_stb((pointer)((unsigned long)Base+(Offset)), Value);
}
void
writeDense16(int Value, pointer Base, register unsigned long Offset)
{
write_mem_barrier();
- *(volatile CARD16 *)((unsigned long)Base+(Offset)) = Value;
+ alpha_stw((pointer)((unsigned long)Base + (Offset)), Value);
}
void
Home |
Main Index |
Thread Index |
Old Index