diff options
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/config/cf/host.def | 21 | ||||
| -rw-r--r-- | nx-X11/config/cf/linux.cf | 8 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 384 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorgsite.def | 21 |
4 files changed, 0 insertions, 434 deletions
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 6b9faf72c..b5faf5ca8 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -136,27 +136,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ */ /* - * Which drivers to build. When building a static server, each of these - * will be included in it. When building the loadable server each of these - * modules will be built. - * -#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ - neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ - GlideDriver fbdev i128 \ - ati DevelDrivers ark cyrix \ - siliconmotion \ - vesa vga XF86OSCardDrivers XF86ExtraCardDrivers - */ - -/* - * To add third party drivers to the standard driver list, set the - * following. - * -#define XF86ExtraCardDrivers extradriver1 extradriver2 ... - */ - -/* * Select the XInput devices you want by uncommenting this. * #define XInputDrivers mouse keyboard acecad calcomp citron \ diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index c8b3e12cd..f3a74bc39 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -701,14 +701,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define VarDbDirectory $(VARDIR)/lib #endif -#ifndef XF86OSCardDrivers -# ifdef __linux__ -# define XF86OSCardDrivers fbdev v4l sisusb -# else -# define XF86OSCardDrivers /**/ -# endif -#endif - #ifndef OSXInputDrivers # if HasLinuxJoystick # define OSXInputDrivers1 ur98 diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 43a925d7a..63de7b25a 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -254,31 +254,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString # define HasLinuxInput NO #endif -/* OS.cf files may set this for OS-specific drivers */ -#ifndef XF86OSCardDrivers -#define XF86OSCardDrivers /**/ -#endif - -/* This may be set in host.def for 3rd party drivers */ -#ifndef XF86ExtraCardDrivers -#define XF86ExtraCardDrivers /**/ -#endif - -/* OS.cf files may set this for OS-specific drivers */ -#ifndef HasAgpGart -#define HasAgpGart NO -#endif - -/* The glide driver only works for the loadable server at the moment */ -#ifndef HasGlide2 -#define HasGlide2 NO -#endif -#if HasGlide2 && DoLoadableServer -#define GlideDriver glide -#else -#define GlideDriver /**/ -#endif - /* * Many architectures share common X Server pieces. List them here. */ @@ -350,365 +325,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString #endif /* - * Intel x86 and ia64 drivers - */ -#if defined(i386Architecture) || defined(ia64Architecture) -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* Amiga framebuffer module. Required by vesa module. */ -# ifndef XF86AFB -# define XF86AFB YES -# endif - -/* - * Drivers under development, but not ready for binary releases, or - * drivers included on this platform only for build testing. - */ -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers imstt newport -# else -# define DevelDrivers /**/ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# /* Don't build the nsc driver on IA64 */ -# ifndef ia64Architecture -# define i386Drivers nsc i810 -# else -# define i386Drivers /**/ -# endif -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ - GlideDriver i128 i386Drivers \ - ati DevelDrivers ark \ - cyrix siliconmotion via \ - vesa vga \ - dummy XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif /* i386Architecture || ia64Architecture */ - -#if defined(AMD64Architecture) -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* Amiga framebuffer module. Required by vesa module. */ -# ifndef XF86AFB -# define XF86AFB YES -# endif - -/* - * Drivers under development, but not ready for binary releases, or - * drivers included on this platform only for build testing. - */ -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /**/ -# else -# define DevelDrivers /**/ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic tdfx savage cirrus tseng trident \ - chips apm i128 ati ark cyrix siliconmotion \ - vga dummy vesa i810 vmware \ - XF86OSCardDrivers XF86ExtraCardDrivers DevelDrivers -# endif -#endif /*AMD64Arcitecture*/ - -/* SPARC and UltraSPARC drivers */ - -#if (defined(SparcArchitecture) || defined(Sparc64Architecture)) && \ - !defined(LynxOSArchitecture) && \ - !defined(NetBSDArchitecture) && \ - !defined(OpenBSDArchitecture) -/* 8/32wid fb module */ -# ifndef XF8_32Wid -# define XF8_32Wid YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* Amiga framebuffer module. Required by vesa module. */ -# ifndef XF86AFB -# define XF86AFB YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel - /* - * Some of these are compiled just for the fun of it. Undoubtedly some - * require changes (or even removal) for things like endianness, etc. Move - * those known to work into the main XF86CardDrivers #define. - */ -# define DevelDrivers apm ark chips cirrus i128 i740 i810 imstt \ - neomagic newport nv rendition s3virge savage \ - siliconmotion tga trident vmware dummy -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure SBUS and PCI drivers should go first */ -# ifndef XF86CardDrivers -# ifdef SunArchitecture -# define XF86CardDrivers /* sunffb */ sunleo suncg6 suncg3 suncg14 \ - suntcx sunbw2 glint mga tdfx ati vesa vga \ - dummy XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers -# else -# define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 suntcx \ - sunbw2 glint mga tdfx ati vesa vga dummy \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers -# endif -# endif -#endif - -/* Sparc64 Drivers */ -#if defined(OpenBSDArchitecture) && defined(Sparc64Architecture) -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB NO -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -# ifndef UseX86Emu -# define UseX86Emu NO -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati dummy \ - DevelDrivers \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif /* OpenBSDArchitecture && Sparc64Architecture */ - -/* MIPS drivers */ - -#ifdef MipsArchitecture -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -# ifndef XF86CardDrivers -# define XF86CardDrivers mga glint nv s3 s3virge sis savage \ - trident chips tdfx ati dummy \ - DevelDrivers newport \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif /* MipsArchitecture */ - -/* - * DEC Alpha drivers - */ -#ifdef AlphaArchitecture -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers mga tdfx glint s3 s3virge rendition tga ati \ - savage nv cirrus DevelDrivers siliconmotion \ - vga dummy XF86OSCardDrivers \ - XF86ExtraCardDrivers -# endif -#endif /* AlphaArchitecture */ - -/* - * Motorola 68k and PowerPC drivers - */ -#if defined(PpcArchitecture) || defined(Mc68020Architecture) -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers imstt -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati mga glint nv s3 s3virge sis savage\ - trident chips tdfx \ - DevelDrivers vga dummy \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif /* PpcArchitecture || Mc68020Architecture */ - -/* - * Intel StrongARM and Hewlett-Packard PA-RISC - */ -#if defined(Arm32Architecture) || defined(HPArchitecture) -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati mga glint nv s3 s3virge sis savage\ - trident chips tdfx \ - DevelDrivers vga dummy \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif - -/* SuperH drivers */ -#if defined(SuperHArchitecture) -# ifndef XF86CardDrivers -# define XF86CardDrivers XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif - -/* - * For PowerPC 64bit systems - * only libraries are strictly needed - */ -#if defined(Ppc64Architecture) -# ifndef XorgServer -# define XorgServer YES -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp NO -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp NO -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB NO -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati mga dummy \ - DevelDrivers \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif /* Ppc64Architecture */ - -/* * For Mips/Arc platforms, the default is to build all modules which * are supported on this platform. */ diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def index c05e53e17..53a139565 100644 --- a/nx-X11/config/cf/xorgsite.def +++ b/nx-X11/config/cf/xorgsite.def @@ -55,27 +55,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ */ /* - * Which drivers to build. When building a static server, each of these - * will be included in it. When building the loadable server each of these - * modules will be built. - * -#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ - neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ - GlideDriver fbdev i128 \ - ati DevelDrivers ark cyrix \ - siliconmotion \ - vesa vga XF86OSCardDrivers XF86ExtraCardDrivers - */ - -/* - * To add third party drivers to the standard driver list, set the - * following. - * -#define XF86ExtraCardDrivers extradriver1 extradriver2 ... - */ - -/* * Select the XInput devices you want by uncommenting this. * #define XInputDrivers mouse keyboard acecad calcomp citron \ |