Mercurial > mplayer.hg
changeset 22867:d76307ffcb77
killed warnings in sis driver
author | ben |
---|---|
date | Sun, 01 Apr 2007 12:52:25 +0000 |
parents | 234c5f92d585 |
children | 3657ff134131 |
files | vidix/sis_bridge.c vidix/sis_defs.h vidix/sis_vid.c |
diffstat | 3 files changed, 4 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/vidix/sis_bridge.c Sun Apr 01 12:48:32 2007 +0000 +++ b/vidix/sis_bridge.c Sun Apr 01 12:52:25 2007 +0000 @@ -70,7 +70,6 @@ unsigned char testvga2_tempbl, testvga2_tempbh; unsigned char testvga2_tempcl, testvga2_tempch; int myflag, result = 0, i, j, haveresult; - unsigned short temp; inSISIDXREG(SISPART4, 0x0d, backupP4_0d); outSISIDXREG(SISPART4, 0x0d, (backupP4_0d | 0x04)); @@ -393,26 +392,6 @@ } } - -static void sis_detect_lcd(void) -{ - unsigned char CR32, CR36, CR37; - - if (!(sis_vbflags & VB_VIDEOBRIDGE)) { - return; - } - - inSISIDXREG(SISCR, 0x32, CR32); - - if (CR32 & 0x08) - sis_vbflags |= CRT2_LCD; - - /* DDC detection of LCD - not supported yet */ - - /* Get other misc info about LCD - not supported */ -} - - static void sis_detect_tv(void) { unsigned char SR16, SR38, CR32, CR38 = 0, CR79;
--- a/vidix/sis_defs.h Sun Apr 01 12:48:32 2007 +0000 +++ b/vidix/sis_defs.h Sun Apr 01 12:52:25 2007 +0000 @@ -98,9 +98,9 @@ extern unsigned int sis_vga_engine; extern unsigned int sis_vbflags; extern unsigned int sis_overlay_on_crt1; -extern unsigned int sis_crt1_off; +extern int sis_crt1_off; extern unsigned int sis_detected_crt2_devices; extern unsigned int sis_force_crt2_type; -extern unsigned int sis_device_id; +extern int sis_device_id; #endif /* VIDIX_SIS_DEFS_H */
--- a/vidix/sis_vid.c Sun Apr 01 12:48:32 2007 +0000 +++ b/vidix/sis_vid.c Sun Apr 01 12:52:25 2007 +0000 @@ -117,10 +117,10 @@ static unsigned int sis_vmode = 0; unsigned int sis_vbflags = DISPTYPE_DISP1; unsigned int sis_overlay_on_crt1 = 1; -unsigned int sis_crt1_off = -1; +int sis_crt1_off = -1; unsigned int sis_detected_crt2_devices; unsigned int sis_force_crt2_type = CRT2_DEFAULT; -unsigned int sis_device_id = -1; +int sis_device_id = -1; static int sis_format; static int sis_Yoff = 0;