From 3a0988b833f96c7eb352c04334c382c53e40a0f0 Mon Sep 17 00:00:00 2001 From: Jaroslaw Pelczar Date: Wed, 28 Aug 2019 17:33:47 +0200 Subject: [PATCH] s3:More fixes for invalid type casts Signed-off-by: Jaroslaw Pelczar Change-Id: Id4170d950f9f79fc5edd808f49d58da974cb32b7 Reviewed-on: https://review.haiku-os.org/c/haiku/+/1788 Reviewed-by: waddlesplash --- src/add-ons/accelerants/s3/virge_edid.cpp | 2 +- src/add-ons/accelerants/s3/virge_init.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/accelerants/s3/virge_edid.cpp b/src/add-ons/accelerants/s3/virge_edid.cpp index c1e58de595..137ee8a6e0 100644 --- a/src/add-ons/accelerants/s3/virge_edid.cpp +++ b/src/add-ons/accelerants/s3/virge_edid.cpp @@ -92,7 +92,7 @@ Virge_GetEdidInfo(edid1_info& edidInfo) uint32 DDCPort = 0xAA; i2c_bus bus; - bus.cookie = (void*)DDCPort; + bus.cookie = (void*)(addr_t)DDCPort; bus.set_signals = &SetI2CSignals_Alt; bus.get_signals = &GetI2CSignals_Alt; ddc2_init_timing(&bus); diff --git a/src/add-ons/accelerants/s3/virge_init.cpp b/src/add-ons/accelerants/s3/virge_init.cpp index b726cc49db..265e91f615 100644 --- a/src/add-ons/accelerants/s3/virge_init.cpp +++ b/src/add-ons/accelerants/s3/virge_init.cpp @@ -89,9 +89,9 @@ Virge_Init(void) // some DX chipsets don't seem to do it automatically. WritePIO_8(CRTC_INDEX, 0x59); - WritePIO_8(CRTC_DATA, (uint32)(si.videoMemPCI) >> 24); + WritePIO_8(CRTC_DATA, (uint8)((uint32)(si.videoMemPCI) >> 24)); WritePIO_8(CRTC_INDEX, 0x5A); - WritePIO_8(CRTC_DATA, (uint32)(si.videoMemPCI) >> 16); + WritePIO_8(CRTC_DATA, (uint8)((uint32)(si.videoMemPCI) >> 16)); // Enable MMIO.