summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1999-05-14 07:15:05 +0000
committerjkh <jkh@FreeBSD.org>1999-05-14 07:15:05 +0000
commitdadd91f60975a77f24b56f7ee8025e21c863e7a2 (patch)
treea7f16ac78c3a86327e320217b08f0ac97e6aa27a /release
parent842cae7fdc626dc852b4daaf4a1b9d66d87028b3 (diff)
downloadFreeBSD-src-dadd91f60975a77f24b56f7ee8025e21c863e7a2.zip
FreeBSD-src-dadd91f60975a77f24b56f7ee8025e21c863e7a2.tar.gz
Yikes! I almost left out the 3D Labs server. :)
Diffstat (limited to 'release')
-rw-r--r--release/sysinstall/dist.c4
-rw-r--r--release/sysinstall/dist.h4
-rw-r--r--release/sysinstall/menus.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 5c66318..733b9b2 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: dist.c,v 1.138 1999/04/21 07:22:37 obrien Exp $
+ * $Id: dist.c,v 1.139 1999/05/05 11:34:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -152,6 +152,7 @@ static Distribution XF86ServerDistTable[] = {
{ "PC98-Servers/X9WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
{ "PC98-Servers/X9WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
{ "PC98-Servers/X9WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
+{ "Servers/X3DL", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_3DL, NULL },
{ "Servers/X8514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
{ "Servers/XAGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
{ "Servers/XI128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
@@ -165,7 +166,6 @@ static Distribution XF86ServerDistTable[] = {
{ "Servers/XSVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
{ "Servers/XVG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
{ "Servers/XW32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
-{ "Xnest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
{ NULL },
};
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index e301d9c..34ffe4c 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -1,4 +1,4 @@
-/* $Id: dist.h,v 1.33 1999/04/21 07:42:02 obrien Exp $ */
+/* $Id: dist.h,v 1.34 1999/05/07 20:31:34 jkh Exp $ */
#ifndef _DIST_H_INCLUDE
#define _DIST_H_INCLUDE
@@ -100,7 +100,7 @@
#define DIST_XF86_SERVER_SVGA 0x1000000
#define DIST_XF86_SERVER_VGA16 0x2000000
#define DIST_XF86_SERVER_W32 0x4000000
-#define DIST_XF86_SERVER_NEST 0x8000000
+#define DIST_XF86_SERVER_3DL 0x8000000
#define DIST_XF86_SERVER_ALL 0xFFFFFFF
#define DIST_XF86_FONTS 0x10000
#define DIST_XF86_FONTS_MISC 0x0001
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 9bf1adb..8b04dfa 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: menus.c,v 1.201 1999/05/12 06:58:18 jkh Exp $
+ * $Id: menus.c,v 1.202 1999/05/12 22:06:00 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -998,6 +998,8 @@ DMenu MenuXF86SelectServer = {
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 },
{ "Mono", "Standard Monochrome card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO },
+ { "3DL", "8, 16 and 24 bit color 3D Labs boards",
+ dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_3DL },
{ "8514", "8-bit (256 color) IBM 8514 or compatible card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 },
{ "AGX", "8-bit AGX card",
@@ -1018,8 +1020,6 @@ DMenu MenuXF86SelectServer = {
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V },
{ "W32", "8-bit ET4000/W32, /W32i and /W32p cards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 },
- { "nest", "A nested server for testing purposes",
- dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
{ "PC98", "Select an X server for a NEC PC98 [Submenu]",
NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
{ "All", "Select all of the above",
OpenPOWER on IntegriCloud