Tue Jan 24 15:47:02 2017 UTC ()

fix compilation.


(christos)

diff -r1.1 -r1.2 xsrc/external/mit/xf86-video-chips/dist/src/ct_exa.c

--- xsrc/external/mit/xf86-video-chips/dist/src/ct_exa.c 2017/01/07 16:07:07	1.1
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_exa.c 2017/01/24 15:47:01	1.2

 @@ -11,27 +11,27 @@
  * furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * MICHAEL LORENZ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $NetBSD: ct_exa.c,v 1.1 2017/01/07 16:07:07 macallan Exp $ */
+/* $NetBSD: ct_exa.c,v 1.2 2017/01/24 15:47:01 christos Exp $ */
 #include <sys/types.h>
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 /* Everything using inb/outb, etc needs "compiler.h" */
 #include "compiler.h"
 @@ -182,27 +182,27 @@ ctSolid(
     ctSETHEIGHTWIDTHGO(y2 - y1, (x2 - x1) * cAcl->BytesPerPixel);
           LEAVE;
+}
 /*
  * Memcpy-based UTS.
  */
 static Bool
 ctUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
     char *src, int src_pitch)
+{
     ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
     CHIPSPtr cPtr = CHIPSPTR(pScrn);
-    char  *dst        = cPtr->FbBase + exaGetPixmapOffset(pDst);
+    unsigned char *dst = cPtr->FbBase + exaGetPixmapOffset(pDst);
     int    dst_pitch  = exaGetPixmapPitch(pDst);
     int bpp    = pDst->drawable.bitsPerPixel;
     int cpp    = (bpp + 7) / 8;
     int wBytes = w * cpp;
     ENTER;
     ctBLTWAIT;
     dst += (x * cpp) + (y * dst_pitch);
     while (h--) {
         memcpy(dst, src, wBytes);
         src += src_pitch;
 @@ -211,27 +211,27 @@ ctUploadToScreen(PixmapPtr pDst, int x,
     LEAVE;
     return TRUE;
+}
 /*
  * Memcpy-based DFS.
  */
 static Bool
 ctDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
     char *dst, int dst_pitch)
+{
     ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
     CHIPSPtr cPtr = CHIPSPTR(pScrn);
-    char  *src        = cPtr->FbBase + exaGetPixmapOffset(pSrc);
+    unsigned char *src = cPtr->FbBase + exaGetPixmapOffset(pSrc);
     int    src_pitch  = exaGetPixmapPitch(pSrc);
     int bpp    = pSrc->drawable.bitsPerPixel;
     int cpp    = (bpp + 7) / 8;
     int wBytes = w * cpp;
     ENTER;
     ctBLTWAIT;
     src += (x * cpp) + (y * src_pitch);
     while (h--) {
         memcpy(dst, src, wBytes);
         src += src_pitch;