diff options
| author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-01 12:52:25 +0000 |
|---|---|---|
| committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-01 12:52:25 +0000 |
| commit | 7d397d5961413f5da3ff259688c13bd7517c0ef9 (patch) | |
| tree | 2e6003e29caa0c0cbc2cc1eb865e48e5a65c7f72 /vidix | |
| parent | dc8e3766c27278dd76ba49202b05a584ee1d895f (diff) | |
| download | mpv-7d397d5961413f5da3ff259688c13bd7517c0ef9.tar.bz2 mpv-7d397d5961413f5da3ff259688c13bd7517c0ef9.tar.xz | |
killed warnings in sis driver
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22885 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/sis_bridge.c | 21 | ||||
| -rw-r--r-- | vidix/sis_defs.h | 4 | ||||
| -rw-r--r-- | vidix/sis_vid.c | 4 |
3 files changed, 4 insertions, 25 deletions
diff --git a/vidix/sis_bridge.c b/vidix/sis_bridge.c index 5ff0a5991c..01a20002e3 100644 --- a/vidix/sis_bridge.c +++ b/vidix/sis_bridge.c @@ -70,7 +70,6 @@ static void sis_sense_30x(void) 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_crt1(void) } } - -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; diff --git a/vidix/sis_defs.h b/vidix/sis_defs.h index 3a20195026..63808c94f5 100644 --- a/vidix/sis_defs.h +++ b/vidix/sis_defs.h @@ -98,9 +98,9 @@ extern unsigned short sis_iobase; 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 */ diff --git a/vidix/sis_vid.c b/vidix/sis_vid.c index 1a24624113..40f6ebd859 100644 --- a/vidix/sis_vid.c +++ b/vidix/sis_vid.c @@ -117,10 +117,10 @@ static unsigned int sis_shift_value = 1; 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; |