Module Name: xsrc
Committed By: prlw1
Date: Sun Jan 25 21:45:45 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_include.h
xsrc/external/mit/xf86-video-savage/dist/src: savage_driver.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86.h
xf86Config.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc: xf86DDC.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw: fbdevhw.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes:
xf86DisplayIDModes.c xf86Modes.h xf86RandR12.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/utils/cvt: cvt.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/vbe: vbe.c
xsrc/external/mit/xorg-server/dist/include: dix.h dixfont.h
xsrc/external/mit/xorg-server/dist/randr: randrstr.h rrtransform.h
xsrc/external/mit/xorg-server/dist/render: glyphstr.h
Log Message:
Remove some redundant function redeclarations, as noted in
http://mail-index.netbsd.org/tech-x11/2015/01/09/msg001452.html
The changes come from upstream in commits:
* xserver:
ecf62755 Define prototypes for hw/xfree86/modes/xf86Modes.c only in xf86Modes.h.
- didn't add xf86SaveModeContents which isn't defined in our version
0bc41d5f Remove redundant redeclarations of functions in the same header file
5595e7ce randr: Remove redundant declaration.
471e5373 Remove duplicate declaration of xf86ValidateModesFlags in xf86Modes.h
9ef53e22 include: GetClientResolutions is declared in font.h
8b6a7500 Fix gcc warnings about redundant declarations of fallback functions
- just took ffs() #ifdef defense, so most not applied
* xf86-video-nv:
49ee1c26 Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c.
* xf86-video-savage:
2e9217bb Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc/xf86DDC.h
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw/fbdevhw.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86DisplayIDModes.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.h
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86RandR12.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/utils/cvt/cvt.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/vbe/vbe.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/include/dix.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xorg-server/dist/include/dixfont.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/randr/randrstr.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/randr/rrtransform.h
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/render/glyphstr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.1.1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.1.1.3 Sun Jun 2 08:24:14 2013
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h Sun Jan 25 21:45:44 2015
@@ -30,6 +30,7 @@
#include "micmap.h"
#include "xf86DDC.h"
+#include "xf86Modes.h"
#include "vbe.h"
Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h:1.3 xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h:1.4
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h:1.3 Wed Mar 19 23:56:47 2014
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h Sun Jan 25 21:45:44 2015
@@ -54,6 +54,7 @@
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
+#include "xf86Modes.h"
#include "xf86Pci.h"
#include "xf86_OSproc.h"
#include "xf86Cursor.h"
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h:1.1.1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h:1.1.1.4 Tue Aug 2 06:56:54 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h Sun Jan 25 21:45:44 2015
@@ -164,9 +164,6 @@ extern _X_EXPORT void *xf86GetPointerScr
extern _X_EXPORT void xf86InitOrigins(void);
extern _X_EXPORT void xf86ReconfigureLayout(void);
-/* xf86cvt.c */
-extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh,
- Bool Reduced, Bool Interlaced);
/* xf86DPMS.c */
@@ -319,16 +316,6 @@ extern _X_EXPORT void xf86PruneDriverMod
extern _X_EXPORT void xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags);
extern _X_EXPORT void xf86PrintModes(ScrnInfoPtr scrp);
extern _X_EXPORT void xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges);
-extern _X_EXPORT double xf86ModeHSync(const DisplayModeRec *mode);
-extern _X_EXPORT double xf86ModeVRefresh(const DisplayModeRec *mode);
-extern _X_EXPORT void xf86SetModeDefaultName(DisplayModePtr mode);
-extern _X_EXPORT void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags);
-extern _X_EXPORT DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode);
-extern _X_EXPORT DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList);
-extern _X_EXPORT Bool xf86ModesEqual(const DisplayModeRec *pMode1,
- const DisplayModeRec *pMode2);
-extern _X_EXPORT void xf86PrintModeline(int scrnIndex,DisplayModePtr mode);
-extern _X_EXPORT DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new);
/* xf86Option.c */
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.10 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.11
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.10 Mon Jun 3 07:38:41 2013
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c Sun Jan 25 21:45:44 2015
@@ -52,6 +52,7 @@
#endif
#include "xf86.h"
+#include "xf86Modes.h"
#include "xf86Parser.h"
#include "xf86tokens.h"
#include "xf86Config.h"
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc/xf86DDC.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc/xf86DDC.h:1.1.1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc/xf86DDC.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc/xf86DDC.h:1.1.1.3 Tue Nov 23 05:21:34 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc/xf86DDC.h Sun Jan 25 21:45:44 2015
@@ -57,8 +57,6 @@ extern _X_EXPORT Bool xf86SetDDCproperti
xf86MonPtr DDC
);
-extern _X_EXPORT DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC);
-
extern _X_EXPORT Bool
xf86MonitorIsHDMI(xf86MonPtr mon);
@@ -100,11 +98,6 @@ typedef enum {
DDC_QUIRK_DVI_SINGLE_LINK = 1 << 8,
} ddc_quirk_t;
-DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC);
-
-extern Bool
-xf86MonitorIsHDMI(xf86MonPtr mon);
-
typedef void (* handle_detailed_fn)(struct detailed_monitor_section *,void *);
void xf86ForEachDetailedBlock(xf86MonPtr mon,
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw/fbdevhw.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw/fbdevhw.c:1.1.1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw/fbdevhw.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw/fbdevhw.c:1.1.1.6 Mon Jun 3 07:34:24 2013
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw/fbdevhw.c Sun Jan 25 21:45:44 2015
@@ -6,6 +6,7 @@
#include <string.h>
#include "xf86.h"
+#include "xf86Modes.h"
#include "xf86_OSproc.h"
/* pci stuff */
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86DisplayIDModes.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86DisplayIDModes.c:1.1.1.1 xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86DisplayIDModes.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86DisplayIDModes.c:1.1.1.1 Tue Nov 23 05:21:39 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86DisplayIDModes.c Sun Jan 25 21:45:44 2015
@@ -25,6 +25,7 @@
#include "xorg-config.h"
#include "xf86.h"
+#include "xf86Modes.h"
#include "xf86str.h"
#include "edid.h"
#include "xf86DDC.h"
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.h:1.1.1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.h:1.1.1.3 Tue Nov 23 05:21:39 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.h Sun Jan 25 21:45:44 2015
@@ -69,10 +69,6 @@ extern _X_EXPORT Bool
xf86ModeIsReduced(const DisplayModeRec *mode);
extern _X_EXPORT void
-xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList,
- int flags);
-
-extern _X_EXPORT void
xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList,
int *min, int *max, int n_ranges);
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86RandR12.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86RandR12.c:1.1.1.7 xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86RandR12.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86RandR12.c:1.1.1.7 Tue Aug 2 06:56:56 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86RandR12.c Sun Jan 25 21:45:44 2015
@@ -32,6 +32,7 @@
#include "os.h"
#include "globals.h"
#include "xf86.h"
+#include "xf86Modes.h"
#include "xf86Priv.h"
#include "xf86DDC.h"
#include "mipointer.h"
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/utils/cvt/cvt.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/utils/cvt/cvt.c:1.1.1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/utils/cvt/cvt.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/utils/cvt/cvt.c:1.1.1.3 Tue Aug 2 06:56:57 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/utils/cvt/cvt.c Sun Jan 25 21:45:44 2015
@@ -24,6 +24,7 @@
/* Standalone VESA CVT standard timing modelines generator. */
#include "xf86.h"
+#include "xf86Modes.h"
/* Error implementation used by the server code we built in */
void
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/vbe/vbe.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/vbe/vbe.c:1.1.1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/vbe/vbe.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/vbe/vbe.c:1.1.1.6 Mon Jun 3 07:34:24 2013
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/vbe/vbe.c Sun Jan 25 21:45:44 2015
@@ -16,6 +16,7 @@
#include <string.h>
#include "xf86.h"
+#include "xf86Modes.h"
#include "vbe.h"
#include <X11/extensions/dpmsconst.h>
Index: xsrc/external/mit/xorg-server/dist/include/dix.h
diff -u xsrc/external/mit/xorg-server/dist/include/dix.h:1.3 xsrc/external/mit/xorg-server/dist/include/dix.h:1.4
--- xsrc/external/mit/xorg-server/dist/include/dix.h:1.3 Wed Dec 10 09:15:43 2014
+++ xsrc/external/mit/xorg-server/dist/include/dix.h Sun Jan 25 21:45:44 2015
@@ -529,7 +529,9 @@ extern _X_EXPORT void
ScreenRestructured (ScreenPtr pScreen);
#endif
+#ifndef HAVE_FFS
extern _X_EXPORT int ffs(int i);
+#endif
/*
Index: xsrc/external/mit/xorg-server/dist/include/dixfont.h
diff -u xsrc/external/mit/xorg-server/dist/include/dixfont.h:1.1.1.3 xsrc/external/mit/xorg-server/dist/include/dixfont.h:1.2
--- xsrc/external/mit/xorg-server/dist/include/dixfont.h:1.1.1.3 Tue Nov 23 05:22:04 2010
+++ xsrc/external/mit/xorg-server/dist/include/dixfont.h Sun Jan 25 21:45:44 2015
@@ -150,8 +150,6 @@ extern _X_EXPORT int client_auth_generat
extern _X_EXPORT void DeleteFontClientID(Font id);
-extern _X_EXPORT FontResolutionPtr GetClientResolutions(int *num);
-
extern _X_EXPORT int GetDefaultPointSize(void);
extern _X_EXPORT Font GetNewFontClientID(void);
Index: xsrc/external/mit/xorg-server/dist/randr/randrstr.h
diff -u xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.2 xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.3
--- xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.2 Wed Nov 5 17:51:14 2014
+++ xsrc/external/mit/xorg-server/dist/randr/randrstr.h Sun Jan 25 21:45:44 2015
@@ -464,9 +464,6 @@ extern _X_EXPORT Bool RRScreenInit(Scree
extern _X_EXPORT RROutputPtr
RRFirstOutput (ScreenPtr pScreen);
-extern _X_EXPORT Rotation
-RRGetRotation (ScreenPtr pScreen);
-
extern _X_EXPORT CARD16
RRVerticalRefresh (xRRModeInfo *mode);
@@ -502,8 +499,6 @@ RRSetCurrentConfig (ScreenPtr pScreen,
int rate,
RRScreenSizePtr pSize);
-extern _X_EXPORT Bool RRScreenInit (ScreenPtr pScreen);
-
extern _X_EXPORT Rotation
RRGetRotation (ScreenPtr pScreen);
@@ -609,25 +604,6 @@ extern _X_EXPORT void
RRCrtcGetScanoutSize(RRCrtcPtr crtc, int *width, int *height);
/*
- * Compute the complete transformation matrix including
- * client-specified transform, rotation/reflection values and the crtc
- * offset.
- *
- * Return TRUE if the resulting transform is not a simple translation.
- */
-extern _X_EXPORT Bool
-RRTransformCompute (int x,
- int y,
- int width,
- int height,
- Rotation rotation,
- RRTransformPtr rr_transform,
-
- PictTransformPtr transform,
- struct pict_f_transform *f_transform,
- struct pict_f_transform *f_inverse);
-
-/*
* Return crtc transform
*/
extern _X_EXPORT RRTransformPtr
Index: xsrc/external/mit/xorg-server/dist/randr/rrtransform.h
diff -u xsrc/external/mit/xorg-server/dist/randr/rrtransform.h:1.1.1.2 xsrc/external/mit/xorg-server/dist/randr/rrtransform.h:1.2
--- xsrc/external/mit/xorg-server/dist/randr/rrtransform.h:1.1.1.2 Tue Nov 23 05:22:12 2010
+++ xsrc/external/mit/xorg-server/dist/randr/rrtransform.h Sun Jan 25 21:45:44 2015
@@ -59,6 +59,13 @@ RRTransformSetFilter (RRTransformPtr dst
extern _X_EXPORT Bool
RRTransformCopy (RRTransformPtr dst, RRTransformPtr src);
+/*
+ * Compute the complete transformation matrix including
+ * client-specified transform, rotation/reflection values and the crtc
+ * offset.
+ *
+ * Return TRUE if the resulting transform is not a simple translation.
+ */
extern _X_EXPORT Bool
RRTransformCompute (int x,
int y,
Index: xsrc/external/mit/xorg-server/dist/render/glyphstr.h
diff -u xsrc/external/mit/xorg-server/dist/render/glyphstr.h:1.1.1.4 xsrc/external/mit/xorg-server/dist/render/glyphstr.h:1.2
--- xsrc/external/mit/xorg-server/dist/render/glyphstr.h:1.1.1.4 Tue Aug 2 06:57:05 2011
+++ xsrc/external/mit/xorg-server/dist/render/glyphstr.h Sun Jan 25 21:45:44 2015
@@ -90,9 +90,6 @@ typedef struct _GlyphList {
PictFormatPtr format;
} GlyphListRec, *GlyphListPtr;
-extern _X_EXPORT GlyphHashSetPtr
-FindGlyphHashSet (CARD32 filled);
-
extern _X_EXPORT void
GlyphUninit (ScreenPtr pScreen);
