From b10790de440a5255cc3ef233fba3aad5b4d6c332 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 19 Oct 2014 12:47:26 +0000 Subject: [PATCH] Radeon: fix warnings on 64bit. --- .../graphics/radeon/radeon_interface.h | 43 +++++++++---------- src/add-ons/accelerants/radeon/GetModeInfo.c | 2 + src/add-ons/accelerants/radeon/overlay.c | 34 +++++++-------- .../accelerants/radeon/overlay_management.c | 20 ++++----- .../accelerants/radeon/radeon_accelerant.h | 4 +- 5 files changed, 51 insertions(+), 52 deletions(-) diff --git a/headers/private/graphics/radeon/radeon_interface.h b/headers/private/graphics/radeon/radeon_interface.h index 81ab9fe2e6..7e544ddb59 100644 --- a/headers/private/graphics/radeon/radeon_interface.h +++ b/headers/private/graphics/radeon/radeon_interface.h @@ -131,29 +131,26 @@ typedef enum typedef enum { - connector_none, - connector_proprietary, - connector_crt, - connector_dvi_i, - connector_dvi_d, - connector_ctv, - connector_stv, - connector_unsupported -} radeon_connector_type; + connector_none, + connector_proprietary, + connector_crt, + connector_dvi_i, + connector_dvi_d, + connector_ctv, + connector_stv, + connector_unsupported, -typedef enum -{ - connector_none_atom, - connector_vga_atom, - connector_dvi_i_atom, - connector_dvi_d_atom, - connector_dvi_a_atom, - connector_stv_atom, - connector_ctv_atom, - connector_lvds_atom, - connector_digital_atom, - connector_unsupported_atom -} radeon_connector_type_atom; + connector_none_atom = 0, + connector_vga_atom, + connector_dvi_i_atom, + connector_dvi_d_atom, + connector_dvi_a_atom, + connector_stv_atom, + connector_ctv_atom, + connector_lvds_atom, + connector_digital_atom, + connector_unsupported_atom +} radeon_connector_type; typedef enum { @@ -431,7 +428,7 @@ typedef struct { typedef struct { int32 inuse; // one, if someone allocated overlay head // (this doesn't necessarily mean that an overlay is shown) - uint32 token; // arbitrarily chosen token to identify overlay owner + uintptr_t token; // arbitrarily chosen token to identify overlay owner // (increased by 1 whenever there is a new owner) uint32 auto_flip_reg; // content of auto_flip_reg } overlay_mgr_info; diff --git a/src/add-ons/accelerants/radeon/GetModeInfo.c b/src/add-ons/accelerants/radeon/GetModeInfo.c index 7a8f61900b..6c3194ad2a 100644 --- a/src/add-ons/accelerants/radeon/GetModeInfo.c +++ b/src/add-ons/accelerants/radeon/GetModeInfo.c @@ -12,6 +12,8 @@ #include +#include + status_t GET_DISPLAY_MODE(display_mode *mode) diff --git a/src/add-ons/accelerants/radeon/overlay.c b/src/add-ons/accelerants/radeon/overlay.c index 3b068b92ef..dbc31fbaee 100644 --- a/src/add-ons/accelerants/radeon/overlay.c +++ b/src/add-ons/accelerants/radeon/overlay.c @@ -1066,46 +1066,46 @@ status_t Radeon_UpdateOverlay( virtual_card *vc = ai->vc; shared_info *si = ai->si; int crtc_idx; - + float brightness = 0.0f; float contrast = 1.0f; float saturation = 1.0f; float hue = 0.0f; - int32 ref = 0; - - SHOW_FLOW0( 3, "" ); + int32 ref = 0; - // don't mess around with overlay of someone else - if( !vc->uses_overlay ) - return B_OK; + SHOW_FLOW0( 3, "" ); + + // don't mess around with overlay of someone else + if ( !vc->uses_overlay ) + return B_OK; // make sure there really is an overlay - if( si->pending_overlay.on == NULL ) + if ( si->pending_overlay.on == NULL ) return B_OK; // verify that the overlay is still valid - if( (uint32)si->pending_overlay.ot != si->overlay_mgr.token ) + if ((uintptr_t)si->pending_overlay.ot != si->overlay_mgr.token ) return B_BAD_VALUE; - - if( vc->different_heads > 1 ) { + + if ( vc->different_heads > 1 ) { int area0, area1; // determine on which port most of the overlay is shown area0 = getIntersectArea( ai, &si->pending_overlay.ow, &si->crtc[0] ); area1 = getIntersectArea( ai, &si->pending_overlay.ow, &si->crtc[0] ); - + SHOW_FLOW( 3, "area0=%d, area1=%d", area0, area1 ); - - if( area0 >= area1 ) + + if (area0 >= area1 ) crtc_idx = 0; else crtc_idx = 1; - - } else if( vc->independant_heads > 1 ) { + + } else if ( vc->independant_heads > 1 ) { // both ports show the same, use "swap displays" to decide // where to show the overlay (to be improved as this flag isn't // really designed for that) - if( vc->swap_displays ) + if ( vc->swap_displays ) crtc_idx = 1; else crtc_idx = 0; diff --git a/src/add-ons/accelerants/radeon/overlay_management.c b/src/add-ons/accelerants/radeon/overlay_management.c index 6096532a8a..4fdb41f45b 100644 --- a/src/add-ons/accelerants/radeon/overlay_management.c +++ b/src/add-ons/accelerants/radeon/overlay_management.c @@ -336,29 +336,29 @@ status_t RELEASE_OVERLAY(overlay_token ot) // public function: show/hide overlay -status_t CONFIGURE_OVERLAY( overlay_token ot, const overlay_buffer *ob, +status_t CONFIGURE_OVERLAY( overlay_token ot, const overlay_buffer *ob, const overlay_window *ow, const overlay_view *ov ) { shared_info *si = ai->si; status_t result; - + SHOW_FLOW0( 4, "" ); - - if( (uint32)ot != si->overlay_mgr.token ) + + if ( (uintptr_t)ot != si->overlay_mgr.token ) return B_BAD_VALUE; - - if( !si->overlay_mgr.inuse ) + + if ( !si->overlay_mgr.inuse ) return B_BAD_VALUE; - - if( ow == NULL || ov == NULL ) { + + if ( ow == NULL || ov == NULL ) { SHOW_FLOW0( 3, "hide only" ); Radeon_HideOverlay( ai ); return B_OK; } - if( ob == NULL ) + if ( ob == NULL ) return B_ERROR; - + ACQUIRE_BEN( si->engine.lock ); // store whished values diff --git a/src/add-ons/accelerants/radeon/radeon_accelerant.h b/src/add-ons/accelerants/radeon/radeon_accelerant.h index d769019dfb..184858dc7f 100644 --- a/src/add-ons/accelerants/radeon/radeon_accelerant.h +++ b/src/add-ons/accelerants/radeon/radeon_accelerant.h @@ -53,8 +53,8 @@ typedef struct accelerator_info { // only mt_pci and mt_agp are filled directly, mt_nonlocal contains // a copy of either mt_pci or mt_agp, mt_local a copy of si->local_mem struct { - area_id area; // area of clone - char *data; // CPU address of area + area_id area; // area of clone + unsigned char *data; // CPU address of area } mapped_memory[mt_last+1]; int accelerant_is_clone; // true, if this is a cloned accelerant