xf86-video-s3 0.5.0 from X.Org 7.2RC3

This commit is contained in:
matthieu 2006-12-16 17:04:43 +00:00
parent 1e6e3c3517
commit 124e493089
8 changed files with 232 additions and 31 deletions

View File

@ -57,7 +57,7 @@ build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
$(top_srcdir)/configure COPYING ChangeLog compile config.guess \
config.sub depcomp install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -129,6 +129,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -163,13 +164,9 @@ STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -186,24 +183,31 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
moduledir = @moduledir@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@

View File

@ -0,0 +1,142 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
scriptversion=2005-05-14.22
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
case $1 in
'')
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand `-c -o'.
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file `INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
esac
ofile=
cfile=
eat=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as `compile cc -o foo foo.c'.
# So we strip `-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
ofile=$2
;;
*)
set x "$@" -o "$2"
shift
;;
esac
;;
*.c)
cfile=$1
set x "$@" "$1"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -z "$ofile" || test -z "$cfile"; then
# If no `-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# `.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
"$@"
ret=$?
if test -f "$cofile"; then
mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

View File

@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-s3],
0.4.1,
0.5.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-s3)

View File

@ -30,7 +30,6 @@ s3_drv_ladir = @moduledir@/drivers
s3_drv_la_SOURCES = \
newmmio.h \
s3_accel.c \
s3_bios.c \
s3_cursor.c \
s3_dga.c \
@ -41,3 +40,12 @@ s3_drv_la_SOURCES = \
s3_Ti.c \
s3_Trio64DAC.c \
s3_video.c
noinst_LTLIBRARIES = libs3_accel_newmmio.la libs3_accel_pio.la
s3_drv_la_LIBADD = libs3_accel_newmmio.la libs3_accel_pio.la
libs3_accel_newmmio_la_SOURCES = s3_accel.c
libs3_accel_newmmio_la_CFLAGS = $(AM_CFLAGS) -DS3_NEWMMIO=1
libs3_accel_pio_la_SOURCES = s3_accel.c
libs3_accel_pio_la_CFLAGS = $(AM_CFLAGS)

View File

@ -73,10 +73,17 @@ am__vpath_adj = case $$p in \
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(s3_drv_ladir)"
s3_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(s3_drv_la_LTLIBRARIES)
s3_drv_la_LIBADD =
am_s3_drv_la_OBJECTS = s3_accel.lo s3_bios.lo s3_cursor.lo s3_dga.lo \
s3_driver.lo s3_IBMRGB.lo s3_Ti.lo s3_Trio64DAC.lo s3_video.lo
LTLIBRARIES = $(noinst_LTLIBRARIES) $(s3_drv_la_LTLIBRARIES)
libs3_accel_newmmio_la_LIBADD =
am_libs3_accel_newmmio_la_OBJECTS = \
libs3_accel_newmmio_la-s3_accel.lo
libs3_accel_newmmio_la_OBJECTS = $(am_libs3_accel_newmmio_la_OBJECTS)
libs3_accel_pio_la_LIBADD =
am_libs3_accel_pio_la_OBJECTS = libs3_accel_pio_la-s3_accel.lo
libs3_accel_pio_la_OBJECTS = $(am_libs3_accel_pio_la_OBJECTS)
s3_drv_la_DEPENDENCIES = libs3_accel_newmmio.la libs3_accel_pio.la
am_s3_drv_la_OBJECTS = s3_bios.lo s3_cursor.lo s3_dga.lo s3_driver.lo \
s3_IBMRGB.lo s3_Ti.lo s3_Trio64DAC.lo s3_video.lo
s3_drv_la_OBJECTS = $(am_s3_drv_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@ -89,8 +96,10 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(s3_drv_la_SOURCES)
DIST_SOURCES = $(s3_drv_la_SOURCES)
SOURCES = $(libs3_accel_newmmio_la_SOURCES) \
$(libs3_accel_pio_la_SOURCES) $(s3_drv_la_SOURCES)
DIST_SOURCES = $(libs3_accel_newmmio_la_SOURCES) \
$(libs3_accel_pio_la_SOURCES) $(s3_drv_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -132,6 +141,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -166,13 +176,9 @@ STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -189,24 +195,31 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
moduledir = @moduledir@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@ -223,7 +236,6 @@ s3_drv_la_LDFLAGS = -module -avoid-version
s3_drv_ladir = @moduledir@/drivers
s3_drv_la_SOURCES = \
newmmio.h \
s3_accel.c \
s3_bios.c \
s3_cursor.c \
s3_dga.c \
@ -235,6 +247,12 @@ s3_drv_la_SOURCES = \
s3_Trio64DAC.c \
s3_video.c
noinst_LTLIBRARIES = libs3_accel_newmmio.la libs3_accel_pio.la
s3_drv_la_LIBADD = libs3_accel_newmmio.la libs3_accel_pio.la
libs3_accel_newmmio_la_SOURCES = s3_accel.c
libs3_accel_newmmio_la_CFLAGS = $(AM_CFLAGS) -DS3_NEWMMIO=1
libs3_accel_pio_la_SOURCES = s3_accel.c
libs3_accel_pio_la_CFLAGS = $(AM_CFLAGS)
all: all-am
.SUFFIXES:
@ -268,6 +286,15 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
install-s3_drv_laLTLIBRARIES: $(s3_drv_la_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(s3_drv_ladir)" || $(mkdir_p) "$(DESTDIR)$(s3_drv_ladir)"
@ -295,6 +322,10 @@ clean-s3_drv_laLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libs3_accel_newmmio.la: $(libs3_accel_newmmio_la_OBJECTS) $(libs3_accel_newmmio_la_DEPENDENCIES)
$(LINK) $(libs3_accel_newmmio_la_LDFLAGS) $(libs3_accel_newmmio_la_OBJECTS) $(libs3_accel_newmmio_la_LIBADD) $(LIBS)
libs3_accel_pio.la: $(libs3_accel_pio_la_OBJECTS) $(libs3_accel_pio_la_DEPENDENCIES)
$(LINK) $(libs3_accel_pio_la_LDFLAGS) $(libs3_accel_pio_la_OBJECTS) $(libs3_accel_pio_la_LIBADD) $(LIBS)
s3_drv.la: $(s3_drv_la_OBJECTS) $(s3_drv_la_DEPENDENCIES)
$(LINK) -rpath $(s3_drv_ladir) $(s3_drv_la_LDFLAGS) $(s3_drv_la_OBJECTS) $(s3_drv_la_LIBADD) $(LIBS)
@ -304,10 +335,11 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libs3_accel_newmmio_la-s3_accel.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libs3_accel_pio_la-s3_accel.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s3_IBMRGB.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s3_Ti.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s3_Trio64DAC.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s3_accel.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s3_bios.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s3_cursor.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s3_dga.Plo@am__quote@
@ -335,6 +367,20 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
libs3_accel_newmmio_la-s3_accel.lo: s3_accel.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libs3_accel_newmmio_la_CFLAGS) $(CFLAGS) -MT libs3_accel_newmmio_la-s3_accel.lo -MD -MP -MF "$(DEPDIR)/libs3_accel_newmmio_la-s3_accel.Tpo" -c -o libs3_accel_newmmio_la-s3_accel.lo `test -f 's3_accel.c' || echo '$(srcdir)/'`s3_accel.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libs3_accel_newmmio_la-s3_accel.Tpo" "$(DEPDIR)/libs3_accel_newmmio_la-s3_accel.Plo"; else rm -f "$(DEPDIR)/libs3_accel_newmmio_la-s3_accel.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='s3_accel.c' object='libs3_accel_newmmio_la-s3_accel.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libs3_accel_newmmio_la_CFLAGS) $(CFLAGS) -c -o libs3_accel_newmmio_la-s3_accel.lo `test -f 's3_accel.c' || echo '$(srcdir)/'`s3_accel.c
libs3_accel_pio_la-s3_accel.lo: s3_accel.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libs3_accel_pio_la_CFLAGS) $(CFLAGS) -MT libs3_accel_pio_la-s3_accel.lo -MD -MP -MF "$(DEPDIR)/libs3_accel_pio_la-s3_accel.Tpo" -c -o libs3_accel_pio_la-s3_accel.lo `test -f 's3_accel.c' || echo '$(srcdir)/'`s3_accel.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libs3_accel_pio_la-s3_accel.Tpo" "$(DEPDIR)/libs3_accel_pio_la-s3_accel.Plo"; else rm -f "$(DEPDIR)/libs3_accel_pio_la-s3_accel.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='s3_accel.c' object='libs3_accel_pio_la-s3_accel.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libs3_accel_pio_la_CFLAGS) $(CFLAGS) -c -o libs3_accel_pio_la-s3_accel.lo `test -f 's3_accel.c' || echo '$(srcdir)/'`s3_accel.c
mostlyclean-libtool:
-rm -f *.lo
@ -453,8 +499,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-generic clean-libtool clean-s3_drv_laLTLIBRARIES \
mostlyclean-am
clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
clean-s3_drv_laLTLIBRARIES mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@ -503,11 +549,12 @@ ps-am:
uninstall-am: uninstall-info-am uninstall-s3_drv_laLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-s3_drv_laLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
clean-libtool clean-noinstLTLIBRARIES \
clean-s3_drv_laLTLIBRARIES ctags distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-man \
install-s3_drv_laLTLIBRARIES install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \

View File

@ -164,10 +164,10 @@ typedef struct _S3Rec {
#define DRIVER_NAME "s3"
#define DRIVER_VERSION "0.4.1"
#define DRIVER_VERSION "0.5.0"
#define VERSION_MAJOR 0
#define VERSION_MINOR 4
#define PATCHLEVEL 1
#define VERSION_MINOR 5
#define PATCHLEVEL 0
#define S3_VERSION ((VERSION_MAJOR << 24) | \
(VERSION_MINOR << 16) | PATCHLEVEL)

View File

@ -24,7 +24,7 @@
*
*
*/
/* $XdotOrg: driver/xf86-video-s3/src/s3_accel.c,v 1.4 2005/07/11 02:29:58 ajax Exp $ */
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2004/04/23 19:43:14 eich Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2001/10/28 03:33:44 tsi Exp $ */
#ifdef HAVE_CONFIG_H

View File

@ -1,4 +1,4 @@
/* $XFree86: $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_reg.h,v 1.1 2001/07/02 10:46:04 alanh Exp $ */
#ifndef _S3_REG_H
#define _S3_REG_H