xf86-video-mach64: Branch 'master' - 2 commits
Alan Coopersmith
alanc at kemper.freedesktop.org
Wed Dec 26 18:58:30 PST 2012
src/Makefile.am | 5 ++---
src/atiaudio.c | 50 --------------------------------------------------
src/atiaudio.h | 2 --
src/atidecoder.c | 50 --------------------------------------------------
src/atidecoder.h | 51 ---------------------------------------------------
5 files changed, 2 insertions(+), 156 deletions(-)
New commits:
commit 80e62cc1dfb80c3170e43c3941b56d0a84bddc3b
Author: Alan Coopersmith <alan.coopersmith at 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 at 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 at 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 at 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 at oracle.com>
Reviewed-by: Alex Deucher <alexander.deucher at 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 at 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 at 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___ */
More information about the xorg-commit
mailing list