xserver-xorg-video-mach64: Changes to 'debian-unstable'
ChangeLog | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 4 +-
debian/changelog | 8 ++++
debian/compat | 2 -
debian/control | 3 -
debian/rules | 4 +-
src/Makefile.am | 5 +-
src/atiaudio.c | 50 ----------------------------
src/atiaudio.h | 2 -
src/atidecoder.c | 50 ----------------------------
src/atidecoder.h | 51 -----------------------------
src/atimach64probe.c | 37 ++++++++++++++++++++-
src/atipreinit.c | 53 ++++++------------------------
13 files changed, 153 insertions(+), 204 deletions(-)
New commits:
commit 95f69c4e6dd94716fe095b5e2acb66392e6212d4
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 7 08:10:50 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 0cc115c..4d38585 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-mach64 (6.9.5-1) UNRELEASED; urgency=medium
+xserver-xorg-video-mach64 (6.9.5-1) unstable; urgency=medium
* New upstream release.
* Remove Drew and Cyril from Uploaders.
* Bump debhelper compat level to 9.
- -- Julien Cristau <jcristau@debian.org> Thu, 07 May 2015 02:32:11 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 07 May 2015 08:10:39 +0200
xserver-xorg-video-mach64 (6.9.4-2) unstable; urgency=medium
commit 97b8273188e98e30aab02fc310962a8d41db43d1
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 7 02:33:58 2015 +0200
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index e544301..0cc115c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-mach64 (6.9.5-1) UNRELEASED; urgency=medium
* New upstream release.
* Remove Drew and Cyril from Uploaders.
+ * Bump debhelper compat level to 9.
-- Julien Cristau <jcristau@debian.org> Thu, 07 May 2015 02:32:11 +0200
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 345a694..980ef2a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
pkg-config,
xserver-xorg-dev (>= 2:1.11.99.901),
diff --git a/debian/rules b/debian/rules
index 7a15cb6..82ee7d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
#!/usr/bin/make -f
override_dh_auto_configure:
- dh_auto_configure -- --disable-silent-rules
+ dh_auto_configure -- \
+ --disable-silent-rules \
+ --libdir=\$${exec_prefix}/lib
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
commit fff91df7de9079622d1dc4e789ed490b33e7c06e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 7 02:33:11 2015 +0200
Remove Drew and Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index fd81f6e..e544301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-mach64 (6.9.5-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Remove Drew and Cyril from Uploaders.
-- Julien Cristau <jcristau@debian.org> Thu, 07 May 2015 02:32:11 +0200
diff --git a/debian/control b/debian/control
index 4d7b49c..345a694 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-video-mach64
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
commit 499c8e4ad7311135673e071765bbd0621d7594d1
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 7 02:32:33 2015 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index fe45b7b..f2a5a11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,91 @@
+commit 8f920350a736012ce2a7469d8252f5f5bf72cef3
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon May 4 15:50:09 2015 -0400
+
+ mach64 6.9.5
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 810572536e153ac9e4615a35e2ab99dc266806da
+Author: Dave Airlie <airlied@redhat.com>
+Date: Sat Nov 15 11:29:54 2014 +1000
+
+ mach64: fix build probably not required with pci access anyways
+
+commit e538ff6b2108117a7ae6644a844c6ce10fc0f1ee
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Wed Nov 27 23:53:31 2013 -0800
+
+ Drop dependence on xf86PciInfo.h
+
+ It is about time we stop using this deprecated file and include pciids
+ locally.
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 2c83b465b336a012f2d2716940bf483358388000
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon Jun 3 13:01:23 2013 -0400
+
+ Deal with pPict->pDrawable == NULL for source-only pictures.
+
+ Falling back to software rendering for such source pictures
+ (solid/gradient).
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit ec6ee6a112dc38cab563779583944dba9393f385
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Apr 3 09:14:54 2013 -0400
+
+ Bump minimum xserver to 1.4
+
+ Due to the previous change we no longer support servers where ddc is not
+ a server builtin.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit fa18180cc5f6d84168ffca6b7b8e467a5c72da14
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Apr 2 11:15:47 2013 -0400
+
+ preinit: Don't bother explicitly loading int10, vbe will do it for us
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 80e62cc1dfb80c3170e43c3941b56d0a84bddc3b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Dec 19 22:37:07 2012 -0800
+
+ Remove unused atiaudio.c & ATIAudioNames declaration
+
+ Defined a string array, which is not used anywhere.
+
+ atiaudio.h remains for now, though for the enum it defines, only one
+ reference to it remains, initializing the Audio to ATI_AUDIO_NONE, so
+ it may be a candidate for further cleanup in the future.
+
+ Reported by Solaris linker -z guidance option:
+ ld: guidance: removal of unused file recommended: atiaudio.o
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 233270a78d41d9df5614e17d73c8c4add391459b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Dec 19 22:33:48 2012 -0800
+
+ Remove unused atidecoder.c & atidecoder.h
+
+ Defined a enum & string array, neither of which were used anywhere.
+
+ Reported by Solaris linker -z guidance option:
+ ld: guidance: removal of unused file recommended: atidecoder.o
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
commit 0d8639f3cd4128ae856ae27f3787c1da224bb564
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 19 22:14:08 2012 -0800
diff --git a/debian/changelog b/debian/changelog
index 00020dd..fd81f6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-mach64 (6.9.5-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 07 May 2015 02:32:11 +0200
+
xserver-xorg-video-mach64 (6.9.4-2) unstable; urgency=medium
* Deal with pPict->pDrawable == NULL for source-only pictures [cherry-picked
commit 8f920350a736012ce2a7469d8252f5f5bf72cef3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 4 15:50:09 2015 -0400
mach64 6.9.5
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 5d8199f..830c25e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-mach64],
- [6.9.4],
+ [6.9.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-mach64])
AC_CONFIG_SRCDIR([Makefile.am])
commit 810572536e153ac9e4615a35e2ab99dc266806da
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Nov 15 11:29:54 2014 +1000
mach64: fix build probably not required with pci access anyways
diff --git a/src/atipreinit.c b/src/atipreinit.c
index e3048d2..dbcd9fd 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -1079,12 +1079,14 @@ ATIPreInit
}
}
+#ifndef XSERVER_LIBPCIACCESS
if (!xf86LinearVidMem())
{
xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
"A linear aperture is not available.\n");
goto bail;
}
+#endif
/*
* Set colour weights.
commit e538ff6b2108117a7ae6644a844c6ce10fc0f1ee
Author: Connor Behan <connor.behan@gmail.com>
Date: Wed Nov 27 23:53:31 2013 -0800
Drop dependence on xf86PciInfo.h
It is about time we stop using this deprecated file and include pciids
locally.
Signed-off-by: Connor Behan <connor.behan@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/src/atimach64probe.c b/src/atimach64probe.c
index e94c3f2..430af6c 100644
--- a/src/atimach64probe.c
+++ b/src/atimach64probe.c
@@ -38,7 +38,42 @@
#include "atiadjust.h"
#include "ativalid.h"
-#include "xf86PciInfo.h"
+/* Chip definitions */
+#define PCI_VENDOR_ATI 0x1002
+#define PCI_CHIP_MACH64CT 0x4354
+#define PCI_CHIP_MACH64CX 0x4358
+#define PCI_CHIP_MACH64ET 0x4554
+#define PCI_CHIP_MACH64GB 0x4742
+#define PCI_CHIP_MACH64GD 0x4744
+#define PCI_CHIP_MACH64GI 0x4749
+#define PCI_CHIP_MACH64GL 0x474C
+#define PCI_CHIP_MACH64GM 0x474D
+#define PCI_CHIP_MACH64GN 0x474E
+#define PCI_CHIP_MACH64GO 0x474F
+#define PCI_CHIP_MACH64GP 0x4750
+#define PCI_CHIP_MACH64GQ 0x4751
+#define PCI_CHIP_MACH64GR 0x4752
+#define PCI_CHIP_MACH64GS 0x4753
+#define PCI_CHIP_MACH64GT 0x4754
+#define PCI_CHIP_MACH64GU 0x4755
+#define PCI_CHIP_MACH64GV 0x4756
+#define PCI_CHIP_MACH64GW 0x4757
+#define PCI_CHIP_MACH64GX 0x4758
+#define PCI_CHIP_MACH64GY 0x4759
+#define PCI_CHIP_MACH64GZ 0x475A
+#define PCI_CHIP_MACH64LB 0x4C42
+#define PCI_CHIP_MACH64LD 0x4C44
+#define PCI_CHIP_MACH64LG 0x4C47
+#define PCI_CHIP_MACH64LI 0x4C49
+#define PCI_CHIP_MACH64LM 0x4C4D
+#define PCI_CHIP_MACH64LN 0x4C4E
+#define PCI_CHIP_MACH64LP 0x4C50
+#define PCI_CHIP_MACH64LQ 0x4C51
+#define PCI_CHIP_MACH64LR 0x4C52
+#define PCI_CHIP_MACH64LS 0x4C53
+#define PCI_CHIP_MACH64VT 0x5654
+#define PCI_CHIP_MACH64VU 0x5655
+#define PCI_CHIP_MACH64VV 0x5656
#ifndef XSERVER_LIBPCIACCESS
static Bool Mach64Probe(DriverPtr pDriver, int flags);
commit 2c83b465b336a012f2d2716940bf483358388000
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Jun 3 13:01:23 2013 -0400
Deal with pPict->pDrawable == NULL for source-only pictures.
Falling back to software rendering for such source pictures
(solid/gradient).
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/src/atimach64render.c b/src/atimach64render.c
index ffde2cb..8d259fa 100644
--- a/src/atimach64render.c
+++ b/src/atimach64render.c
@@ -339,10 +339,13 @@ Mach64GetOrder(int val, int *shift)
static Bool
Mach64CheckTexture(PicturePtr pPict)
{
- int w = pPict->pDrawable->width;
- int h = pPict->pDrawable->height;
+ int h,w;
int l2w, l2h, level, i;
+ if (pPict->pDrawable == NULL)
+ return FALSE;
+ w = pPict->pDrawable->width;
+ h = pPict->pDrawable->height;
for (i = 0; i < MACH64_NR_TEX_FORMATS; i++) {
if (Mach64TexFormats[i].pictFormat == pPict->format)
break;
commit ec6ee6a112dc38cab563779583944dba9393f385
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 3 09:14:54 2013 -0400
Bump minimum xserver to 1.4
Due to the previous change we no longer support servers where ddc is not
a server builtin.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 95f336b..5d8199f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Obtain compiler/linker options for the driver dependencies
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
HAVE_XEXTPROTO_71="no")
commit fa18180cc5f6d84168ffca6b7b8e467a5c72da14
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Apr 2 11:15:47 2013 -0400
preinit: Don't bother explicitly loading int10, vbe will do it for us
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/atipreinit.c b/src/atipreinit.c
index 0f5c785..e3048d2 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -531,9 +531,8 @@ ATIPreInit
#ifndef AVOID_CPIO
- xf86Int10InfoPtr pInt10Info = NULL;
vbeInfoPtr pVBE = NULL;
- pointer pInt10Module, pDDCModule = NULL, pVBEModule = NULL;
+ pointer pVBEModule = NULL;
#endif /* AVOID_CPIO */
@@ -657,42 +656,21 @@ ATIPreInit
#endif /* TV_OUT */
/*
- * If there is an ix86-style BIOS, ensure its initialisation entry point
- * has been executed, and retrieve DDC and VBE information from it.
+ * If VBE setup works, grab DDC from it
*/
- if (!(pInt10Module = xf86LoadSubModule(pScreenInfo, "int10")))
- {
- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
- "Unable to load int10 module.\n");
- }
- else if (!(pInt10Info = xf86InitInt10(pATI->iEntity)))
- {
- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
- "Unable to initialise int10 interface.\n");
+ if (!(pVBEModule = xf86LoadSubModule(pScreenInfo, "vbe"))) {
+ xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+ "Unable to load vbe module.\n");
}
else
{
- if (!(pDDCModule = xf86LoadSubModule(pScreenInfo, "ddc")))
- {
- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
- "Unable to load ddc module.\n");
- }
- else
- if (!(pVBEModule = xf86LoadSubModule(pScreenInfo, "vbe")))
- {
- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
- "Unable to load vbe module.\n");
- }
- else
- {
- if ((pVBE = VBEInit(pInt10Info, pATI->iEntity)))
- {
- ConfiguredMonitor = vbeDoEDID(pVBE, pDDCModule);
- }
- }
+ if ((pVBE = VBEInit(NULL, pATI->iEntity)))
+ ConfiguredMonitor = vbeDoEDID(pVBE, NULL);
- if (!(flags & PROBE_DETECT))
+ if (pVBE && !(flags & PROBE_DETECT))
{
+ xf86Int10InfoPtr pInt10Info = pVBE->pInt10;
+
/* Validate, then make a private copy of, the initialised BIOS */
CARD8 *pBIOS = xf86int10Addr(pInt10Info, pInt10Info->BIOSseg << 4);
@@ -715,15 +693,9 @@ ATIPreInit
/* De-activate VBE */
vbeFree(pVBE);
xf86UnloadSubModule(pVBEModule);
-
- /* De-activate int10 */
- xf86FreeInt10(pInt10Info);
- xf86UnloadSubModule(pInt10Module);
#else
- pATI->pInt10 = pInt10Info;
pATI->pVBE = pVBE;
pVBE = NULL;
- pInt10Info = NULL;
#endif /* TV_OUT */
if (ConfiguredMonitor && !(flags & PROBE_DETECT))
@@ -732,9 +704,6 @@ ATIPreInit
xf86SetDDCproperties(pScreenInfo, ConfiguredMonitor);
}
- /* DDC module is no longer needed at this point */
- xf86UnloadSubModule(pDDCModule);
-
#endif /* AVOID_CPIO */
if (flags & PROBE_DETECT)
commit 80e62cc1dfb80c3170e43c3941b56d0a84bddc3b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 19 22:37:07 2012 -0800
Remove unused atiaudio.c & ATIAudioNames declaration
Defined a string array, which is not used anywhere.
atiaudio.h remains for now, though for the enum it defines, only one
reference to it remains, initializing the Audio to ATI_AUDIO_NONE, so
it may be a candidate for further cleanup in the future.
Reported by Solaris linker -z guidance option:
ld: guidance: removal of unused file recommended: atiaudio.o
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index f1a255f..2faa69d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,7 @@ mach64_drv_la_LDFLAGS = -module -avoid-version
mach64_drv_ladir = @moduledir@/drivers
mach64_drv_la_SOURCES = \
atibus.c atichip.c atiprobe.c atividmem.c \
- atiadjust.c atiaudio.c aticlock.c aticonfig.c aticonsole.c \
+ atiadjust.c aticlock.c aticonfig.c aticonsole.c \
atidac.c atidsp.c atii2c.c \
atilock.c atimach64.c atimach64accel.c atimach64cursor.c \
atimach64i2c.c atimach64io.c atimach64xv.c atimode.c atipreinit.c \
diff --git a/src/atiaudio.c b/src/atiaudio.c
deleted file mode 100644
index 555a4a7..0000000
--- a/src/atiaudio.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "atiaudio.h"
-
-/*
- * Audio chip definitions.
- */
-const char *ATIAudioNames[] =
-{
- "Philips TEA5582",
- "Mono with audio mux",
- "Philips TDA9850",
- "Sony CXA2020S",
- "ITT MSP3410D",
- "Crystal CS4236B",
- "Philips TDA9851",
- "ITT MSP3415",
- "ITT MSP3430",
- "Unknown type (9)",
- "Unknown type (10)",
- "Unknown type (11)",
- "Unknown type (12)",
- "Unknown type (13)",
- "Unknown type (14)",
- "No audio"
-};
diff --git a/src/atiaudio.h b/src/atiaudio.h
index bcea8b4..aa158ad 100644
--- a/src/atiaudio.h
+++ b/src/atiaudio.h
@@ -46,6 +46,4 @@ typedef enum
ATI_AUDIO_NONE
} ATIAudioType;
-extern const char *ATIAudioNames[];
-
#endif /* ___ATIAUDIO_H___ */
commit 233270a78d41d9df5614e17d73c8c4add391459b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 19 22:33:48 2012 -0800
Remove unused atidecoder.c & atidecoder.h
Defined a enum & string array, neither of which were used anywhere.
Reported by Solaris linker -z guidance option:
ld: guidance: removal of unused file recommended: atidecoder.o
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 4c1498f..f1a255f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ mach64_drv_ladir = @moduledir@/drivers
mach64_drv_la_SOURCES = \
atibus.c atichip.c atiprobe.c atividmem.c \
atiadjust.c atiaudio.c aticlock.c aticonfig.c aticonsole.c \
- atidac.c atidecoder.c atidsp.c atii2c.c \
+ atidac.c atidsp.c atii2c.c \
atilock.c atimach64.c atimach64accel.c atimach64cursor.c \
atimach64i2c.c atimach64io.c atimach64xv.c atimode.c atipreinit.c \
atiprint.c atirgb514.c atiscreen.c atituner.c atiutil.c ativalid.c \
@@ -70,7 +70,6 @@ EXTRA_DIST = \
aticrtc.h \
aticursor.h \
atidac.h \
- atidecoder.h \
atidga.h \
atidri.h \
atidripriv.h \
diff --git a/src/atidecoder.c b/src/atidecoder.c
deleted file mode 100644
index 6419fbc..0000000
--- a/src/atidecoder.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "atidecoder.h"
-
-/*
- * Video decoder definitions.
- */
-const char *ATIDecoderNames[] =
-{
- "No decoder",
- "BrookTree BT819",
- "Brooktree BT829",
- "Brooktree BT829A",
- "Philips SA7111",
- "Philips SA7112",
- "ATI Rage Theater",
- "Unknown type (7)",
- "Unknown type (8)",
- "Unknown type (9)",
- "Unknown type (10)",
- "Unknown type (11)",
- "Unknown type (12)",
- "Unknown type (13)",
- "Unknown type (14)",
- "Unknown type (15)"
-};
diff --git a/src/atidecoder.h b/src/atidecoder.h
deleted file mode 100644
index 6ade55b..0000000
--- a/src/atidecoder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef ___ATIDECODER_H___
-#define ___ATIDECODER_H___ 1
-
-/*
- * Video decoder definitions.
- */
-typedef enum
-{
- ATI_DECODER_NONE,
- ATI_DECODER_BT819,
- ATI_DECODER_BT829,
- ATI_DECODER_BT829A,
- ATI_DECODER_SA7111,
- ATI_DECODER_SA7112,
- ATI_DECODER_THEATER,
- ATI_DECODER_7,
- ATI_DECODER_8,
- ATI_DECODER_9,
- ATI_DECODER_10,
- ATI_DECODER_11,
- ATI_DECODER_12,
- ATI_DECODER_13,
- ATI_DECODER_14,
- ATI_DECODER_15
-} ATIDecoderType;
-
-extern const char *ATIDecoderNames[];
-
-#endif /* ___ATIDECODER_H___ */
Reply to: