From 11a90fa479bf30d3720bc5ea33da3933260f2391 Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 12 May 2009 23:12:29 +0000 Subject: [PATCH] Fixed warnings. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@31213 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/i386-pc/drivers/vesa.hidd/hardware.c | 16 ++++++++-------- arch/i386-pc/drivers/vesa.hidd/offbitmap.c | 6 +++--- arch/i386-pc/drivers/vesa.hidd/onbitmap.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/i386-pc/drivers/vesa.hidd/hardware.c b/arch/i386-pc/drivers/vesa.hidd/hardware.c index 38ed32495..df9a79c31 100755 --- a/arch/i386-pc/drivers/vesa.hidd/hardware.c +++ b/arch/i386-pc/drivers/vesa.hidd/hardware.c @@ -1,7 +1,7 @@ /* Copyright © 1995-2009, The AROS Development Team. All rights reserved. $Id$ - + Desc: vesa "hardware" functions Lang: English */ @@ -163,7 +163,7 @@ AROS_UFH3(void, Enumerator, { AROS_USERFUNC_INIT - IPTR buf; + APTR buf; IPTR size; IPTR Vendor; OOP_Object *driver; @@ -172,19 +172,19 @@ AROS_UFH3(void, Enumerator, D(bug("[VESA] Enumerator: Found device\n")); - OOP_GetAttr(pciDevice, aHidd_PCIDevice_Driver, (APTR)&driver); - OOP_GetAttr(pciDevice, aHidd_PCIDevice_VendorID, (APTR)&Vendor); - OOP_GetAttr(pciDevice, aHidd_PCIDevice_Base0, (APTR)&buf); - OOP_GetAttr(pciDevice, aHidd_PCIDevice_Size0, (APTR)&size); + OOP_GetAttr(pciDevice, aHidd_PCIDevice_Driver, (IPTR *)&driver); + OOP_GetAttr(pciDevice, aHidd_PCIDevice_VendorID, &Vendor); + OOP_GetAttr(pciDevice, aHidd_PCIDevice_Base0, (IPTR *)&buf); + OOP_GetAttr(pciDevice, aHidd_PCIDevice_Size0, &size); /* BIOS of S3 video cards may forget to set up linear framebuffer start address. Here we do this manually. This thing was looked up in x.org S3 driver source code. Applicable to all S3 cards. */ if (Vendor == PCI_VENDOR_S3) { outb(0x59, vgaIOBase + 4); - outb(buf >> 24, vgaIOBase + 5); + outb((IPTR)buf >> 24, vgaIOBase + 5); outb(0x5A, vgaIOBase + 4); - outb(buf >> 16, vgaIOBase + 5); + outb((IPTR)buf >> 16, vgaIOBase + 5); } mappci.mID = OOP_GetMethodID(IID_Hidd_PCIDriver, moHidd_PCIDriver_MapPCI); diff --git a/arch/i386-pc/drivers/vesa.hidd/offbitmap.c b/arch/i386-pc/drivers/vesa.hidd/offbitmap.c index 8a8fcc4f5..d6d6927c1 100755 --- a/arch/i386-pc/drivers/vesa.hidd/offbitmap.c +++ b/arch/i386-pc/drivers/vesa.hidd/offbitmap.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2006, The AROS Development Team. All rights reserved. + Copyright © 1995-2009, The AROS Development Team. All rights reserved. $Id$ Desc: Offscreen bitmap class for Vesa hidd. @@ -73,13 +73,13 @@ OOP_Object *MNAME_ROOT(New)(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) OOP_GetAttr(o, aHidd_BitMap_Width, &width); OOP_GetAttr(o, aHidd_BitMap_Height, &height); OOP_GetAttr(o, aHidd_BitMap_GfxHidd, (IPTR *)&data->gfxhidd); - OOP_GetAttr(o, aHidd_BitMap_PixFmt, &pf); + OOP_GetAttr(o, aHidd_BitMap_PixFmt, (IPTR *)&pf); data->pixfmtobj = pf; OOP_GetAttr(pf, aHidd_PixFmt_Depth, &depth); OOP_GetAttr(pf, aHidd_PixFmt_BytesPerPixel, &multi); /* Get the friend bitmap. This should be a displayable bitmap */ - OOP_GetAttr(o, aHidd_BitMap_Friend, &friend); + OOP_GetAttr(o, aHidd_BitMap_Friend, (IPTR *)&friend); /* If you got a friend bitmap, copy its colormap */ if (friend) diff --git a/arch/i386-pc/drivers/vesa.hidd/onbitmap.c b/arch/i386-pc/drivers/vesa.hidd/onbitmap.c index edb4b45f6..8cd2ce6a2 100755 --- a/arch/i386-pc/drivers/vesa.hidd/onbitmap.c +++ b/arch/i386-pc/drivers/vesa.hidd/onbitmap.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2006, The AROS Development Team. All rights reserved. + Copyright © 1995-2009, The AROS Development Team. All rights reserved. $Id$ Desc: Bitmap class for Vesa hidd. @@ -78,7 +78,7 @@ OOP_Object *MNAME_ROOT(New)(OOP_Class *cl, OOP_Object *o, struct pRoot_New *msg) OOP_GetAttr(o, aHidd_BitMap_Width, &width); OOP_GetAttr(o, aHidd_BitMap_Height, &height); OOP_GetAttr(o, aHidd_BitMap_GfxHidd, (IPTR *)&data->gfxhidd); - OOP_GetAttr(o, aHidd_BitMap_PixFmt, &pf); + OOP_GetAttr(o, aHidd_BitMap_PixFmt, (IPTR *)&pf); data->pixfmtobj = pf; OOP_GetAttr(pf, aHidd_PixFmt_Depth, &depth); OOP_GetAttr(pf, aHidd_PixFmt_BytesPerPixel, &multi); -- 2.11.4.GIT