Radeon: fix warnings on 64bit.
This commit is contained in:
@@ -138,12 +138,9 @@ typedef enum
|
||||
connector_dvi_d,
|
||||
connector_ctv,
|
||||
connector_stv,
|
||||
connector_unsupported
|
||||
} radeon_connector_type;
|
||||
connector_unsupported,
|
||||
|
||||
typedef enum
|
||||
{
|
||||
connector_none_atom,
|
||||
connector_none_atom = 0,
|
||||
connector_vga_atom,
|
||||
connector_dvi_i_atom,
|
||||
connector_dvi_d_atom,
|
||||
@@ -153,7 +150,7 @@ typedef enum
|
||||
connector_lvds_atom,
|
||||
connector_digital_atom,
|
||||
connector_unsupported_atom
|
||||
} radeon_connector_type_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;
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
|
||||
#include <GraphicsDefs.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
|
||||
status_t
|
||||
GET_DISPLAY_MODE(display_mode *mode)
|
||||
|
||||
@@ -1076,18 +1076,18 @@ status_t Radeon_UpdateOverlay(
|
||||
SHOW_FLOW0( 3, "" );
|
||||
|
||||
// don't mess around with overlay of someone else
|
||||
if( !vc->uses_overlay )
|
||||
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
|
||||
@@ -1096,16 +1096,16 @@ status_t Radeon_UpdateOverlay(
|
||||
|
||||
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;
|
||||
|
||||
@@ -344,19 +344,19 @@ status_t CONFIGURE_OVERLAY( overlay_token ot, const overlay_buffer *ob,
|
||||
|
||||
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 );
|
||||
|
||||
@@ -54,7 +54,7 @@ typedef struct accelerator_info {
|
||||
// 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
|
||||
unsigned char *data; // CPU address of area
|
||||
} mapped_memory[mt_last+1];
|
||||
|
||||
int accelerant_is_clone; // true, if this is a cloned accelerant
|
||||
|
||||
Reference in New Issue
Block a user