diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-11-01 23:05:45 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-11-01 23:05:45 -0700 |
| commit | 02451944ba73887db9803f44a1826059d9105963 (patch) | |
| tree | 007961670d0e47e7e7157f02917d6d33ea5fda8d | |
| parent | 2901c9cf5e842cef199676e76cd0ffa532a76a9b (diff) | |
Build fix for -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/sisusb_dac.c | 16 | ||||
| -rw-r--r-- | src/sisusb_driver.c | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/sisusb_dac.c b/src/sisusb_dac.c index 5e3eb7f..b5c4dce 100644 --- a/src/sisusb_dac.c +++ b/src/sisusb_dac.c @@ -672,7 +672,7 @@ SiSUSBMemCopyToVideoRam(SISUSBPtr pSiSUSB, UChar *to, UChar *from, int size) int num, retry = 3; if(pSiSUSB->sisusbfatalerror) return; do { - lseek(pSiSUSB->sisusbdev, (int)to, SEEK_SET); + lseek(pSiSUSB->sisusbdev, (uintptr_t)to, SEEK_SET); num = write(pSiSUSB->sisusbdev, from, size); } while((num != size) && --retry); if(!retry) SiSLostConnection(pSiSUSB); @@ -958,7 +958,7 @@ void sisclearvram(SISUSBPtr pSiSUSB, UChar *where, unsigned int howmuch) if(pSiSUSB->sisusbfatalerror) return; do { x.operation = SUCMD_CLRSCR; - x.data3 = (CARD32)where; + x.data3 = (CARD32)(uintptr_t)where; x.data0 = (howmuch >> 16) & 0xff; x.data1 = (howmuch >> 8) & 0xff; x.data2 = howmuch & 0xff; @@ -990,7 +990,7 @@ void SIS_MMIO_OUT8(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD8 va int num, retry = 3; if(pSiSUSB->sisusbfatalerror) return; do { - lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); + lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); num = write(pSiSUSB->sisusbdev, &val, 1); } while((num != 1) && --retry); if(!retry) SiSLostConnection(pSiSUSB); @@ -1002,7 +1002,7 @@ void SIS_MMIO_OUT16(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD16 CARD16 buf = sisusb_cpu_to_le16(val); if(pSiSUSB->sisusbfatalerror) return; do { - lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); + lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); num = write(pSiSUSB->sisusbdev, &buf, 2); } while((num != 2) && --retry); if(!retry) SiSLostConnection(pSiSUSB); @@ -1014,7 +1014,7 @@ void SIS_MMIO_OUT32(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD32 CARD32 buf = sisusb_cpu_to_le32(val); if(pSiSUSB->sisusbfatalerror) return; do { - lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); + lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); num = write(pSiSUSB->sisusbdev, &buf, 4); } while((num != 4) && --retry); if(!retry) SiSLostConnection(pSiSUSB); @@ -1026,7 +1026,7 @@ CARD8 SIS_MMIO_IN8(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset) CARD8 tmp; if(pSiSUSB->sisusbfatalerror) return 0; do { - lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); + lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); num = read(pSiSUSB->sisusbdev, &tmp, 1); } while((num != 1) && --retry); if(!retry) SiSLostConnection(pSiSUSB); @@ -1039,7 +1039,7 @@ CARD16 SIS_MMIO_IN16(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset) CARD16 tmp; if(pSiSUSB->sisusbfatalerror) return 0; do { - lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); + lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); num = read(pSiSUSB->sisusbdev, &tmp, 2); } while((num != 2) && --retry); if(!retry) SiSLostConnection(pSiSUSB); @@ -1052,7 +1052,7 @@ CARD32 SIS_MMIO_IN32(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset) CARD32 tmp; if(pSiSUSB->sisusbfatalerror) return 0; do { - lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); + lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); num = read(pSiSUSB->sisusbdev, &tmp, 4); } while((num != 4) && --retry); if(!retry) SiSLostConnection(pSiSUSB); diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c index 4531e1a..032225c 100644 --- a/src/sisusb_driver.c +++ b/src/sisusb_driver.c @@ -1456,8 +1456,8 @@ SISUSBMapMem(ScrnInfoPtr pScrn) { SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); - pSiSUSB->FbBase = (UChar *)pSiSUSB->FbAddress; - pSiSUSB->IOBase = (UChar *)pSiSUSB->IOAddress; + pSiSUSB->FbBase = (UChar *)(uintptr_t)pSiSUSB->FbAddress; + pSiSUSB->IOBase = (UChar *)(uintptr_t)pSiSUSB->IOAddress; return TRUE; } |