xserver-xorg-video-i128: Changes to 'upstream-unstable'
.gitignore | 70 +++++++++++++++++++++++++++++++++++---
COPYING | 47 +++++++++++++++++++++----
ChangeLog | 45 ------------------------
Makefile.am | 15 ++++----
README | 76 ++++++++++++++++++++---------------------
README.sgml | 98 ------------------------------------------------------
configure.ac | 48 ++++++++++++--------------
man/.cvsignore | 2 -
man/Makefile.am | 59 +++++++++++---------------------
man/i128.man | 1
src/.cvsignore | 6 ---
src/i128_driver.c | 37 +++++++++++---------
src/i128accel.c | 4 +-
src/i128dga.c | 6 +--
src/i128init.c | 15 +++++++-
src/i128reg.h | 2 -
16 files changed, 236 insertions(+), 295 deletions(-)
New commits:
commit 2228b7f80cc2f2a13dc00fd659b592407f1bbef1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 23 18:51:51 2012 -0700
xf86-video-i128 1.3.5
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 5ae48b0..76571d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-i128],
- [1.3.4],
+ [1.3.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-i128])
AC_CONFIG_SRCDIR([Makefile.am])
commit 3b23ca1d037b9d70f8e3a1ce5b5af0cba05f45cc
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 17:48:13 2011 -0500
Fix for new vgaHW ABI
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 7990c9b..bdb999e 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -492,6 +492,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
hwp = VGAHWPTR(pScrn);
+ vgaHWSetStdFuncs(hwp);
vgaHWGetIOBase(hwp);
/* Set pScrn->monitor */
commit 0a46285e074dded359c859b8ffa2a0c9c437b21b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 16:29:49 2011 -0500
Make failure to XAA non-fatal
No shadowfb support in this driver yet.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 92f9d58..7990c9b 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -1117,8 +1117,9 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
}
} else {
if (!xf86LoadSubModule(pScrn, "xaa")) {
- I128FreeRec(pScrn);
- return FALSE;
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "No acceleration available\n");
+ pI128->NoAccel = 1;
}
}
}
commit 0e357623bc3d68e6eaf9bb755f44cca2d5321f8b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 19 00:24:00 2011 -0700
Build fix for ABI Version 12
ABI Version 12 removes support for multiple PCI domains. If you need to
use this driver on a system with more than one PCI domain, you should
either port this driver to using libpciaccess directly or stick with an
older server.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 26c06df..92f9d58 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -650,7 +650,10 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, from, "Subsystem Vendor: \"%x\"\n",
PCI_SUB_VENDOR_ID(pI128->PciInfo));
- iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00) + hwp->PIOOffset;
+ iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ iobase += hwp->PIOOffset;
+#endif
pI128->RegRec.iobase = iobase;
pI128->io.rbase_g = inl(iobase) & 0xFFFFFF00;
commit c3eb2c3f05902be4e4e5b929663753276cde3611
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 19 00:23:12 2011 -0700
Use unsigned long rather than deprecated IOADDRESS
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 40f1e4d..26c06df 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -446,7 +446,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
int i;
ClockRangePtr clockRanges;
MessageType from;
- IOADDRESS iobase;
+ unsigned long iobase;
char *ramdac = NULL;
CARD32 tmpl, tmph, tmp;
unsigned char n, m, p, mdc, df;
@@ -1804,7 +1804,7 @@ I128DDC1Read(ScrnInfoPtr pScrn)
I128Ptr pI128 = I128PTR(pScrn);
unsigned char val;
unsigned long tmp, ddc;
- IOADDRESS iobase;
+ unsigned long iobase;
iobase = pI128->RegRec.iobase;
ddc = inl(iobase + 0x2C);
@@ -1839,7 +1839,7 @@ I128I2CGetBits(I2CBusPtr b, int *clock, int *data)
{
I128Ptr pI128 = I128PTR(xf86Screens[b->scrnIndex]);
unsigned long ddc;
- IOADDRESS iobase;
+ unsigned long iobase;
#if 0
static int lastclock = -1, lastdata = -1;
#endif
@@ -1867,7 +1867,7 @@ I128I2CPutBits(I2CBusPtr b, int clock, int data)
unsigned char drv, val;
unsigned long ddc;
unsigned long tmp;
- IOADDRESS iobase;
+ unsigned long iobase;
iobase = pI128->RegRec.iobase;
ddc = inl(iobase + 0x2C);
@@ -1889,7 +1889,7 @@ I128I2CInit(ScrnInfoPtr pScrn)
{
I128Ptr pI128 = I128PTR(pScrn);
I2CBusPtr I2CPtr;
- IOADDRESS iobase;
+ unsigned long iobase;
unsigned long soft_sw, ddc;
I2CPtr = xf86CreateI2CBusRec();
@@ -2102,7 +2102,7 @@ void
I128DumpActiveRegisters(ScrnInfoPtr pScrn)
{
I128Ptr pI128 = I128PTR(pScrn);
- IOADDRESS iobase;
+ unsigned long iobase;
unsigned long rbase_g, rbase_w, rbase_a, rbase_b, rbase_i, rbase_e;
unsigned long id, config1, config2, sgram, soft_sw, ddc, vga_ctl;
volatile CARD32 *vrba, *vrbg, *vrbw;
diff --git a/src/i128reg.h b/src/i128reg.h
index 56b9c33..a72b525 100644
--- a/src/i128reg.h
+++ b/src/i128reg.h
@@ -75,7 +75,7 @@ struct i128mem {
/* save the registers needed for restoration in this structure */
typedef struct {
- IOADDRESS iobase; /* saved only for iobase indexing */
+ unsigned long iobase; /* saved only for iobase indexing */
CARD32 config1; /* iobase+0x1C register */
CARD32 config2; /* iobase+0x20 register */
CARD32 sgram; /* iobase+0x24 register */
commit f5c6593c9309541eedd374431dbd72151b8fb3ab
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 19 00:22:09 2011 -0700
Use malloc/calloc/realloc/free directly
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 903a3a8..40f1e4d 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -304,13 +304,13 @@ I128Probe(DriverPtr drv, int flags)
numDevSections, drv, &usedChips);
/* Free it since we don't need that list after this */
- xfree(devSections);
+ free(devSections);
if (numUsed <= 0)
return FALSE;
if (flags & PROBE_DETECT) {
- xfree(usedChips);
+ free(usedChips);
return FALSE;
}
@@ -340,7 +340,7 @@ I128Probe(DriverPtr drv, int flags)
foundScreen = TRUE;
}
- xfree(usedChips);
+ free(usedChips);
return foundScreen;
}
@@ -558,7 +558,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(pI128->Options = xalloc(sizeof(I128Options))))
+ if (!(pI128->Options = malloc(sizeof(I128Options))))
return FALSE;
memcpy(pI128->Options, I128Options, sizeof(I128Options));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pI128->Options);
@@ -1157,7 +1157,7 @@ I128FreeRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -1704,12 +1704,12 @@ I128CloseScreen(int scrnIndex, ScreenPtr pScreen)
XAADestroyInfoRec(pI128->XaaInfoRec);
if (pI128->ExaDriver) {
exaDriverFini(pScreen);
- xfree(pI128->ExaDriver);
+ free(pI128->ExaDriver);
}
if (pI128->CursorInfoRec)
xf86DestroyCursorInfoRec(pI128->CursorInfoRec);
if (pI128->DGAModes)
- xfree(pI128->DGAModes);
+ free(pI128->DGAModes);
pScrn->vtSema = FALSE;
pScreen->CloseScreen = pI128->CloseScreen;
diff --git a/src/i128dga.c b/src/i128dga.c
index 48823aa..8bc2fcb 100644
--- a/src/i128dga.c
+++ b/src/i128dga.c
@@ -59,15 +59,15 @@ I128DGAInit(ScreenPtr pScreen)
while(pMode) {
if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
oneMore = TRUE;
} else {
- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
oneMore = FALSE;
}
if(!newmodes) {
- xfree(modes);
+ free(modes);
return FALSE;
}
modes = newmodes;
commit b9e0edbd4ab23c811714a648cb729b5c11356795
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:29:51 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/i128.man b/man/i128.man
index 920d2ab..a8e2e54 100644
--- a/man/i128.man
+++ b/man/i128.man
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.2 2001/01/27 18:20:48 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH I128 __drivermansuffix__ __vendorversion__
commit d7c1073cf42e3486b49f5a55f2c5f2929b18417f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 10:51:59 2010 -0400
xf86-video-i128 1.3.4
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 6fa235f..5ae48b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-i128],
- [1.3.3],
+ [1.3.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-i128])
AC_CONFIG_SRCDIR([Makefile.am])
commit 94cdca24c2035245b191e2d1c453fc02c2fbecac
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
diff --git a/configure.ac b/configure.ac
index eee8e2f..6fa235f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
#
# Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-i128],
[1.3.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-i128])
-
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -40,25 +40,26 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
+# Define a configure option for an alternate module directory
AC_ARG_WITH(xorg-module-dir,
AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
# Checks for libraries.
commit 2c9c7070abec4eb3fbf14f380dd1e57d63fdd720
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:07:00 2010 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 4780299..eee8e2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,8 +86,9 @@ AC_SUBST([moduledir])
DRIVER_NAME=i128
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT
commit 68934cda27a0c2c051187f77c0d8faf82b9615f4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:37:41 2010 -0400
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 073409f..4780299 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
commit bef6413d558428f439422126f77791814df4453b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:22 2010 -0400
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d56557e..073409f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-i128],
[xf86-video-i128])
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 53239cdc70f2ffff09b2d509f44319008e5c6397
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 09:27:42 2010 -0400
config: complete AC_INIT m4 quoting
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index cb0764c..d56557e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-i128],
- 1.3.3,
+ [1.3.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-i128)
+ [xf86-video-i128])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
commit b0f3826e110f44e3dd0660b8c6d0dd04cc35d908
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:44:57 2010 -0400
config: remove unrequired AC_SUBST([XORG_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 9d56366..cb0764c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,6 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle])
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=i128
commit 4b3e0c971fc320bf3d47b56adc0f65ac16d78eb7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 20:24:42 2010 -0400
config: remove unrequired AC_HEADER_STDC
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 550d7c0..9d56366 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,8 +80,6 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
# Required by exa.h
AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle])
-# Checks for header files.
-AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
commit aedc94dd1770317bb41e9341863f371834203373
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 19:41:31 2010 -0400
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 29a8169..550d7c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
commit 04015a519e52493fcd43f4d940a3a9e55d7c03be
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 18:45:19 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 9ae0ac6..29a8169 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
AC_INIT([xf86-video-i128],
1.3.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit eda5280a2acd6b55c9cc29a7d251aca5915ad744
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 16:15:29 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
diff --git a/configure.ac b/configure.ac
index ba90bb6..9ae0ac6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for programs.
diff --git a/man/Makefile.am b/man/Makefile.am
index 8f2454b..b3688ce 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit ff026f65b3e8f54d6677b8dc16fd17db43b39edf
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 18:51:15 2010 -0400
README: keep the text version of README, discard the sgml version
The linuxdoc doc tool is deprecated.
README files are exclusively text files.
The file had not been updated for 5 years.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 310cd3d..4c278ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,13 +21,6 @@
SUBDIRS = src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
-if BUILD_LINUXDOC
-README: README.sgml
- $(MAKE_TEXT) README.sgml && mv README.txt README
-endif
-
-EXTRA_DIST = README.sgml
-
.PHONY: ChangeLog INSTALL
INSTALL:
diff --git a/README.sgml b/README.sgml
deleted file mode 100644
index 02dbceb..0000000
--- a/README.sgml
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
-<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
-]>
-
-<article>
-<title>Information for Number Nine I128 Users
-<author>The XFree86 Project Inc.
-<date>25 March 2004
-
-<toc>
-
-<sect>Supported hardware
-<p>
-The current accelerated I128 server supports
-<p>
-<itemize>
-<item>Imagine 128
-(I128 with Texas Instruments TVP3025 or IBM528 RAMDAC). It has been tested with
-with 4MB of VRAM.
-<item>Imagine 128 Ticket 2 Ride
-(I128-T2R with IBM526 or 528 RAMDAC). It has been tested with 4 MB and 8 MB of
-VRAM and DRAM.
-<item>Imagine 128 Revolution 3D
-(I128-R3D with IBM526 RAMDAC). It has been tested with 4 MB, 8 MB, and 16 MB
-of WRAM or SGRAM.
-<item>Imagine 128 Revolution IV
-(I128-R4 with SILVERHAMMER RAMDAC). It has been tested with 32 MB.
-</itemize>
-
-<sect>Features:
-<p>
-<itemize>
-<item>uses linear frame buffer
-<item>Resolutions up to the maximum supported by the card should be possible.
-<item>8 bpp, 16 bpp (depth 15 and 16), and 32 bpp (depth 24, sparse) are
-supported.
-<item>supports RGB Sync-on-Green
-<item>Makes use of the graphics accelerator.
-</itemize>
-
-<sect>Configuration:
-<p>
-The I128 driver should auto-detect all supported hardware so you needn't
-have anything other than the Identifier in the Section "Device" of the
-xorg.conf file. When running the xorgcfg or xorgconfig programs one
-merely needs to select an I128 card so that the correct server will be
-used. One need not and should not specify a RAMDAC, clockchip or allow
-the setup program to probe for clocks. The driver will auto-detect the
-amount of video ram present.
-
-The following Section "Device" options are supported by the I128 driver:
-<itemize>
-<item>Option "Dac6Bit"
-<p>
-Will enable 6-bit DAC support.
-<item>Option "NoAccel"
-<p>
-Will disable all hardware acceleration.
-<item>Option "SyncOnGreen"
-<p>
-Will enable syncing on green for sync-on-green monitors (these are typically
-fixed frequency workstation monitors).
-</itemize>
-
-<sect>Mode lines for the Silicon Graphics flat panel display:
-<p>
-<itemize>
-<item>These mode lines are required for use with the T2R4 (Rev 4) and the
-Silicon Graphics Flat Panel display.
-<item>Modeline "1600x1024d32" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 7 +Hsync +Vsync
-<item>Modeline "1600x1024d16" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 5 +Hsync +Vsync
-<item>Modeline "1600x1024d08" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 1 +Hsync +Vsync
-<item>Modeline "800x512d32" 54.375 800 800 840 848 512 512 514 515 HSkew 7 DoubleScan +Hsync +Vsync
-<item>Modeline "800x512d16" 54.375 800 800 840 848 512 512 514 515 HSkew 5 DoubleScan +Hsync +Vsync
-<item>Modeline "800x512d08" 54.375 800 800 840 848 512 512 514 515 HSkew 1 DoubleScan +Hsync +Vsync
-</itemize>
-
-<p>
-<itemize>
-<item>These lines are required for use with the SGI Multilink Adapter and the SiliconGraphics Flat Panel display.
-<item>Modeline "1600x1024g" 108.0 1600 1616 1656 1704 1024 1027 1030 1056 -Hsync -Vsync
-<item>Option "OverridePolarity" "1"
-</itemize>
-
-<sect>Author(s)
-<p>
-
-Robin Cutshaw, <url url="mailto:robin@XFree86.Org";>
-
-and special help from:
-
-<itemize>
-<item>Galen Brooks, <url url="mailto:galen@interlabs.com";>
-</itemize>
-
-</article>
diff --git a/configure.ac b/configure.ac
index 3c51993..ba90bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,8 +90,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=i128
AC_SUBST([DRIVER_NAME])
-XORG_CHECK_LINUXDOC
-
AC_OUTPUT([
Makefile
src/Makefile
commit 399c47cb69731d1e3e8d59edd53b3e7cc2b77d95
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 18:40:05 2010 -0400
README: fix linuxdoc content
defs.ent are located under X11 directory
ident tag is not a Linuxdoc tag
replace docbook email tag with linuxdoc email tag
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/README b/README
index 432227e..c0b7380 100644
--- a/README
+++ b/README
@@ -15,111 +15,111 @@
______________________________________________________________________
- [1m1. Supported hardware[0m
+ 1. Supported hardware
The current accelerated I128 server supports
- +o Imagine 128 (I128 with Texas Instruments TVP3025 or IBM528 RAMDAC).
+ o Imagine 128 (I128 with Texas Instruments TVP3025 or IBM528 RAMDAC).
It has been tested with with 4MB of VRAM.
- +o Imagine 128 Ticket 2 Ride (I128-T2R with IBM526 or 528 RAMDAC). It
+ o Imagine 128 Ticket 2 Ride (I128-T2R with IBM526 or 528 RAMDAC). It
has been tested with 4 MB and 8 MB of VRAM and DRAM.
- +o Imagine 128 Revolution 3D (I128-R3D with IBM526 RAMDAC). It has
+ o Imagine 128 Revolution 3D (I128-R3D with IBM526 RAMDAC). It has
been tested with 4 MB, 8 MB, and 16 MB of WRAM or SGRAM.
- +o Imagine 128 Revolution IV (I128-R4 with SILVERHAMMER RAMDAC). It
+ o Imagine 128 Revolution IV (I128-R4 with SILVERHAMMER RAMDAC). It
has been tested with 32 MB.
- [1m2. Features:[0m
+ 2. Features:
- +o uses linear frame buffer
+ o uses linear frame buffer
- +o Resolutions up to the maximum supported by the card should be
+ o Resolutions up to the maximum supported by the card should be
possible.
- +o 8 bpp, 16 bpp (depth 15 and 16), and 32 bpp (depth 24, sparse) are
+ o 8 bpp, 16 bpp (depth 15 and 16), and 32 bpp (depth 24, sparse) are
supported.
- +o supports RGB Sync-on-Green
+ o supports RGB Sync-on-Green
- +o Makes use of the graphics accelerator.
+ o Makes use of the graphics accelerator.
- [1m3. Configuration:[0m
+ 3. Configuration:
The I128 driver should auto-detect all supported hardware so you
needn't have anything other than the Identifier in the Section
- "Device" of the xorg.conf file. When running the xorgcfg or
- xorgconfig programs one merely needs to select an I128 card so that
- the correct server will be used. One need not and should not specify
- a RAMDAC, clockchip or allow the setup program to probe for clocks.
- The driver will auto-detect the amount of video ram present.
+ "Device" of the xorg.conf file. When running the xorgcfg or xorgconfig
+ programs one merely needs to select an I128 card so that the correct
+ server will be used. One need not and should not specify a RAMDAC,
+ clockchip or allow the setup program to probe for clocks. The driver
+ will auto-detect the amount of video ram present.
The following Section "Device" options are supported by the I128
driver:
- +o Option "Dac6Bit"
+ o Option "Dac6Bit"
Will enable 6-bit DAC support.
- +o Option "NoAccel"
+ o Option "NoAccel"
Will disable all hardware acceleration.
- +o Option "SyncOnGreen"
+ o Option "SyncOnGreen"
Will enable syncing on green for sync-on-green monitors (these are
typically fixed frequency workstation monitors).
- [1m4. Mode lines for the Silicon Graphics flat panel display:[0m
+ 4. Mode lines for the Silicon Graphics flat panel display:
- +o These mode lines are required for use with the T2R4 (Rev 4) and the
+ o These mode lines are required for use with the T2R4 (Rev 4) and the
Silicon Graphics Flat Panel display.
- +o Modeline "1600x1024d32" 103.125 1600 1600 1656 1664 1024 1024 1029
+ o Modeline "1600x1024d32" 103.125 1600 1600 1656 1664 1024 1024 1029
1030 HSkew 7 +Hsync +Vsync
- +o Modeline "1600x1024d16" 103.125 1600 1600 1656 1664 1024 1024 1029
+ o Modeline "1600x1024d16" 103.125 1600 1600 1656 1664 1024 1024 1029
1030 HSkew 5 +Hsync +Vsync
- +o Modeline "1600x1024d08" 103.125 1600 1600 1656 1664 1024 1024 1029
+ o Modeline "1600x1024d08" 103.125 1600 1600 1656 1664 1024 1024 1029
1030 HSkew 1 +Hsync +Vsync
- +o Modeline "800x512d32" 54.375 800 800 840 848 512 512 514 515
- HSkew 7 DoubleScan +Hsync +Vsync
+ o Modeline "800x512d32" 54.375 800 800 840 848 512 512 514 515 HSkew
+ 7 DoubleScan +Hsync +Vsync
- +o Modeline "800x512d16" 54.375 800 800 840 848 512 512 514 515
- HSkew 5 DoubleScan +Hsync +Vsync
+ o Modeline "800x512d16" 54.375 800 800 840 848 512 512 514 515 HSkew
+ 5 DoubleScan +Hsync +Vsync
- +o Modeline "800x512d08" 54.375 800 800 840 848 512 512 514 515
- HSkew 1 DoubleScan +Hsync +Vsync
+ o Modeline "800x512d08" 54.375 800 800 840 848 512 512 514 515 HSkew
+ 1 DoubleScan +Hsync +Vsync
- +o These lines are required for use with the SGI Multilink Adapter and
+ o These lines are required for use with the SGI Multilink Adapter and
the SiliconGraphics Flat Panel display.
- +o Modeline "1600x1024g" 108.0 1600 1616 1656 1704 1024 1027 1030
- 1056 -Hsync -Vsync
+ o Modeline "1600x1024g" 108.0 1600 1616 1656 1704 1024 1027 1030 1056
+ -Hsync -Vsync
- +o Option "OverridePolarity" "1"
+ o Option "OverridePolarity" "1"
- [1m5. Author(s)[0m
+ 5. Author(s)
- Robin Cutshaw, <robin@XFree86.Org>
+ Robin Cutshaw, <mailto:robin@XFree86.Org>
and special help from:
- +o Galen Brooks, <galen@interlabs.com>
+ o Galen Brooks, <mailto:galen@interlabs.com>
diff --git a/README.sgml b/README.sgml
index 289a5b6..02dbceb 100644
--- a/README.sgml
+++ b/README.sgml
@@ -1,13 +1,11 @@
<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
-<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
]>
<article>
<title>Information for Number Nine I128 Users
<author>The XFree86 Project Inc.
<date>25 March 2004
-<ident>
-</ident>
<toc>
@@ -87,12 +85,12 @@ Silicon Graphics Flat Panel display.
<sect>Author(s)
<p>
-Robin Cutshaw, <email>robin@XFree86.Org</email>
+Robin Cutshaw, <url url="mailto:robin@XFree86.Org";>
and special help from:
<itemize>
-<item>Galen Brooks, <email>galen@interlabs.com</email>
+<item>Galen Brooks, <url url="mailto:galen@interlabs.com";>
</itemize>
Reply to: