Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/x11/Xserver/hw/xfree86 Loadable drivers for XFree86.



details:   https://anonhg.NetBSD.org/src/rev/18e725583d56
branches:  trunk
changeset: 556674:18e725583d56
user:      rtr <rtr%NetBSD.org@localhost>
date:      Tue Dec 23 10:46:27 2003 +0000

description:
Loadable drivers for XFree86.

diffstat:

 x11/Xserver/hw/xfree86/Makefile                |   6 +-
 x11/Xserver/hw/xfree86/Makefile.drivermod      |  13 +++++
 x11/Xserver/hw/xfree86/drivers/Makefile        |   5 ++
 x11/Xserver/hw/xfree86/drivers/mga/Makefile    |  60 ++++++++++++++++++++++++++
 x11/Xserver/hw/xfree86/drivers/nv/Makefile     |  45 +++++++++++++++++++
 x11/Xserver/hw/xfree86/drivers/radeon/Makefile |  49 +++++++++++++++++++++
 x11/Xserver/hw/xfree86/input/Makefile          |   5 ++
 x11/Xserver/hw/xfree86/input/mouse/Makefile    |  26 +++++++++++
 8 files changed, 206 insertions(+), 3 deletions(-)

diffs (247 lines):

diff -r 8875912d5066 -r 18e725583d56 x11/Xserver/hw/xfree86/Makefile
--- a/x11/Xserver/hw/xfree86/Makefile   Tue Dec 23 10:30:02 2003 +0000
+++ b/x11/Xserver/hw/xfree86/Makefile   Tue Dec 23 10:46:27 2003 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2003/12/23 05:03:27 rtr Exp $
+#      $NetBSD: Makefile,v 1.2 2003/12/23 10:46:27 rtr Exp $
 
 XTODO= xloader scanpci dummylib parser rac scanpci shadowfb vgahw \
-       xf24_32bpp xf1bpp xf4bpp xf8_16bpp xf8_32bpp drivers input
+       xf24_32bpp xf1bpp xf4bpp xf8_16bpp xf8_32bpp
 
 SUBDIR=        xf86 xf86config loader xf86_os pcidata vgahw ddc i2c vbe xaa \
-       int10 ramdac
+       int10 ramdac drivers input
 
 .include <bsd.subdir.mk>
diff -r 8875912d5066 -r 18e725583d56 x11/Xserver/hw/xfree86/Makefile.drivermod
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/Makefile.drivermod Tue Dec 23 10:46:27 2003 +0000
@@ -0,0 +1,13 @@
+LIB=${MOD}
+
+__archivebuild: .USE
+       ${_MKTARGET_BUILD}
+       rm -rf ${.TARGET}
+       ${LD} -X -r ${OBJS} -o ${.TARGET}
+
+__archiveinstall: .USE
+       ${_MKTARGET_INSTALL}
+       ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+           ${SYSPKGTAG} ${.ALLSRC} ${DESTDIR}${LIBDIR}/${MOD}.o
+
+.include <bsd.lib.mk>
diff -r 8875912d5066 -r 18e725583d56 x11/Xserver/hw/xfree86/drivers/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/drivers/Makefile   Tue Dec 23 10:46:27 2003 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/23 10:46:27 rtr Exp $
+
+SUBDIR=        mga nv
+
+.include <bsd.subdir.mk>
diff -r 8875912d5066 -r 18e725583d56 x11/Xserver/hw/xfree86/drivers/mga/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/drivers/mga/Makefile       Tue Dec 23 10:46:27 2003 +0000
@@ -0,0 +1,60 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/23 10:46:27 rtr Exp $
+
+XMODULEDIR=    ${X11USRLIBDIR}/modules/drivers
+
+.include "../../../../Makefile.serverlib"
+
+.include <bsd.own.mk>
+
+MOD=   mga_drv
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga
+
+SRCS=          mga_driver.c mga_hwcurs.c mga_dac3026.c mga_dacG.c \
+               mga_storm8.c mga_storm16.c mga_storm24.c mga_storm32.c \
+               mga_arc.c mga_dga.c mga_shadow.c mga_video.c \
+               mga_g450pll.c mga_dh.c mga_esc.c mga_merge.c
+
+BUILDSYMLINKS= mga_storm.c mga_storm8.c \
+               mga_storm.c mga_storm16.c \
+               mga_storm.c mga_storm24.c \
+               mga_storm.c mga_storm32.c
+
+XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga/HALlib \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/fb \
+               -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+               -I${X11SRCDIR.xc}/programs/Xserver/mi \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+               -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+               -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf8_32bpp \
+               -I${X11SRCDIR.xc}/include/fonts \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+                -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+               -I${X11SRCDIR.xc}/include/extensions \
+               -I${X11SRCDIR.xc}/programs/Xserver/render \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+               -I${X11SRCDIR.xc} \
+                -I${XSERVERINCDIR}
+
+CPPFLAGS.mga_storm8.c= -DPSZ=8
+CPPFLAGS.mga_storm16.c=        -DPSZ=16
+CPPFLAGS.mga_storm24.c=        -DPSZ=24
+CPPFLAGS.mga_storm32.c=        -DPSZ=32
+
+.include <bsd.x11.mk>
+LIBDIR=        ${XMODULEDIR}
+.include "../../Makefile.drivermod"
diff -r 8875912d5066 -r 18e725583d56 x11/Xserver/hw/xfree86/drivers/nv/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/drivers/nv/Makefile        Tue Dec 23 10:46:27 2003 +0000
@@ -0,0 +1,45 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/23 10:46:27 rtr Exp $
+
+XMODULEDIR=    ${X11USRLIBDIR}/modules/drivers
+
+.include "../../../../Makefile.serverlib"
+
+.include <bsd.own.mk>
+
+MOD=   nv_drv
+.PATH:          ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nv
+
+SRCS=  nv_driver.c nv_dac.c nv_setup.c nv_cursor.c nv_xaa.c nv_dga.c \
+       nv_shadow.c riva_hw.c nv_video.c
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nv \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+               -I${X11SRCDIR.xc}/programs/Xserver/mi \
+               -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+               -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+               -I${X11SRCDIR.xc}/include/fonts \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+                -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+               -I${X11SRCDIR.xc}/include/extensions \
+               -I${X11SRCDIR.xc}/programs/Xserver/fb \
+               -I${X11SRCDIR.xc}/programs/Xserver/render \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bus
+
+CPPFLAGS+=     -DPSZ=8
+               
+.include <bsd.x11.mk>
+LIBDIR=        ${XMODULEDIR}
+.include "../../Makefile.drivermod"
diff -r 8875912d5066 -r 18e725583d56 x11/Xserver/hw/xfree86/drivers/radeon/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/drivers/radeon/Makefile    Tue Dec 23 10:46:27 2003 +0000
@@ -0,0 +1,49 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/23 10:46:27 rtr Exp $
+
+XMODULEDIR=    ${X11USRLIBDIR}/modules/drivers
+
+.include "../../../../Makefile.serverlib"
+
+.include <bsd.own.mk>
+
+MOD=   radeon_drv
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati
+
+SRCS=  radeon_accel.c radeon_cursor.c radeon_dga.c radeon_driver.c \
+       radeon_video.c radeon_misc.c
+
+XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+               -I${X11SRCDIR.xc}/programs/Xserver/cfb \
+               -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+               -I${X11SRCDIR.xc}/programs/Xserver/fb \
+               -I${X11SRCDIR.xc}/programs/Xserver/mi \
+               -I${X11SRCDIR.xc}/programs/Xserver/miext/shadow \
+               -I${X11SRCDIR.xc}/programs/Xserver/render \
+               -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+               -I${X11SRCDIR.xc}/include/fonts \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
+               -I${XSERVERINCDIR}
+               
+.include <bsd.x11.mk>
+LIBDIR=        ${XMODULEDIR}
+.include "../../Makefile.drivermod"
diff -r 8875912d5066 -r 18e725583d56 x11/Xserver/hw/xfree86/input/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/input/Makefile     Tue Dec 23 10:46:27 2003 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/23 10:46:27 rtr Exp $
+
+SUBDIR=        mouse
+
+.include <bsd.subdir.mk>
diff -r 8875912d5066 -r 18e725583d56 x11/Xserver/hw/xfree86/input/mouse/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/input/mouse/Makefile       Tue Dec 23 10:46:27 2003 +0000
@@ -0,0 +1,26 @@
+#      $NetBSD: Makefile,v 1.1 2003/12/23 10:46:27 rtr Exp $
+
+XMODULEDIR=    ${X11USRLIBDIR}/modules/input
+
+.include "../../../../Makefile.serverlib"
+
+.include <bsd.own.mk>
+
+MOD=   mouse_drv
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mouse
+SRCS=  mouse.c pnp.c
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/mouse \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+               -I${X11SRCDIR.xc}/programs/Xserver/mi \
+               -I${X11SRCDIR.xc}/programs/Xserver/include \
+                -I${DESTDIR}${X11INCDIR}/X11 \
+                -I${DESTDIR}${X11INCDIR}/X11/extensions \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86 \
+               -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bus
+
+.include <bsd.x11.mk>
+LIBDIR=        ${XMODULEDIR}
+.include "../../Makefile.drivermod"



Home | Main Index | Thread Index | Old Index