From efcd9e820bd4f039abe756cb3597d738619a963c Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Mon, 5 Jan 2004 15:38:45 +0000 Subject: [PATCH] fixed several compiler warnings git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5912 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/matrox/InitAccelerant.c | 5 +---- src/add-ons/accelerants/matrox/ProposeDisplayMode.c | 5 ++--- src/add-ons/accelerants/matrox/SetDisplayMode.c | 6 +++--- src/add-ons/accelerants/matrox/be_driver_proto.h | 3 +++ src/add-ons/accelerants/matrox/engine/mga_acc.c | 6 +++--- src/add-ons/accelerants/matrox/engine/mga_bes.c | 4 ++-- src/add-ons/accelerants/matrox/engine/mga_info.c | 6 +++--- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/add-ons/accelerants/matrox/InitAccelerant.c b/src/add-ons/accelerants/matrox/InitAccelerant.c index 377e89aacb..8cce08a7d2 100644 --- a/src/add-ons/accelerants/matrox/InitAccelerant.c +++ b/src/add-ons/accelerants/matrox/InitAccelerant.c @@ -4,7 +4,7 @@ Other authors: Mark Watson, - Rudolf Cornelissen 10/2002-12/2003. + Rudolf Cornelissen 10/2002-1/2004. */ #define MODULE_BIT 0x00800000 @@ -13,9 +13,6 @@ #include #include "acc_std.h" -/* defined in ProposeDisplayMode.c */ -extern status_t create_mode_list(void); - static status_t init_common(int the_fd); /* Initialization code shared between primary and cloned accelerants */ diff --git a/src/add-ons/accelerants/matrox/ProposeDisplayMode.c b/src/add-ons/accelerants/matrox/ProposeDisplayMode.c index 5241bbaacd..2fa5bf4254 100644 --- a/src/add-ons/accelerants/matrox/ProposeDisplayMode.c +++ b/src/add-ons/accelerants/matrox/ProposeDisplayMode.c @@ -4,7 +4,7 @@ Other authors for MGA driver: Mark Watson, - Rudolf Cornelissen 9/2002-12/2003 + Rudolf Cornelissen 9/2002-1/2004 */ #define MODULE_BIT 0x00400000 @@ -340,7 +340,7 @@ status_t PROPOSE_DISPLAY_MODE(display_mode *target, const display_mode *low, con case DUALHEAD_SWITCH: if ((((si->ps.memory_size * 1024 * 1024) - pointer_reservation) >= (row_bytes * (target->virtual_height + vblank_fix))) && - ((row_bytes / bpp) >= (target->timing.h_display * 2))) + ((uint16)(row_bytes / bpp) >= (target->timing.h_display * 2))) { target->flags |= DUALHEAD_CAPABLE; } @@ -416,7 +416,6 @@ status_t GET_MODE_LIST(display_mode *dm) return B_OK; } - /* Create a list of display_modes to pass back to the caller.*/ status_t create_mode_list(void) { size_t max_size; diff --git a/src/add-ons/accelerants/matrox/SetDisplayMode.c b/src/add-ons/accelerants/matrox/SetDisplayMode.c index 2fa9078174..c588268606 100644 --- a/src/add-ons/accelerants/matrox/SetDisplayMode.c +++ b/src/add-ons/accelerants/matrox/SetDisplayMode.c @@ -5,7 +5,7 @@ Other authors: Mark Watson, Apsed, - Rudolf Cornelissen 11/2002-12/2003 + Rudolf Cornelissen 11/2002-1/2004 */ #define MODULE_BIT 0x00200000 @@ -88,7 +88,7 @@ status_t SET_DISPLAY_MODE(display_mode *mode_to_set) if (si->ps.secondary_head) g400_crtc2_dpms(false, false, false); /*where in framebuffer the screen is (should this be dependant on previous MOVEDISPLAY?)*/ - startadd = si->fbc.frame_buffer - si->framebuffer; + startadd = (uint8*)si->fbc.frame_buffer - (uint8*)si->framebuffer; /* calculate and set new mode bytes_per_row */ gx00_general_validate_pic_size (&target, &si->fbc.bytes_per_row, &si->acc_mode); @@ -488,7 +488,7 @@ status_t MOVE_DISPLAY(uint16 h_display_start, uint16 v_display_start) { //fixme: seperate both heads: we need a secondary si->fbc! startadd = v_display_start * si->fbc.bytes_per_row; startadd += h_display_start * (colour_depth >> 3); - startadd += si->fbc.frame_buffer - si->framebuffer; + startadd += (uint8*)si->fbc.frame_buffer - (uint8*)si->framebuffer; startadd_right = startadd + si->dm.timing.h_display * (colour_depth >> 3); /* account for switched CRTC's */ diff --git a/src/add-ons/accelerants/matrox/be_driver_proto.h b/src/add-ons/accelerants/matrox/be_driver_proto.h index c3dc1b9c2c..790e695e99 100644 --- a/src/add-ons/accelerants/matrox/be_driver_proto.h +++ b/src/add-ons/accelerants/matrox/be_driver_proto.h @@ -47,6 +47,7 @@ status_t SYNC_TO_TOKEN(sync_token *st); void SCREEN_TO_SCREEN_BLIT(engine_token *et, blit_params *list, uint32 count); void SCREEN_TO_SCREEN_TRANSPARENT_BLIT(engine_token *et, uint32 transparent_colour, blit_params *list, uint32 count); +void SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT(engine_token *et, scaled_blit_params *list, uint32 count); void FILL_RECTANGLE(engine_token *et, uint32 color, fill_rect_params *list, uint32 count); void INVERT_RECTANGLE(engine_token *et, fill_rect_params *list, uint32 count); @@ -63,4 +64,6 @@ overlay_token ALLOCATE_OVERLAY(void); status_t RELEASE_OVERLAY(overlay_token ot); status_t CONFIGURE_OVERLAY(overlay_token ot, const overlay_buffer *ob, const overlay_window *ow, const overlay_view *ov); +status_t create_mode_list(void); + #endif diff --git a/src/add-ons/accelerants/matrox/engine/mga_acc.c b/src/add-ons/accelerants/matrox/engine/mga_acc.c index 15b50d7783..06862c915c 100644 --- a/src/add-ons/accelerants/matrox/engine/mga_acc.c +++ b/src/add-ons/accelerants/matrox/engine/mga_acc.c @@ -1,7 +1,7 @@ /* MGA Acceleration functions */ /* Authors: Mark Watson 2/2000, - Rudolf Cornelissen 10/2002-11/2003. + Rudolf Cornelissen 10/2002-1/2004. */ #define MODULE_BIT 0x00080000 @@ -154,10 +154,10 @@ status_t gx00_acc_init() if (si->ps.card_type >= G200) { /*DSTORG - location of active screen in framebuffer*/ - ACCW(DSTORG,(si->fbc.frame_buffer)-(si->framebuffer)); + ACCW(DSTORG,((uint8*)si->fbc.frame_buffer) - ((uint8*)si->framebuffer)); /*SRCORG - init source address - same as dest*/ - ACCW(SRCORG,(si->fbc.frame_buffer)-(si->framebuffer)); + ACCW(SRCORG,((uint8*)si->fbc.frame_buffer) - ((uint8*)si->framebuffer)); } /* init YDSTORG - apsed, if not inited, BitBlts may fails on <= G200 */ diff --git a/src/add-ons/accelerants/matrox/engine/mga_bes.c b/src/add-ons/accelerants/matrox/engine/mga_bes.c index a0eef592ea..8f154646a2 100644 --- a/src/add-ons/accelerants/matrox/engine/mga_bes.c +++ b/src/add-ons/accelerants/matrox/engine/mga_bes.c @@ -1,5 +1,5 @@ /* G200-G550 Back End Scaler functions */ -/* Written by Rudolf Cornelissen 05/2002-04/2003 */ +/* Written by Rudolf Cornelissen 05/2002-1/2004 */ #define MODULE_BIT 0x00000200 @@ -631,7 +631,7 @@ status_t gx00_configure_bes * upto 360Mhz. So snooze about 4uS to prevent bus-congestion... * Appr. 200 lines time will provide enough room even on a 100Mhz CPU if it's * screen is set to the highest refreshrate/resolution possible. */ - while (CR1R(VCOUNT) > (si->dm.timing.v_total - 200)) snooze(4); + while ((uint16)CR1R(VCOUNT) > (si->dm.timing.v_total - 200)) snooze(4); /************************************** diff --git a/src/add-ons/accelerants/matrox/engine/mga_info.c b/src/add-ons/accelerants/matrox/engine/mga_info.c index 95b0bf1847..0ea0cdbd8e 100644 --- a/src/add-ons/accelerants/matrox/engine/mga_info.c +++ b/src/add-ons/accelerants/matrox/engine/mga_info.c @@ -2,7 +2,7 @@ /* some bits are hacks, where PINS is not known */ /* Authors: Mark Watson 2/2000, - Rudolf Cornelissen 10/2002-4/2003 + Rudolf Cornelissen 10/2002-1/2004 */ #define MODULE_BIT 0x00002000 @@ -151,9 +151,9 @@ status_t pins1_read(uint8 *pins, uint8 length) si->ps.max_dac1_clock_32 = pins[22];//ramdac si->ps.max_pixel_vco = (pins[25] << 8) | pins[24];//PCLK si->ps.std_engine_clock = (pins[29] << 8) | pins[28]; - if (((pins[31] << 8) | pins[30]) < si->ps.std_engine_clock) + if ((uint32)((pins[31] << 8) | pins[30]) < si->ps.std_engine_clock) si->ps.std_engine_clock = (pins[31] << 8) | pins[30]; - if (((pins[33] << 8) | pins[32]) < si->ps.std_engine_clock) + if ((uint32)((pins[33] << 8) | pins[32]) < si->ps.std_engine_clock) si->ps.std_engine_clock = (pins[33] << 8) | pins[32]; //temp. test to see some vals..