d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More changes for the Alpha X support - don't list PC98 servers since they make

Browse Source 
no sense here but list the TGA server, since it does.
This commit is contained in:
Jordan K. Hubbard 1999-07-23 03:42:23 +00:00
parent 39d837d4b5
commit 6181e5c577
10 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/sysinstall/dist.c
View File

@ -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.142 1999/07/16 22:03:26 jkh Exp $
* $Id: dist.c,v 1.143 1999/07/19 11:58:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -140,6 +140,7 @@ static Distribution XF86DistTable[] = {
/* The XFree86 server distribution */
static Distribution XF86ServerDistTable[] = {
#ifdef __i386__
{ "PC98-Servers/X9480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
{ "PC98-Servers/X9EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
{ "PC98-Servers/X9GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
@ -154,6 +155,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 },
#endif
{ "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 },
@ -168,6 +170,9 @@ 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 },
#ifdef __alpha__
{ "Servers/XTGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_TGA, NULL },
#endif
{ NULL },
};

6
release/sysinstall/dist.h
View File

@ -1,4 +1,4 @@
/* $Id: dist.h,v 1.36 1999/07/02 02:00:23 jkh Exp $ */
/* $Id: dist.h,v 1.37 1999/07/16 22:03:26 jkh Exp $ */
#ifndef _DIST_H_INCLUDE
#define _DIST_H_INCLUDE
@ -75,6 +75,7 @@
#define DIST_XF86_CSRC 0x2000
#define DIST_XF86_MISC_ALL 0x3FFF
#define DIST_XF86_SERVER 0x8000
#ifdef __i386__
#define DIST_XF86_SERVER_9MGA 0x0000001
#define DIST_XF86_SERVER_9480 0x0000002
#define DIST_XF86_SERVER_9EGC 0x0000004
@ -89,6 +90,9 @@
#define DIST_XF86_SERVER_9WEP 0x0000800
#define DIST_XF86_SERVER_9WS 0x0001000
#define DIST_XF86_SERVER_9WSN 0x0002000
#elif __alpha__
#define DIST_XF86_SERVER_TGA 0x0000001
#endif
#define DIST_XF86_SERVER_8514 0x0004000
#define DIST_XF86_SERVER_AGX 0x0008000
#define DIST_XF86_SERVER_I128 0x0010000

7
release/sysinstall/menus.c
View File

@ -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.213 1999/07/20 07:39:21 jkh Exp $
* $Id: menus.c,v 1.214 1999/07/20 07:50:26 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1040,8 +1040,13 @@ 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 },
#ifdef __i386__
{ "PC98", "Select an X server for a NEC PC98 [Submenu]",
NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
#elif __alpha__
{ "TGA", "TGA cards (alpha architecture only)",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_TGA },
#endif
{ "All", "Select all of the above",
NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' },
{ "Clear", "Reset all of the above",

4
release/sysinstall/sysinstall.8
View File

@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" $Id: sysinstall.8,v 1.17 1999/04/24 01:53:55 jkh Exp $
.\" $Id: sysinstall.8,v 1.18 1999/07/19 11:49:22 jkh Exp $
.\"
.Dd August 9, 1997
.Dt SYSINSTALL 8
@ -482,6 +482,8 @@ XFree86 3.3.4 SVGA server.
XFree86 3.3.4 VGA16 server.
.It Li XW32
XFree86 3.3.4 ET4000/W32, /W32i and /W32p server.
.It Li XTGA
Server for TGA cards (alpha architecture only).
.It Li Xnest
XFree86 3.3.4 nested X server.
.It Li Xvfb

7
usr.sbin/sade/menus.c
View File

@ -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.213 1999/07/20 07:39:21 jkh Exp $
* $Id: menus.c,v 1.214 1999/07/20 07:50:26 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1040,8 +1040,13 @@ 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 },
#ifdef __i386__
{ "PC98", "Select an X server for a NEC PC98 [Submenu]",
NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
#elif __alpha__
{ "TGA", "TGA cards (alpha architecture only)",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_TGA },
#endif
{ "All", "Select all of the above",
NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' },
{ "Clear", "Reset all of the above",

4
usr.sbin/sade/sade.8
View File

@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" $Id: sysinstall.8,v 1.17 1999/04/24 01:53:55 jkh Exp $
.\" $Id: sysinstall.8,v 1.18 1999/07/19 11:49:22 jkh Exp $
.\"
.Dd August 9, 1997
.Dt SYSINSTALL 8
@ -482,6 +482,8 @@ XFree86 3.3.4 SVGA server.
XFree86 3.3.4 VGA16 server.
.It Li XW32
XFree86 3.3.4 ET4000/W32, /W32i and /W32p server.
.It Li XTGA
Server for TGA cards (alpha architecture only).
.It Li Xnest
XFree86 3.3.4 nested X server.
.It Li Xvfb

7
usr.sbin/sysinstall/dist.c
View File

@ -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.142 1999/07/16 22:03:26 jkh Exp $
* $Id: dist.c,v 1.143 1999/07/19 11:58:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -140,6 +140,7 @@ static Distribution XF86DistTable[] = {
/* The XFree86 server distribution */
static Distribution XF86ServerDistTable[] = {
#ifdef __i386__
{ "PC98-Servers/X9480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
{ "PC98-Servers/X9EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
{ "PC98-Servers/X9GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
@ -154,6 +155,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 },
#endif
{ "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 },
@ -168,6 +170,9 @@ 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 },
#ifdef __alpha__
{ "Servers/XTGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_TGA, NULL },
#endif
{ NULL },
};

6
usr.sbin/sysinstall/dist.h
View File

@ -1,4 +1,4 @@
/* $Id: dist.h,v 1.36 1999/07/02 02:00:23 jkh Exp $ */
/* $Id: dist.h,v 1.37 1999/07/16 22:03:26 jkh Exp $ */
#ifndef _DIST_H_INCLUDE
#define _DIST_H_INCLUDE
@ -75,6 +75,7 @@
#define DIST_XF86_CSRC 0x2000
#define DIST_XF86_MISC_ALL 0x3FFF
#define DIST_XF86_SERVER 0x8000
#ifdef __i386__
#define DIST_XF86_SERVER_9MGA 0x0000001
#define DIST_XF86_SERVER_9480 0x0000002
#define DIST_XF86_SERVER_9EGC 0x0000004
@ -89,6 +90,9 @@
#define DIST_XF86_SERVER_9WEP 0x0000800
#define DIST_XF86_SERVER_9WS 0x0001000
#define DIST_XF86_SERVER_9WSN 0x0002000
#elif __alpha__
#define DIST_XF86_SERVER_TGA 0x0000001
#endif
#define DIST_XF86_SERVER_8514 0x0004000
#define DIST_XF86_SERVER_AGX 0x0008000
#define DIST_XF86_SERVER_I128 0x0010000

7
usr.sbin/sysinstall/menus.c
View File

@ -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.213 1999/07/20 07:39:21 jkh Exp $
* $Id: menus.c,v 1.214 1999/07/20 07:50:26 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1040,8 +1040,13 @@ 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 },
#ifdef __i386__
{ "PC98", "Select an X server for a NEC PC98 [Submenu]",
NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
#elif __alpha__
{ "TGA", "TGA cards (alpha architecture only)",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_TGA },
#endif
{ "All", "Select all of the above",
NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' },
{ "Clear", "Reset all of the above",

4
usr.sbin/sysinstall/sysinstall.8
View File

@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" $Id: sysinstall.8,v 1.17 1999/04/24 01:53:55 jkh Exp $
.\" $Id: sysinstall.8,v 1.18 1999/07/19 11:49:22 jkh Exp $
.\"
.Dd August 9, 1997
.Dt SYSINSTALL 8
@ -482,6 +482,8 @@ XFree86 3.3.4 SVGA server.
XFree86 3.3.4 VGA16 server.
.It Li XW32
XFree86 3.3.4 ET4000/W32, /W32i and /W32p server.
.It Li XTGA
Server for TGA cards (alpha architecture only).
.It Li Xnest
XFree86 3.3.4 nested X server.
.It Li Xvfb