Module Name: xsrc
Committed By: mrg
Date: Fri Jun 12 01:55:08 UTC 2009
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915:
intel_pixel_read.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel: intel_tex.c
intel_tex_image.c
xsrc/external/mit/MesaLib/dist/src/mesa/vbo: vbo_exec_draw.c
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c
xsrc/external/mit/xf86-video-ast/dist/src: ast_vgatool.c
xsrc/external/mit/xf86-video-mga/dist/src: mga_dac3026.c
xsrc/external/mit/xf86-video-s3virge/dist/src: s3v_dga.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_dga.c
xsrc/external/mit/xorg-server/dist/dix: enterleave.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/int10: helper_exec.c
xf86int10.c
xsrc/external/mit/xorg-server/dist/mi: miscrinit.c
Log Message:
avoid a bunch of int/ptr warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_pixel_read.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex.c \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex_image.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_dga.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/dix/enterleave.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/helper_exec.c \
xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/xf86int10.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/mi/miscrinit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_pixel_read.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_pixel_read.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_pixel_read.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_pixel_read.c:1.1.1.1 Thu Jun 11 00:50:19 2009
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915/intel_pixel_read.c Fri Jun 12 01:55:06 2009
@@ -225,7 +225,7 @@
}
/* XXX 64-bit cast? */
- dst_offset = (GLuint) _mesa_image_address(2, pack, pixels, width, height,
+ dst_offset = (GLuint) (uintptr_t)_mesa_image_address(2, pack, pixels, width, height,
format, type, 0, 0, 0);
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex.c:1.1.1.1 Thu Jun 11 00:50:19 2009
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex.c Fri Jun 12 01:55:06 2009
@@ -93,7 +93,7 @@
static void *
do_memcpy(void *dest, const void *src, size_t n)
{
- if ((((unsigned) src) & 63) || (((unsigned) dest) & 63)) {
+ if ((((unsigned long) src) & 63) || (((unsigned long) dest) & 63)) {
return __memcpy(dest, src, n);
}
else
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex_image.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex_image.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex_image.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex_image.c:1.1.1.1 Thu Jun 11 00:50:19 2009
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/intel/intel_tex_image.c Fri Jun 12 01:55:06 2009
@@ -211,7 +211,7 @@
return GL_FALSE;
}
- src_offset = (GLuint) pixels;
+ src_offset = (GLuint) (unsigned long) pixels;
if (unpack->RowLength > 0)
src_stride = unpack->RowLength;
@@ -266,7 +266,7 @@
return GL_FALSE;
}
- src_offset = (GLuint) pixels;
+ src_offset = (GLuint) (unsigned long) pixels;
if (unpack->RowLength > 0)
src_stride = unpack->RowLength;
Index: xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c:1.1.1.2 xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c:1.1.1.2 Thu Jun 11 00:50:16 2009
+++ xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c Fri Jun 12 01:55:07 2009
@@ -207,7 +207,7 @@
assert(exec->vtx.bufferobj->Pointer); /* buf should be mapped */
offset = (GLbyte *) data - (GLbyte *) exec->vtx.bufferobj->Pointer;
assert(offset >= 0);
- arrays[attr].Ptr = (void *) offset;
+ arrays[attr].Ptr = (void *) (uintptr_t) offset;
}
else {
/* Ptr into ordinary app memory */
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.4 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.5
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.4 Sat Feb 7 17:33:28 2009
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Fri Jun 12 01:55:07 2009
@@ -447,12 +447,6 @@
xfree(s);
}
-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
- if (pKbd->isConsole &&
- ((pKbd->consType == SYSCONS) || (pKbd->consType == PCVT)))
- pKbd->vtSwitchSupported = TRUE;
-#endif
-
#ifdef WSCONS_SUPPORT
if( prot == PROT_WSCONS) {
pKbd->consType = WSCONS;
@@ -502,6 +496,14 @@
}
}
#endif
+
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) || defined (WSCONS_SUPPORT)
+ if (pKbd->isConsole &&
+ ((pKbd->consType == SYSCONS) || (pKbd->consType == PCVT)) ||
+ ((pKbd->consType == WSCONS)))
+ pKbd->vtSwitchSupported = TRUE;
+#endif
+
return TRUE;
}
Index: xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c
diff -u xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c:1.1.1.2 xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c:1.2
--- xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c:1.1.1.2 Wed Jun 10 00:46:28 2009
+++ xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c Fri Jun 12 01:55:07 2009
@@ -836,7 +836,7 @@
Bool InitVGA(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST;
- ULONG ulData;
+ uint32_t ulData;
pAST = ASTPTR(pScrn);
Index: xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
diff -u xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c:1.1.1.2 xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c:1.2
--- xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c:1.1.1.2 Wed Jun 10 00:47:31 2009
+++ xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c Fri Jun 12 01:55:07 2009
@@ -730,7 +730,7 @@
OUTREG16(0x1FDE, (mgaReg->ExtVga[i] << 8) | i);
#ifdef XSERVER_LIBPCIACCESS
- pci_device_cfg_write_bits(pMga->PciInfo, OPTION_MASK, mgaReg->Option,
+ pci_device_cfg_write_bits(pMga->PciInfo, OPTION_MASK, (uint32_t)mgaReg->Option,
PCI_OPTION_REG);
#else
pciSetBitsLong(pMga->PciTag, PCI_OPTION_REG, OPTION_MASK,
@@ -855,8 +855,12 @@
mgaReg->DacRegs[i] = inTi3026(MGADACregs[i]);
#ifdef XSERVER_LIBPCIACCESS
- pci_device_cfg_read_u32(pMga->PciInfo, & mgaReg->Option,
+ {
+ uint32_t Option;
+ pci_device_cfg_read_u32(pMga->PciInfo, & Option,
PCI_OPTION_REG);
+ mgaReg->Option = Option;
+ }
#else
mgaReg->Option = pciReadLong(pMga->PciTag, PCI_OPTION_REG);
#endif
Index: xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_dga.c
diff -u xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_dga.c:1.1.1.2 xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_dga.c:1.2
--- xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_dga.c:1.1.1.2 Wed Jun 10 00:48:18 2009
+++ xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_dga.c Fri Jun 12 01:55:07 2009
@@ -331,7 +331,7 @@
S3VPtr ps3v = S3VPTR(pScrn);
*name = NULL; /* no special device */
- *mem = (unsigned char*)PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM);
+ *mem = (unsigned char*)(uintptr_t)PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM);
*size = ps3v->videoRambytes;
*offset = 0;
*flags = DGA_NEED_ROOT;
Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c
diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c:1.1.1.2 xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c:1.2
--- xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c:1.1.1.2 Wed Jun 10 00:48:26 2009
+++ xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c Fri Jun 12 01:55:07 2009
@@ -390,7 +390,7 @@
SavagePtr psav = SAVPTR(pScrn);
*name = NULL; /* no special device */
- *mem = (unsigned char*)psav->FbRegion.base;
+ *mem = (unsigned char*)(uintptr_t)psav->FbRegion.base;
*size = psav->videoRambytes;
*offset = 0;
*flags = DGA_NEED_ROOT;
Index: xsrc/external/mit/xorg-server/dist/dix/enterleave.c
diff -u xsrc/external/mit/xorg-server/dist/dix/enterleave.c:1.1.1.1 xsrc/external/mit/xorg-server/dist/dix/enterleave.c:1.2
--- xsrc/external/mit/xorg-server/dist/dix/enterleave.c:1.1.1.1 Thu Jun 11 01:52:54 2009
+++ xsrc/external/mit/xorg-server/dist/dix/enterleave.c Fri Jun 12 01:55:07 2009
@@ -1085,8 +1085,8 @@
if (ptrwin && IsParent(root, ptrwin))
CoreFocusOutNotifyPointerEvents(dev, root, None, mode, TRUE);
}
- CoreFocusEvent(dev, FocusOut, mode, ((int)A) ? NotifyPointerRoot : NotifyDetailNone, root);
- CoreFocusEvent(dev, FocusIn, mode, ((int)B) ? NotifyPointerRoot : NotifyDetailNone, root);
+ CoreFocusEvent(dev, FocusOut, mode, ((unsigned long)A) ? NotifyPointerRoot : NotifyDetailNone, root);
+ CoreFocusEvent(dev, FocusIn, mode, ((unsigned long)B) ? NotifyPointerRoot : NotifyDetailNone, root);
if (B == PointerRootWin)
CoreFocusInNotifyPointerEvents(dev, root, None, mode, TRUE);
}
@@ -1136,7 +1136,7 @@
root = WindowTable[i];
if (!HasFocus(root) && !FirstFocusChild(root))
{
- CoreFocusEvent(dev, FocusIn, mode, ((int)B) ? NotifyPointerRoot : NotifyDetailNone, root);
+ CoreFocusEvent(dev, FocusIn, mode, ((unsigned long)B) ? NotifyPointerRoot : NotifyDetailNone, root);
if (B == PointerRootWin)
CoreFocusInNotifyPointerEvents(dev, root, None, mode, TRUE);
}
@@ -1177,7 +1177,7 @@
if (ptrwin)
CoreFocusOutNotifyPointerEvents(dev, root, None, mode, TRUE);
}
- CoreFocusEvent(dev, FocusOut, mode, ((int)A) ? NotifyPointerRoot : NotifyDetailNone, root);
+ CoreFocusEvent(dev, FocusOut, mode, ((unsigned long)A) ? NotifyPointerRoot : NotifyDetailNone, root);
}
}
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/helper_exec.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/helper_exec.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/helper_exec.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/helper_exec.c:1.1.1.2 Thu Jun 11 01:52:56 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/helper_exec.c Fri Jun 12 01:55:07 2009
@@ -498,6 +498,12 @@
}
if (addr == 0xCFC) {
pci_device_cfg_read_u32(pci_device_for_cfg_address(PciCfg1Addr),
+ /*
+ * XXXMRG
+ * this one is OK - CARD32 is "long" for 32 bit
+ * and "int" for 64 bit
+ */
+ (uint32_t *)
val, PCI_OFFSET(PciCfg1Addr));
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" cfg_inl(%#x) = %8.8x\n", PciCfg1Addr, *val);
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/xf86int10.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/xf86int10.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/xf86int10.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/xf86int10.c:1.1.1.2 Thu Jun 11 01:52:56 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/xf86int10.c Fri Jun 12 01:55:07 2009
@@ -782,7 +782,9 @@
return 1;
case 0xb10a:
if ((dev = findPci(pInt, X86_EBX)) != NULL) {
- pci_device_cfg_read_u32(dev, & X86_ECX, X86_DI);
+ uint32_t ecx;
+ pci_device_cfg_read_u32(dev, & ecx, X86_DI);
+ X86_ECX = ecx;
X86_EAX = X86_AL | (SUCCESSFUL << 8);
X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */
} else {
Index: xsrc/external/mit/xorg-server/dist/mi/miscrinit.c
diff -u xsrc/external/mit/xorg-server/dist/mi/miscrinit.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/mi/miscrinit.c:1.2
--- xsrc/external/mit/xorg-server/dist/mi/miscrinit.c:1.1.1.2 Thu Jun 11 01:52:56 2009
+++ xsrc/external/mit/xorg-server/dist/mi/miscrinit.c Fri Jun 12 01:55:07 2009
@@ -308,5 +308,5 @@
_X_EXPORT void
miSetZeroLineBias(ScreenPtr pScreen, unsigned int bias)
{
- dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)bias);
+ dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)(unsigned long)bias);
}
