[xserver-commit] xfree86/ddc ddcProperty.c,1.10,1.11 edid.c,1.4,1.5 edid.h,1.7,1.8 interpret_edid.c,1.8,1.9 interpret_vdif.c,1.6,1.7 print_edid.c,1.16,1.17 print_vdif.c,1.5,1.6 vdif.h,1.5,1.6 xf86DDC.c,1.27,1.28 xf86DDC.h,1.11,1.12

Daniel Stone xserver-commit@pdx.freedesktop.org
Committed by: daniel

Update of /cvs/xserver/xfree86/ddc
In directory pdx:/home/daniel/src/xserver/hw/xfree86/ddc

Modified Files:
	ddcProperty.c edid.c edid.h interpret_edid.c interpret_vdif.c 
	print_edid.c print_vdif.c vdif.h xf86DDC.c xf86DDC.h 
Log Message:
Checkin stage #4: everything else we've changed.

Index: ddcProperty.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/ddcProperty.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/ddcProperty.c	3 Nov 2003 05:11:04 -0000	1.10
+++ b/ddcProperty.c	19 Feb 2004 03:51:36 -0000	1.11
@@ -3,13 +3,13 @@
  * 
  * Copyright 1999 by Andrew C Aitchison <A.C.Aitchison@dpmms.cam.ac.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.10 2003/11/03 05:11:04 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 /* #include "xf86_ansic.h" */
 /* #include "xf86_OSproc.h" */
-#include "Xatom.h"
+#include <X11/Xatom.h>
 #include "property.h"
 #include "propertyst.h"
 #include "xf86DDC.h"

Index: edid.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/edid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/edid.c	17 Feb 2003 16:08:27 -0000	1.4
+++ b/edid.c	19 Feb 2004 03:51:36 -0000	1.5
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.3 2000/11/03 18:46:08 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.4 2003/02/17 16:08:27 dawes Exp $ */
 
 /* edid.c:  retrieve EDID record from raw DDC1 data stream: data 
  * is contained in an array of unsigned int each unsigned int 

Index: edid.h
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/edid.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/edid.h	20 Apr 2000 21:28:26 -0000	1.7
+++ b/edid.h	19 Feb 2004 03:51:36 -0000	1.8
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.6 2000/04/17 16:29:55 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.7 2000/04/20 21:28:26 tsi Exp $ */
 
 /* edid.h: defines to parse an EDID block 
  *

Index: interpret_edid.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/interpret_edid.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/interpret_edid.c	13 Jul 2000 21:31:37 -0000	1.8
+++ b/interpret_edid.c	19 Feb 2004 03:51:36 -0000	1.9
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.7 2000/04/17 16:29:55 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.8 2000/07/13 21:31:37 tsi Exp $ */
 
 /* interpret_edid.c: interpret a primary EDID block
  * 

Index: interpret_vdif.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/interpret_vdif.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/interpret_vdif.c	21 Jan 2000 02:30:00 -0000	1.6
+++ b/interpret_vdif.c	19 Feb 2004 03:51:36 -0000	1.7
@@ -1,6 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.5 1999/12/03 19:17:26 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.6 2000/01/21 02:30:00 dawes Exp $ */
 
-#include "Xarch.h"
+#include <X11/Xarch.h>
 #include "xf86DDC.h"
 #include "vdif.h"
 

Index: print_edid.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/print_edid.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/print_edid.c	24 Sep 2003 02:43:17 -0000	1.16
+++ b/print_edid.c	19 Feb 2004 03:51:36 -0000	1.17
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.15 2001/05/22 17:01:23 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.16 2003/09/24 02:43:17 dawes Exp $ */
 
 /* print_edid.c: print out all information retrieved from display device 
  * 

Index: print_vdif.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/print_vdif.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/print_vdif.c	6 Nov 2003 18:37:58 -0000	1.5
+++ b/print_vdif.c	19 Feb 2004 03:51:36 -0000	1.6
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.4tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.5 2003/11/06 18:37:58 tsi Exp $ */
 
 #include "vdif.h"
 #include "misc.h"

Index: vdif.h
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/vdif.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/vdif.h	6 Nov 2003 18:37:58 -0000	1.5
+++ b/vdif.h	19 Feb 2004 03:51:36 -0000	1.6
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.4tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.5 2003/11/06 18:37:58 tsi Exp $ */
 
 #ifndef _VDIF_H
 #define _VDIF_H
@@ -22,7 +22,7 @@
 #define VDIF_POLARITY_NEGATIVE 0
 #define VDIF_POLARITY_POSITIVE 1
 
-#include "Xmd.h"
+#include <X11/Xmd.h>
 
 #undef  CARD32
 #define CARD32 unsigned int	/* ... on all supported platforms */

Index: xf86DDC.c
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/xf86DDC.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- a/xf86DDC.c	30 Oct 2003 17:48:19 -0000	1.27
+++ b/xf86DDC.c	19 Feb 2004 03:51:36 -0000	1.28
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.26 2003/08/22 17:56:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.27 2003/10/30 17:48:19 tsi Exp $ */
 
 /* xf86DDC.c 
  * 
@@ -11,9 +11,7 @@
 #include "xf86DDC.h"
 #include "ddcPriv.h"
 
-#ifdef XFree86LOADER
 static const OptionInfoRec *DDCAvailableOptions(void *unused);
-#endif
 
 const char *i2cSymbols[] = {
     "xf86CreateI2CDevRec",
@@ -24,8 +22,6 @@
     NULL
 };
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(ddcSetup);
 
 static XF86ModuleVersionInfo ddcVersRec =
@@ -59,9 +55,7 @@
 
     if (!setupDone) {
 	setupDone = TRUE;
-#ifndef REMOVE_LOADER_CHECK_MODULE_INFO
 	if (xf86LoaderCheckSymbol("xf86AddModuleInfo"))
-#endif
 	xf86AddModuleInfo(&DDC, module);
 	/*
 	 * Tell the loader about symbols from other modules that this module
@@ -77,7 +71,6 @@
     return (pointer)1;
 }
 
-#endif
 
 #define RETRIES 4
 
@@ -128,14 +121,12 @@
     { -1,		NULL,		OPTV_NONE,	{0},	FALSE },
 };
 
-#ifdef XFree86LOADER
 /*ARGSUSED*/
 static const OptionInfoRec *
 DDCAvailableOptions(void *unused)
 {
     return (DDCOptions);
 }
-#endif
 
 xf86MonPtr 
 xf86DoEDID_DDC1(

Index: xf86DDC.h
===================================================================
RCS file: /cvs/xserver/xfree86/ddc/xf86DDC.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/xf86DDC.h	17 Feb 2003 16:08:27 -0000	1.11
+++ b/xf86DDC.h	19 Feb 2004 03:51:36 -0000	1.12
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.10 2000/06/07 22:03:09 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.11 2003/02/17 16:08:27 dawes Exp $ */
 
 /* xf86DDC.h
  *