i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Radeon: fix warnings on 64bit.

Browse Source
This commit is contained in:
Adrien Destugues
2014-10-19 12:51:53 +00:00
parent dc234e798d
commit b10790de44
5 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/graphics/radeon/radeon_interface.h
+4 -7
View File
@@ -138,12 +138,9 @@ typedef enum
connector_dvi_d, connector_dvi_d,
connector_ctv, connector_ctv,
connector_stv, connector_stv,
connector_unsupported connector_unsupported,
} radeon_connector_type;
typedef enum connector_none_atom = 0,
{
connector_none_atom,
connector_vga_atom, connector_vga_atom,
connector_dvi_i_atom, connector_dvi_i_atom,
connector_dvi_d_atom, connector_dvi_d_atom,
@@ -153,7 +150,7 @@ typedef enum
connector_lvds_atom, connector_lvds_atom,
connector_digital_atom, connector_digital_atom,
connector_unsupported_atom connector_unsupported_atom
} radeon_connector_type_atom; } radeon_connector_type;
typedef enum typedef enum
{ {
@@ -431,7 +428,7 @@ typedef struct {
typedef struct { typedef struct {
int32 inuse; // one, if someone allocated overlay head int32 inuse; // one, if someone allocated overlay head
// (this doesn't necessarily mean that an overlay is shown) // (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) // (increased by 1 whenever there is a new owner)
uint32 auto_flip_reg; // content of auto_flip_reg uint32 auto_flip_reg; // content of auto_flip_reg
} overlay_mgr_info; } overlay_mgr_info;
src/add-ons/accelerants/radeon/GetModeInfo.c
+2
View File
@@ -12,6 +12,8 @@
#include <GraphicsDefs.h> #include <GraphicsDefs.h>
#include <string.h>
status_t status_t
GET_DISPLAY_MODE(display_mode *mode) GET_DISPLAY_MODE(display_mode *mode)
src/add-ons/accelerants/radeon/overlay.c
+1 -1
View File
@@ -1084,7 +1084,7 @@ status_t Radeon_UpdateOverlay(
return B_OK; return B_OK;
// verify that the overlay is still valid // 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; return B_BAD_VALUE;
if ( vc->different_heads > 1 ) { if ( vc->different_heads > 1 ) {
src/add-ons/accelerants/radeon/overlay_management.c
+1 -1
View File
@@ -344,7 +344,7 @@ status_t CONFIGURE_OVERLAY( overlay_token ot, const overlay_buffer *ob,
SHOW_FLOW0( 4, "" ); SHOW_FLOW0( 4, "" );
if( (uint32)ot != si->overlay_mgr.token ) if ( (uintptr_t)ot != si->overlay_mgr.token )
return B_BAD_VALUE; return B_BAD_VALUE;
if ( !si->overlay_mgr.inuse ) if ( !si->overlay_mgr.inuse )
src/add-ons/accelerants/radeon/radeon_accelerant.h
+1 -1
View File
@@ -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 // a copy of either mt_pci or mt_agp, mt_local a copy of si->local_mem
struct { struct {
area_id area; // area of clone area_id area; // area of clone
char *data; // CPU address of area unsigned char *data; // CPU address of area
} mapped_memory[mt_last+1]; } mapped_memory[mt_last+1];
int accelerant_is_clone; // true, if this is a cloned accelerant int accelerant_is_clone; // true, if this is a cloned accelerant