frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove PC98 support. 

Gaetan Nadon wrote:

    Alan Coopersmith wrote:

    "I think we recently dropped PC98 support from the X server, so I'd
    be okay with dropping the documentation now".

Let's make them be right, shall we?

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Jamey Sharp 2011-09-13 17:45:19 -05:00
parent 9eb22ebf46
commit 6ad7bb69ee
10 changed files with 1 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -582,9 +582,6 @@ AC_ARG_ENABLE(install-libxf86config,
AC_ARG_ENABLE(visibility, AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]),
[SYMBOL_VISIBILITY=$enableval],
[SYMBOL_VISIBILITY=auto])
AC_ARG_ENABLE(pc98, AC_HELP_STRING([--enable-pc98], [Enable PC98 support in Xorg (default: auto)]),
[SUPPORT_PC98=$enableval],
[SUPPORT_PC98=auto])
dnl GLX build options
AC_ARG_ENABLE(aiglx, AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]),
@ -1654,9 +1651,6 @@ if test "x$XORG" = xyes; then
XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)'
fi
AC_SUBST([SOLARIS_ASM_CFLAGS])
if test "x$SUPPORT_PC98" = xauto; then
SUPPORT_PC98="no"
fi
;;
gnu*)
XORG_OS_SUBDIR="hurd"
@ -1679,18 +1673,9 @@ if test "x$XORG" = xyes; then
xorg_bus_sparc="yes"
;;
i*86)
if test "x$SUPPORT_PC98" = xauto; then
SUPPORT_PC98="yes"
fi
;;
esac
if test "x$SUPPORT_PC98" = xauto; then
SUPPORT_PC98="no"
fi
if test "x$SUPPORT_PC98" = xyes; then
AC_DEFINE(SUPPORT_PC98, 1, [Support PC98])
fi
if test "x$DGA" = xauto; then
PKG_CHECK_MODULES(DGA, $DGAPROTO, [DGA=yes], [DGA=no])
fi

1
hw/xfree86/common/xf86.h
View File

@ -263,7 +263,6 @@ extern _X_EXPORT Bool xf86GetVidModeEnabled(void);
extern _X_EXPORT Bool xf86GetModInDevAllowNonLocal(void);
extern _X_EXPORT Bool xf86GetModInDevEnabled(void);
extern _X_EXPORT Bool xf86GetAllowMouseOpenFail(void);
extern _X_EXPORT Bool xf86IsPc98(void);
extern _X_EXPORT void xf86DisableRandR(void);
extern _X_EXPORT CARD32 xorgGetVersion(void);
extern _X_EXPORT CARD32 xf86GetModuleVersion(pointer module);

30
hw/xfree86/common/xf86Config.c
View File

@ -676,7 +676,6 @@ typedef enum {
FLAG_DPMS_SUSPENDTIME,
FLAG_DPMS_OFFTIME,
FLAG_PIXMAP,
FLAG_PC98,
FLAG_NOPM,
FLAG_XINERAMA,
FLAG_LOG,
@ -724,8 +723,6 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE },
{ FLAG_PIXMAP, "Pixmap", OPTV_INTEGER,
{0}, FALSE },
{ FLAG_PC98, "PC98", OPTV_BOOLEAN,
{0}, FALSE },
{ FLAG_NOPM, "NoPM", OPTV_BOOLEAN,
{0}, FALSE },
{ FLAG_XINERAMA, "Xinerama", OPTV_BOOLEAN,
@ -756,21 +753,6 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE },
};
#ifdef SUPPORT_PC98
static Bool
detectPC98(void)
{
unsigned char buf[2];
if (xf86ReadBIOS(0xf8000, 0xe80, buf, 2) != 2)
return FALSE;
if ((buf[0] == 0x98) && (buf[1] == 0x21))
return TRUE;
else
return FALSE;
}
#endif
static Bool
configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
{
@ -1026,18 +1008,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86Info.pixmap24 = Pix24DontCare;
xf86Info.pix24From = X_DEFAULT;
}
#ifdef SUPPORT_PC98
if (xf86GetOptValBool(FlagOptions, FLAG_PC98, &value)) {
xf86Info.pc98 = value;
if (value) {
xf86Msg(X_CONFIG, "Japanese PC98 architecture\n");
}
} else
if (detectPC98()) {
xf86Info.pc98 = TRUE;
xf86Msg(X_PROBED, "Japanese PC98 architecture\n");
}
#endif
#ifdef PANORAMIX
from = X_DEFAULT;

3
hw/xfree86/common/xf86Globals.c
View File

@ -119,9 +119,6 @@ xf86InfoRec xf86Info = {
.miscModInDevAllowNonLocal = FALSE,
.pixmap24 = Pix24DontCare,
.pix24From = X_DEFAULT,
#ifdef SUPPORT_PC98
.pc98 = FALSE,
#endif
.pmFlag = TRUE,
.log = LogNone,
.disableRandR = FALSE,

10
hw/xfree86/common/xf86Helper.c
View File

@ -1583,16 +1583,6 @@ xf86GetAllowMouseOpenFail(void)
}
Bool
xf86IsPc98(void)
{
#if SUPPORT_PC98
return xf86Info.pc98;
#else
return FALSE;
#endif
}
void
xf86DisableRandR(void)
{

3
hw/xfree86/common/xf86Privstr.h
View File

@ -91,9 +91,6 @@ typedef struct {
input device events */
Pix24Flags pixmap24;
MessageType pix24From;
#ifdef SUPPORT_PC98
Bool pc98;
#endif
Bool pmFlag;
Log log;
Bool disableRandR;

2
hw/xfree86/int10/helper_exec.c
View File

@ -347,7 +347,7 @@ x_inw(CARD16 port)
struct timeval tv;
/*
* Emulate a PC98's timer. Typical resolution is 3.26 usec.
* Emulate a PC's timer. Typical resolution is 3.26 usec.
* Approximate this by dividing by 3.
*/
X_GETTIMEOFDAY(&tv);

3
hw/xfree86/int10/helper_mem.c
View File

@ -241,9 +241,6 @@ int10_check_bios(int scrnIndex, int codeSeg, const unsigned char* vbiosMem)
((codeSeg << 4) >= SYS_SIZE))
return FALSE;
if (xf86IsPc98())
return FALSE;
if ((*vbiosMem != 0x55) || (*(vbiosMem+1) != 0xAA) || !*(vbiosMem+2))
return FALSE;

6
hw/xfree86/man/xorg.conf.man
View File

@ -634,12 +634,6 @@ are 24 and 32.
Default: 32 unless driver constraints don't allow this (which is rare).
Note: some clients don't behave well when this value is set to 24.
.TP 7
.BI "Option \*qPC98\*q \*q" boolean \*q
Specify that the machine is a Japanese PC\-98 machine.
This should not be enabled for anything other than the Japanese\-specific
PC\-98 architecture.
Default: auto\-detected.
.TP 7
.BI "Option \*qNoPM\*q \*q" boolean \*q
Disables something to do with power management events.
Default: PM enabled on platforms that support it.

3
include/xorg-config.h.in
View File

@ -136,9 +136,6 @@
/* Use SIGIO handlers for input device events by default */
#undef USE_SIGIO_BY_DEFAULT
/* Support PC98 */
#undef SUPPORT_PC98
/* Build with libdrm support */
#undef WITH_LIBDRM