hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-05 22:46:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'yselkowitz/master'

Browse source 
I checked this patch with diff -w to check that it only affected
whitespace.
This commit is contained in:
Keith Packard 2012-12-19 12:21:31 -08:00
commit 0eb1559eb2
68 changed files with 338 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/xfree86/common/xf86cmap.c
View file

@ -608,7 +608,7 @@ CMapRefreshColors(ColormapPtr pmap, int defs, int *indices)
case GrayScale:
for (i = 0; i < defs; i++) {
index = indices[i];
entry = (EntryPtr) & pmap->red[index];
entry = (EntryPtr) &pmap->red[index];
if (entry->fShared) {
colors[index].red =

4
hw/xfree86/dri/xf86dri.c
View file

@ -280,7 +280,7 @@ ProcXF86DRICreateContext(register ClientPtr client)
if (!DRICreateContext(pScreen,
NULL,
stuff->context, (drm_context_t *) & rep.hHWContext)) {
stuff->context, (drm_context_t *) &rep.hHWContext)) {
return BadValue;
}
@ -329,7 +329,7 @@ ProcXF86DRICreateDrawable(ClientPtr client)
return rc;
if (!DRICreateDrawable(screenInfo.screens[stuff->screen], client,
pDrawable, (drm_drawable_t *) & rep.hHWDrawable)) {
pDrawable, (drm_drawable_t *) &rep.hHWDrawable)) {
return BadValue;
}

10
hw/xfree86/i2c/fi1236.c
View file

@ -91,7 +91,7 @@ MT2032_getid(FI1236Ptr f)
CARD8 in;
in = 0x11;
I2C_WriteRead(&(f->d), (I2CByte *) & in, 1, out, 4);
I2C_WriteRead(&(f->d), (I2CByte *) &in, 1, out, 4);
xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO,
"MT2032: Company code 0x%02x%02x, part code 0x%02x, revision code 0x%02x\n",
out[0], out[1], out[2], out[3]);
@ -432,7 +432,7 @@ MT2032_get_afc_hint(FI1236Ptr f)
CARD8 AFC;
in = 0x0e;
I2C_WriteRead(&(f->d), (I2CByte *) & in, 1, out, 2);
I2C_WriteRead(&(f->d), (I2CByte *) &in, 1, out, 2);
AFC = (out[0] >> 4) & 0x7;
#if 0
xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "AFC=%d TAD1=%d TAD2=%d\n",
@ -467,7 +467,7 @@ MT2032_dump_status(FI1236Ptr f)
CARD8 TAD2, TAD1;
in = 0x0e;
I2C_WriteRead(&(f->d), (I2CByte *) & in, 1, out, 2);
I2C_WriteRead(&(f->d), (I2CByte *) &in, 1, out, 2);
XOK = out[0] & 1;
LO1LK = (out[0] >> 2) & 1;
LO2LK = (out[0] >> 1) & 1;
@ -589,12 +589,12 @@ FI1236_tune(FI1236Ptr f, CARD32 frequency)
if ((f->type == TUNER_TYPE_FM1216ME) || (f->type == TUNER_TYPE_FI1236W)) {
f->tuner_data.aux = 0x20;
I2C_WriteRead(&(f->d), (I2CByte *) & (f->tuner_data), 5, NULL, 0);
I2C_WriteRead(&(f->d), (I2CByte *) &(f->tuner_data), 5, NULL, 0);
I2C_WriteRead(&(f->d), NULL, 0, &data, 1);
xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Tuner status %x\n", data);
}
else
I2C_WriteRead(&(f->d), (I2CByte *) & (f->tuner_data), 4, NULL, 0);
I2C_WriteRead(&(f->d), (I2CByte *) &(f->tuner_data), 4, NULL, 0);
}
void

2
hw/xfree86/i2c/tda9850.c
View file

@ -131,6 +131,6 @@ tda9850_getstatus(TDA9850Ptr t)
{
CARD16 status;
I2C_WriteRead(&(t->d), NULL, 0, (I2CByte *) & status, 2);
I2C_WriteRead(&(t->d), NULL, 0, (I2CByte *) &status, 2);
return status;
}