mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-10 23:33:46 +00:00
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
This commit is contained in:
parent
90f1536dd3
commit
adc7f9a4eb
705 changed files with 30330 additions and 26603 deletions
|
|
@ -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 @@ xf86DestroyI2CBusRec(I2CBusPtr b, Bool unalloc, Bool devs_too)
|
|||
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 @@ xf86DestroyI2CBusRec(I2CBusPtr b, Bool unalloc, Bool devs_too)
|
|||
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 @@ xf86I2CFindBus(int scrnIndex, char *name)
|
|||
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue