X Strike Force XFree86 SVN commit: r1363 - in trunk/debian: . patches
Author: branden
Date: 2004-05-05 13:16:57 -0500 (Wed, 05 May 2004)
New Revision: 1363
Modified:
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Grab updated XFree86 X server I2C code from XFree86 CVS as of 2003-08-29.
Implements and exposes xf86I2CGetScreenBuses() function.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-04 18:59:37 UTC (rev 1362)
+++ trunk/debian/changelog 2004-05-05 18:16:57 UTC (rev 1363)
@@ -22,8 +22,11 @@
* Grab updated list of PCI IDs from XFree86 CVS as of 2003-10-30. Remove
superseded parts of patches #030a, #030b, #099.
- -- Branden Robinson <branden@debian.org> Mon, 3 May 2004 23:58:35 -0500
+ * Grab updated XFree86 X server I2C code from XFree86 CVS as of 2003-08-29.
+ Implements and exposes xf86I2CGetScreenBuses() function.
+ -- Branden Robinson <branden@debian.org> Wed, 5 May 2004 13:15:17 -0500
+
xfree86 (4.3.0.dfsg.1-1) unstable; urgency=low
Changes by Branden Robinson and Fabio Massimo di Nitto:
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-05-04 18:59:37 UTC (rev 1362)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-05-05 18:16:57 UTC (rev 1363)
@@ -1,5 +1,7 @@
$Id$
+Comments by Branden Robinson are made in [brackets].
+
xc/config/imake/imake.c @ 3.64
27. Avoid overlapping strcpy() in imake.c (Dan Nelson).
@@ -131,6 +133,26 @@
xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h @ 1.156
[Define PCI ID for HP ZX1 QuickSilver chipset. Marc Aurele La France]
+xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c @ 1.14
+xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h @ 1.9
+ 163. Add an entry to the i2c module that drivers can call to retrieve an array
+ of all I2C busses associated with a screen (Marc La France).
+
+xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h @ 1.10
+ 307. A lot of X server prototype cleanups, including fixing an
+ inconsistency between the cfbBitBlt and CopyPlane functions
+ exposed by the prototyping (#A.1859, Alexander Stohr).
+ [For xf86i2c.h, this simply changed an #include from "miscstruct.h" to
+ "regionstr.h".]
+
+xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c @ 1.15
+xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h @ 1.11
+ s/busses/buses/g
+ Note that this generates a minor incompatibility with 4.3.99.4+ servers.
+ [Marc Aurele La France]
+ [This incompatibility is not relevant to Debian as we are "skipping over" the
+ misspelled symbol name.]
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -2110,3 +2132,102 @@
/* VMware */
#define PCI_CHIP_VMWARE0405 0x0405
+Index: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v
+retrieving revision 1.13
+retrieving revision 1.15
+diff -u -r1.13 -r1.15
+--- xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c 16 Sep 2002 18:06:07 -0000 1.13
++++ xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c 29 Aug 2003 21:08:06 -0000 1.15
+@@ -6,7 +6,7 @@
+ * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
+ */
+
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.13 2002/09/16 18:06:07 eich Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.15 2003/08/29 21:08:06 tsi Exp $ */
+
+ #if 1
+ #include "misc.h"
+@@ -750,7 +750,7 @@
+ if (b) {
+ I2CBusPtr *p;
+
+- /* Remove this from the list of active I2C busses. */
++ /* Remove this from the list of active I2C buses */
+
+ for (p = &I2CBusList; *p != NULL; p = &(*p)->NextBus)
+ if (*p == b) {
+@@ -794,7 +794,7 @@
+ Bool
+ xf86I2CBusInit(I2CBusPtr b)
+ {
+- /* I2C busses must be identified by a unique scrnIndex
++ /* I2C buses must be identified by a unique scrnIndex
+ * and name. If scrnIndex is unspecified (a negative value),
+ * then the name must be unique throughout the server.
+ */
+@@ -861,3 +861,32 @@
+
+ return NULL;
+ }
++
++/*
++ * Return an array of I2CBusPtr's related to a screen. The caller is
++ * responsible for freeing the array.
++ */
++int
++xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr **pppI2CBus)
++{
++ I2CBusPtr pI2CBus;
++ int n = 0;
++
++ if (pppI2CBus)
++ *pppI2CBus = NULL;
++
++ for (pI2CBus = I2CBusList; pI2CBus; pI2CBus = pI2CBus->NextBus) {
++ if ((pI2CBus->scrnIndex >= 0) && (pI2CBus->scrnIndex != scrnIndex))
++ continue;
++
++ n++;
++
++ if (!pppI2CBus)
++ continue;
++
++ *pppI2CBus = xnfrealloc(*pppI2CBus, n * sizeof(I2CBusPtr));
++ *pppI2CBus[n - 1] = pI2CBus;
++ }
++
++ return n;
++}
+Index: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v
+retrieving revision 1.8
+retrieving revision 1.11
+diff -u -r1.8 -r1.11
+--- xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h 19 Jul 2001 14:19:40 -0000 1.8
++++ xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h 29 Aug 2003 21:08:06 -0000 1.11
+@@ -2,11 +2,11 @@
+ * Copyright (C) 1998 Itai Nahshon, Michael Schimek
+ */
+
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.8 2001/07/19 14:19:40 tsi Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.11 2003/08/29 21:08:06 tsi Exp $ */
+ #ifndef _XF86I2C_H
+ #define _XF86I2C_H
+
+-#include "miscstruct.h"
++#include "regionstr.h"
+
+ typedef unsigned char I2CByte;
+ typedef unsigned short I2CSlaveAddr;
+@@ -52,6 +52,8 @@
+ void xf86DestroyI2CBusRec(I2CBusPtr pI2CBus, Bool unalloc, Bool devs_too);
+ Bool xf86I2CBusInit(I2CBusPtr pI2CBus);
+ I2CBusPtr xf86I2CFindBus(int scrnIndex, char *name);
++int xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr **pppI2CBus);
++
+
+ /* I2C slave devices */
+
Reply to: