xserver-xorg-video-chips: Changes to 'debian-unstable'
ChangeLog | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 5 ++
debian/changelog | 6 +++
man/chips.man | 1
src/ct_accel.c | 4 +-
src/ct_ddc.c | 4 +-
src/ct_dga.c | 10 ++---
src/ct_driver.c | 49 ++++++++++++++------------
src/ct_video.c | 31 ++++++++---------
9 files changed, 160 insertions(+), 50 deletions(-)
New commits:
commit 07ff7257738def031d9db450eadbeb0f51507934
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Mar 8 16:52:02 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 5cb07db..ada2355 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-chips (1:1.2.4-1) UNRELEASED; urgency=low
+xserver-xorg-video-chips (1:1.2.4-1) unstable; urgency=low
* New upstream release.
- -- Cyril Brulebois <kibi@debian.org> Tue, 08 Mar 2011 16:51:12 +0100
+ -- Cyril Brulebois <kibi@debian.org> Tue, 08 Mar 2011 16:51:59 +0100
xserver-xorg-video-chips (1:1.2.3-3) unstable; urgency=low
commit 67dff760e8c57191d782aeca97469ec89469505c
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Mar 8 16:51:52 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 09a4c6d..36a87d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,103 @@
+commit 314b72730340ce934c00f1756e4489e97635e1a9
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Feb 27 17:12:48 2011 +0100
+
+ Bump to 1.2.4
+
+commit 25c21f7c47b41283ae8b009068fe489bbdfa0b5a
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Feb 27 16:41:08 2011 +0100
+
+ Replace deprecated xalloc/xrealloc/xfree with malloc/realloc/free
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit a7b607ed727b44d78c3e88c0f74932a8f46f6470
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Feb 27 16:53:31 2011 +0100
+
+ Fix compiler warning
+
+ src/ct_driver.c:160: warning: ‘chipsFindIsaDevice’ declared ‘static’ but never defined
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 3901322baf34a8e26fecc1915646d5e9c2252a9d
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Feb 27 16:51:24 2011 +0100
+
+ Fix unused variable warning
+
+ src/ct_driver.c: In function ‘CHIPSScreenInit’:
+ src/ct_driver.c:3920: warning: unused variable ‘racflag’
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit c409e213143156893a157d73c37a14df6bf0041b
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Feb 27 16:50:21 2011 +0100
+
+ Fix compiler warning on 64bit
+
+ src/ct_driver.c: In function ‘chipsPreInitHiQV’:
+ src/ct_driver.c:1598: warning: format ‘%lX’ expects type ‘long unsigned int’, but argument 4 has type ‘CARD32’
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit c4d03c11f889e12100f5770c13b5e50463043a4b
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Feb 27 16:43:45 2011 +0100
+
+ Add parentheses to fix compiler warnings
+
+ src/ct_ddc.c: In function ‘chips_ddc1Read’:
+ src/ct_ddc.c:34: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
+
+ src/ct_dga.c: In function ‘CHIPS_SetViewport’:
+ src/ct_dga.c:243: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
+
+ src/ct_driver.c: In function ‘chipsTestDACComp’:
+ src/ct_driver.c:7490: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 5830fed3ebce5e5bacab85e37176cb81859828ef
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Nov 22 16:37:29 2010 -0500
+
+ Import the xf8_16bpp implementation
+
+ This is trivial, just do it directly.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 02b3264149703eac325026a87dfa89d68d6ae1c8
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:29:50 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8e957e501db31059e49e81e56cdc31e3440d771b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jul 23 19:38:21 2010 -0400
+
+ config: add AM_PROG_CC_C_O for per-target compilation flags
+
+ The use of per-target compilation flags with C sources requires
+ that the macro AM_PROG_CC_C_O be called from configure.ac
+
+ If the C compiler does not accept the -c and -o options simultaneously,
+ define NO_MINUS_C_MINUS_O. This macro actually tests both the compiler
+ found by AC_PROG_CC, and, if different, the first cc in the path.
+ The test fails if one fails. This macro was created for GNU Make
+ to choose the default C compilation rule.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit 5665714d0de33571d97def69d00d7bfa9e0d5b8a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jul 23 11:33:37 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 8745917..5cb07db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-chips (1:1.2.4-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 08 Mar 2011 16:51:12 +0100
+
xserver-xorg-video-chips (1:1.2.3-3) unstable; urgency=low
* Switch to dh:
commit 314b72730340ce934c00f1756e4489e97635e1a9
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 17:12:48 2011 +0100
Bump to 1.2.4
diff --git a/configure.ac b/configure.ac
index 4155736..225e516 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-chips],
- [1.2.3],
+ [1.2.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-chips])
AC_CONFIG_SRCDIR([Makefile.am])
commit 25c21f7c47b41283ae8b009068fe489bbdfa0b5a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 16:41:08 2011 +0100
Replace deprecated xalloc/xrealloc/xfree with malloc/realloc/free
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/ct_accel.c b/src/ct_accel.c
index 8d049eb..3920b0a 100644
--- a/src/ct_accel.c
+++ b/src/ct_accel.c
@@ -1181,7 +1181,7 @@ CTNAME(CacheMonoStipple)(ScrnInfoPtr pScrn, PixmapPtr pPix)
} else funcNo = 2;
pad = (((pCache->w * bpp) + 31) >> 5) << 2;
- dstPtr = data = (unsigned char*)xalloc(pad * pCache->h);
+ dstPtr = data = malloc(pad * pCache->h);
srcPtr = (unsigned char*)pPix->devPrivate.ptr;
StippleFunc = StippleTab[funcNo];
@@ -1209,7 +1209,7 @@ CTNAME(CacheMonoStipple)(ScrnInfoPtr pScrn, PixmapPtr pPix)
pScrn, pCache->x, pCache->y, pCache->w, pCache->h, data,
pad, bpp, pScrn->depth);
- xfree(data);
+ free(data);
return pCache;
}
diff --git a/src/ct_ddc.c b/src/ct_ddc.c
index b8b2188..ab02d47 100644
--- a/src/ct_ddc.c
+++ b/src/ct_ddc.c
@@ -170,7 +170,7 @@ chips_i2cInit(ScrnInfoPtr pScrn)
I2CPtr->scrnIndex = pScrn->scrnIndex;
I2CPtr->I2CPutBits = chips_I2CPutBits;
I2CPtr->I2CGetBits = chips_I2CGetBits;
- I2CPtr->DriverPrivate.ptr = xalloc(sizeof(CHIPSI2CRec));
+ I2CPtr->DriverPrivate.ptr = malloc(sizeof(CHIPSI2CRec));
((CHIPSI2CPtr)(I2CPtr->DriverPrivate.ptr))->cPtr = cPtr;
if (!xf86I2CBusInit(I2CPtr))
diff --git a/src/ct_dga.c b/src/ct_dga.c
index acda29f..32f3aa3 100644
--- a/src/ct_dga.c
+++ b/src/ct_dga.c
@@ -95,15 +95,15 @@ CHIPSDGAInit(ScreenPtr pScreen)
while(pMode) {
if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
oneMore = TRUE;
} else {
- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
oneMore = FALSE;
}
if(!newmodes) {
- xfree(modes);
+ free(modes);
return FALSE;
}
modes = newmodes;
diff --git a/src/ct_driver.c b/src/ct_driver.c
index fb5803e..6624b79 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -771,7 +771,7 @@ CHIPSFreeRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -1487,7 +1487,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
/* Collect all of the relevant option flags (fill in pScrn->options) */
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(cPtr->Options = xalloc(sizeof(ChipsHiQVOptions))))
+ if (!(cPtr->Options = malloc(sizeof(ChipsHiQVOptions))))
return FALSE;
memcpy(cPtr->Options, ChipsHiQVOptions, sizeof(ChipsHiQVOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, cPtr->Options);
@@ -2566,7 +2566,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags)
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(cPtr->Options = xalloc(sizeof(ChipsWingineOptions))))
+ if (!(cPtr->Options = malloc(sizeof(ChipsWingineOptions))))
return FALSE;
memcpy(cPtr->Options, ChipsWingineOptions, sizeof(ChipsWingineOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, cPtr->Options);
@@ -3037,7 +3037,7 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags)
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(cPtr->Options = xalloc(sizeof(Chips655xxOptions))))
+ if (!(cPtr->Options = malloc(sizeof(Chips655xxOptions))))
return FALSE;
memcpy(cPtr->Options, Chips655xxOptions, sizeof(Chips655xxOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, cPtr->Options);
@@ -4063,7 +4063,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if(cPtr->Flags & ChipsShadowFB) {
cPtr->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
- cPtr->ShadowPtr = xalloc(cPtr->ShadowPitch * height);
+ cPtr->ShadowPtr = malloc(cPtr->ShadowPitch * height);
displayWidth = cPtr->ShadowPitch / (pScrn->bitsPerPixel >> 3);
FBStart = cPtr->ShadowPtr;
} else {
@@ -4625,10 +4625,8 @@ CHIPSCloseScreen(int scrnIndex, ScreenPtr pScreen)
XAADestroyInfoRec(cPtr->AccelInfoRec);
if (cPtr->CursorInfoRec)
xf86DestroyCursorInfoRec(cPtr->CursorInfoRec);
- if (cPtr->ShadowPtr)
- xfree(cPtr->ShadowPtr);
- if (cPtr->DGAModes)
- xfree(cPtr->DGAModes);
+ free(cPtr->ShadowPtr);
+ free(cPtr->DGAModes);
pScrn->vtSema = FALSE;
if(cPtr->BlockHandler)
pScreen->BlockHandler = cPtr->BlockHandler;
diff --git a/src/ct_video.c b/src/ct_video.c
index 130634b..a68acb9 100644
--- a/src/ct_video.c
+++ b/src/ct_video.c
@@ -70,7 +70,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
adaptors = &newAdaptor;
} else {
newAdaptors = /* need to free this someplace */
- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
if(newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
sizeof(XF86VideoAdaptorPtr));
@@ -84,8 +84,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
if(num_adaptors)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- if(newAdaptors)
- xfree(newAdaptors);
+ free(newAdaptors);
}
/* client libraries expect an encoding */
@@ -236,9 +235,9 @@ CHIPSSetupImageVideo(ScreenPtr pScreen)
XF86VideoAdaptorPtr adapt;
CHIPSPortPrivPtr pPriv;
- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
- sizeof(CHIPSPortPrivRec) +
- sizeof(DevUnion))))
+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+ sizeof(CHIPSPortPrivRec) +
+ sizeof(DevUnion))))
return NULL;
adapt->type = XvWindowMask | XvInputMask | XvImageMask;
@@ -880,18 +879,18 @@ CHIPSAllocateSurface(
surface->width = w;
surface->height = h;
- if(!(surface->pitches = xalloc(sizeof(int)))) {
+ if(!(surface->pitches = malloc(sizeof(int)))) {
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
- if(!(surface->offsets = xalloc(sizeof(int)))) {
- xfree(surface->pitches);
+ if(!(surface->offsets = malloc(sizeof(int)))) {
+ free(surface->pitches);
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
- if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
- xfree(surface->pitches);
- xfree(surface->offsets);
+ if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
+ free(surface->pitches);
+ free(surface->offsets);
xf86FreeOffscreenLinear(linear);
return BadAlloc;
}
@@ -937,9 +936,9 @@ CHIPSFreeSurface(
if(pPriv->isOn)
CHIPSStopSurface(surface);
xf86FreeOffscreenLinear(pPriv->linear);
- xfree(surface->pitches);
- xfree(surface->offsets);
- xfree(surface->devPrivate.ptr);
+ free(surface->pitches);
+ free(surface->offsets);
+ free(surface->devPrivate.ptr);
return Success;
}
@@ -1029,7 +1028,7 @@ CHIPSInitOffscreenImages(ScreenPtr pScreen)
XF86OffscreenImagePtr offscreenImages;
/* need to free this someplace */
- if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
+ if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec))))
return;
offscreenImages[0].image = &Images[0];
commit a7b607ed727b44d78c3e88c0f74932a8f46f6470
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 16:53:31 2011 +0100
Fix compiler warning
src/ct_driver.c:160: warning: ‘chipsFindIsaDevice’ declared ‘static’ but never defined
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 61bdacf..fb5803e 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -157,7 +157,9 @@ static ModeStatus CHIPSValidMode(int scrnIndex, DisplayModePtr mode,
static Bool CHIPSSaveScreen(ScreenPtr pScreen, int mode);
/* Internally used functions */
+#ifdef HAVE_ISA
static int chipsFindIsaDevice(GDevPtr dev);
+#endif
static Bool chipsClockSelect(ScrnInfoPtr pScrn, int no);
Bool chipsModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
static void chipsSave(ScrnInfoPtr pScrn, vgaRegPtr VgaSave,
commit 3901322baf34a8e26fecc1915646d5e9c2252a9d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 16:51:24 2011 +0100
Fix unused variable warning
src/ct_driver.c: In function ‘CHIPSScreenInit’:
src/ct_driver.c:3920: warning: unused variable ‘racflag’
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/ct_driver.c b/src/ct_driver.c
index f5aac65..61bdacf 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -3917,7 +3917,9 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
int init_picture = 0;
VisualPtr visual;
int allocatebase, freespace, currentaddr;
+#ifndef XSERVER_LIBPCIACCESS
unsigned int racflag = 0;
+#endif
unsigned char *FBStart;
int height, width, displayWidth;
CHIPSEntPtr cPtrEnt = NULL;
commit c409e213143156893a157d73c37a14df6bf0041b
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 16:50:21 2011 +0100
Fix compiler warning on 64bit
src/ct_driver.c: In function ‘chipsPreInitHiQV’:
src/ct_driver.c:1598: warning: format ‘%lX’ expects type ‘long unsigned int’, but argument 4 has type ‘CARD32’
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 0631a4f..f5aac65 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -1595,7 +1595,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
#endif
cPtr->IOAddress = cPtr->FbAddress + 0x400000L;
xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT,
- "IOAddress is set at 0x%lX.\n",cPtr->IOAddress);
+ "IOAddress is set at 0x%lX.\n",(unsigned long)cPtr->IOAddress);
} else
xf86DrvMsg(pScrn->scrnIndex, from,
commit c4d03c11f889e12100f5770c13b5e50463043a4b
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 16:43:45 2011 +0100
Add parentheses to fix compiler warnings
src/ct_ddc.c: In function ‘chips_ddc1Read’:
src/ct_ddc.c:34: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
src/ct_dga.c: In function ‘CHIPS_SetViewport’:
src/ct_dga.c:243: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
src/ct_driver.c: In function ‘chipsTestDACComp’:
src/ct_driver.c:7490: warning: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’ or ‘!’ to ‘~’
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/ct_ddc.c b/src/ct_ddc.c
index 5e86c17..b8b2188 100644
--- a/src/ct_ddc.c
+++ b/src/ct_ddc.c
@@ -31,7 +31,7 @@ chips_ddc1Read(ScrnInfoPtr pScrn)
register unsigned int tmp;
while ((hwp->readST01(hwp)) & 0x08){};
- while (!(hwp->readST01(hwp)) & 0x08){};
+ while (!((hwp->readST01(hwp)) & 0x08)){};
tmp = cPtr->readXR(cPtr, 0x63);
return (tmp & ddc_mask);
}
diff --git a/src/ct_dga.c b/src/ct_dga.c
index e3c1a00..acda29f 100644
--- a/src/ct_dga.c
+++ b/src/ct_dga.c
@@ -239,8 +239,8 @@ CHIPS_SetViewport(
CHIPSPtr cPtr = CHIPSPTR(pScrn);
if (flags & DGA_FLIP_RETRACE) {
- while ((hwp->readST01(hwp)) & 0x08){};
- while (!(hwp->readST01(hwp)) & 0x08){};
+ while ((hwp->readST01(hwp)) & 0x08){};
+ while (!((hwp->readST01(hwp)) & 0x08)){};
}
CHIPSAdjustFrame(pScrn->pScreen->myNum, x, y, flags);
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 97031ef..0631a4f 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -7487,7 +7487,7 @@ chipsTestDACComp(ScrnInfoPtr pScrn, unsigned char a, unsigned char b,
hwp->writeDacWriteAddr(hwp, 0x00);
while ((hwp->readST01(hwp)) & 0x08){}; /* wait for vsync to end */
- while (!(hwp->readST01(hwp)) & 0x08){}; /* wait for new vsync */
+ while (!((hwp->readST01(hwp)) & 0x08)){}; /* wait for new vsync */
hwp->writeDacData(hwp, a); /* set pattern */
hwp->writeDacData(hwp, b);
hwp->writeDacData(hwp, c);
commit 5830fed3ebce5e5bacab85e37176cb81859828ef
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 22 16:37:29 2010 -0500
Import the xf8_16bpp implementation
This is trivial, just do it directly.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 28a1660..97031ef 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -111,8 +111,7 @@
#include "micmap.h"
#include "fb.h"
-#include "cfb8_16.h"
-
+#include "fboverlay.h"
/* Needed for the 1 and 4 bpp framebuffers */
#ifdef HAVE_XF1BPP
@@ -1332,16 +1331,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
}
break;
#endif
- case 16:
- if (cPtr->Flags & ChipsOverlay8plus16) {
- if (xf86LoadSubModule(pScrn, "xf8_16bpp") == NULL) {
- vbeFree(cPtr->pVbe);
- cPtr->pVbe = NULL;
- CHIPSFreeRec(pScrn);
- return FALSE;
- }
- break;
- }
default:
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
vbeFree(cPtr->pVbe);
@@ -3904,6 +3893,18 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
hwp->disablePalette(hwp);
}
+static Bool
+cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
+ int xsize, int ysize, int dpix, int dpiy,
+ int width16, int width8)
+{
+ return
+ (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
+ dpix, dpiy, width16, width8, 16, 8) &&
+ fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
+ dpix, dpiy, width16, width8, 16, 8, 16, 8));
+}
+
/* Mandatory */
static Bool
CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
commit 02b3264149703eac325026a87dfa89d68d6ae1c8
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:29:50 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/chips.man b/man/chips.man
index 3f8cfe1..740af38 100644
--- a/man/chips.man
+++ b/man/chips.man
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/chips.man,v 1.4 2001/12/17 20:52:32 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH CHIPS __drivermansuffix__ __vendorversion__
commit 8e957e501db31059e49e81e56cdc31e3440d771b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jul 23 19:38:21 2010 -0400
config: add AM_PROG_CC_C_O for per-target compilation flags
The use of per-target compilation flags with C sources requires
that the macro AM_PROG_CC_C_O be called from configure.ac
If the C compiler does not accept the -c and -o options simultaneously,
define NO_MINUS_C_MINUS_O. This macro actually tests both the compiler
found by AC_PROG_CC, and, if different, the first cc in the path.
The test fails if one fails. This macro was created for GNU Make
to choose the default C compilation rule.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index bfc0059..4155736 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,9 @@ XORG_DEFAULT_OPTIONS
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+# Checks for programs.
+AM_PROG_CC_C_O
+
AH_TOP([#include "xorg-server.h"])
# Define a configure option for an alternate module directory
Reply to: