[xserver-commit] xfree86/vbe vbe.c,1.3,1.4 vbe.h,1.5,1.6 vbeModes.c,1.4,1.5 vbeModes.h,1.1,1.2 vbe_module.c,1.1,1.2

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	vbe.c vbe.h vbeModes.c vbeModes.h vbe_module.c 
Log Message:
Checkin stage #4: everything else we've changed.

Index: vbe.c
===================================================================
RCS file: /cvs/xserver/xfree86/vbe/vbe.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/vbe.c	3 Nov 2003 05:11:53 -0000	1.3
+++ b/vbe.c	19 Feb 2004 03:51:43 -0000	1.4
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.2tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.3 2003/11/03 05:11:53 tsi Exp $ */
 
 /*
  *                   XFree86 vbe module
@@ -13,9 +13,9 @@
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "vbe.h"
-#include "Xarch.h"
+#include <X11/Xarch.h>
 #define DPMS_SERVER
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
 
 #define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x)
 
@@ -383,7 +383,7 @@
 
     pStr = *(CARD32*)(((char*)pVbe->memory) + 6);
     str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
-    block->OEMStringPtr = strdup(str);
+    block->OEMStringPtr = xstrdup(str);
 
     block->Capabilities[0] = ((char*)pVbe->memory)[10];
     block->Capabilities[1] = ((char*)pVbe->memory)[11];
@@ -407,13 +407,13 @@
 	block->OemSoftwareRev = *(CARD16*)(((char*)pVbe->memory) + 20);
 	pStr = *(CARD32*)(((char*)pVbe->memory) + 22);
 	str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
-	block->OemVendorNamePtr = strdup(str);
+	block->OemVendorNamePtr = xstrdup(str);
 	pStr = *(CARD32*)(((char*)pVbe->memory) + 26);
 	str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
-	block->OemProductNamePtr = strdup(str);
+	block->OemProductNamePtr = xstrdup(str);
 	pStr = *(CARD32*)(((char*)pVbe->memory) + 30);
 	str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
-	block->OemProductRevPtr = strdup(str);
+	block->OemProductRevPtr = xstrdup(str);
 	memcpy(&block->Reserved, ((char*)pVbe->memory) + 34, 222);
 	memcpy(&block->OemData, ((char*)pVbe->memory) + 256, 256);
     }

Index: vbe.h
===================================================================
RCS file: /cvs/xserver/xfree86/vbe/vbe.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/vbe.h	2 Feb 2004 03:55:32 -0000	1.5
+++ b/vbe.h	19 Feb 2004 03:51:43 -0000	1.6
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.4 2004/01/07 04:28:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.5 2004/02/02 03:55:32 dawes Exp $ */
 
 /*
  *                   XFree86 vbe module

Index: vbeModes.c
===================================================================
RCS file: /cvs/xserver/xfree86/vbe/vbeModes.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/vbeModes.c	6 Nov 2003 18:38:14 -0000	1.4
+++ b/vbeModes.c	19 Feb 2004 03:51:43 -0000	1.5
@@ -27,7 +27,7 @@
  *
  * Authors: David Dawes <dawes@xfree86.org>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.3tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.4 2003/11/06 18:38:14 tsi Exp $
  */
 
 #include "xf86.h"

Index: vbeModes.h
===================================================================
RCS file: /cvs/xserver/xfree86/vbe/vbeModes.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/vbeModes.h	17 Feb 2003 17:06:46 -0000	1.1
+++ b/vbeModes.h	19 Feb 2004 03:51:43 -0000	1.2
@@ -26,7 +26,7 @@
  *
  * Authors: David Dawes <dawes@xfree86.org>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbeModes.h,v 1.1 2002/08/06 13:46:28 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h,v 1.1 2003/02/17 17:06:46 dawes Exp $
  */
 
 #ifndef _VBE_MODES_H

Index: vbe_module.c
===================================================================
RCS file: /cvs/xserver/xfree86/vbe/vbe_module.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/vbe_module.c	17 Feb 2003 17:06:46 -0000	1.1
+++ b/vbe_module.c	19 Feb 2004 03:51:43 -0000	1.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe_module.c,v 1.4 2002/09/16 18:06:15 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c,v 1.1 2003/02/17 17:06:46 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86str.h"