Module Name: xsrc
Committed By: macallan
Date: Fri Aug 19 20:45:16 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-mga/dist/src: mga_bios.c mga_dac3026.c
mga_dacG.c mga_dga.c mga_dh.c mga_dri.c mga_driver.c mga_exa.c
mga_g450pll.c mga_hwcurs.c mga_merge.c mga_shadow.c mga_storm.c
mga_vga.c mga_video.c
Log Message:
sprinkle const and #include "xorg-server.h"
now this builds at least
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c
cvs rdiff -u -r1.1.1.8 -r1.2 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c
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-mga/dist/src/mga_bios.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c:1.1.1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c:1.1.1.4 Sun Jun 2 08:23:54 2013
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c Fri Aug 19 20:45:16 2016
@@ -39,6 +39,7 @@
#endif
/* All drivers should typically include these */
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c:1.1.1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c:1.1.1.4 Sun Jun 2 08:23:52 2013
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c Fri Aug 19 20:45:16 2016
@@ -7,6 +7,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Pci.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c:1.1.1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c:1.1.1.4 Sun Jun 2 08:23:53 2013
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c Fri Aug 19 20:45:16 2016
@@ -2,6 +2,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#include "compiler.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c:1.5 xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c:1.6
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c:1.5 Mon Feb 23 12:23:47 2015
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c Fri Aug 19 20:45:16 2016
@@ -39,6 +39,7 @@
*/
/* All drivers should typically include these */
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c:1.1.1.5 xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c:1.1.1.5 Thu Jul 23 01:15:57 2015
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c Fri Aug 19 20:45:16 2016
@@ -6,6 +6,8 @@
#include "config.h"
#endif
+#include "xorg-server.h"
+
#include "colormapst.h"
/* All drivers should typically include these */
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c:1.1.1.5 xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c:1.1.1.5 Thu Jul 23 01:15:57 2015
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c Fri Aug 19 20:45:16 2016
@@ -30,6 +30,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c:1.1.1.5 xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c:1.1.1.5 Sun Jun 2 08:23:54 2013
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c Fri Aug 19 20:45:16 2016
@@ -3,6 +3,7 @@
#endif
/* All drivers should typically include these */
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -18,12 +19,12 @@
#include "fbdevhw.h"
static int
-StrToRanges(range* r, char* s) {
+StrToRanges(range* r, const char* s) {
float num=0.0;
int rangenum=0;
Bool gotdash = FALSE;
Bool nextdash = FALSE;
- char* strnum=NULL;
+ const char* strnum=NULL;
do {
switch(*s) {
case '0': case '1': case '2': case '3': case '4': case '5':
@@ -117,7 +118,7 @@ CopyModeNLink(ScrnInfoPtr pScrn, Display
}
static DisplayModePtr
-GetModeFromName(char* str, DisplayModePtr i)
+GetModeFromName(const char* str, DisplayModePtr i)
{
DisplayModePtr c = i;
if(!i) return NULL;
@@ -130,9 +131,9 @@ GetModeFromName(char* str, DisplayModePt
/* takes a config file string of MetaModes and generates a MetaModeList */
static DisplayModePtr
-GenerateModeList(ScrnInfoPtr pScrn, char* str,
+GenerateModeList(ScrnInfoPtr pScrn, const char* str,
DisplayModePtr i, DisplayModePtr j, MgaScrn2Rel srel) {
- char* strmode = str;
+ const char* strmode = str;
char modename[256];
Bool gotdash = FALSE;
MgaScrn2Rel sr;
@@ -165,7 +166,7 @@ GenerateModeList(ScrnInfoPtr pScrn, char
} else {
mode1 = GetModeFromName(modename,i);
if(!mode1) {
- char* tmps = str;
+ const char* tmps = str;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Mode: \"%s\" is not a supported mode for monitor 1\n",modename);
/* find if a monitor2 mode follows */
@@ -232,7 +233,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, i
MGAPtr pMga1;
MessageType from;
int i;
- char* s;
+ const char* s;
ClockRangePtr clockRanges;
MgaScrn2Rel Monitor2Pos;
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c:1.1.1.5 xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c:1.1.1.5 Wed Mar 19 23:53:10 2014
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c Fri Aug 19 20:45:16 2016
@@ -5,6 +5,7 @@
#endif
/* All drivers should typically include these */
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c:1.1.1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c:1.1.1.3 Sun Jun 2 08:23:54 2013
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c Fri Aug 19 20:45:16 2016
@@ -2,6 +2,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Pci.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c:1.1.1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c:1.1.1.3 Sun Jun 2 08:23:52 2013
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c Fri Aug 19 20:45:16 2016
@@ -9,6 +9,7 @@
#endif
/* All drivers should typically include these */
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c:1.1.1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c:1.1.1.3 Sun Jun 2 08:23:53 2013
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c Fri Aug 19 20:45:16 2016
@@ -3,6 +3,7 @@
#endif
/* All drivers should typically include these */
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c:1.1.1.3 xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c:1.1.1.3 Sun Jun 2 08:23:53 2013
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c Fri Aug 19 20:45:16 2016
@@ -2,6 +2,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c:1.1.1.8 xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c:1.1.1.8 Thu Jul 23 01:15:57 2015
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c Fri Aug 19 20:45:16 2016
@@ -49,6 +49,7 @@
#endif
/* All drivers should typically include these */
+#include "xorg-server.h"
#include "xf86.h"
#include "xf86_OSproc.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c:1.2 xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c:1.3
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c:1.2 Thu Mar 20 01:04:22 2014
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c Fri Aug 19 20:45:16 2016
@@ -34,6 +34,7 @@
#include "config.h"
#endif
+#include "xorg-server.h"
#include "xf86.h"
#include "mga.h"
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c:1.4 xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c:1.5
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c:1.4 Mon Feb 23 10:38:08 2015
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c Fri Aug 19 20:45:16 2016
@@ -4,6 +4,7 @@
#include <unistd.h>
+#include "xorg-server.h"
#include "misc.h"
#include "xf86.h"
#include "xf86_OSproc.h"
