[MPlayer-cvslog] r22885 - in trunk/vidix: sis_bridge.c sis_defs.h sis_vid.c

[ben]

Author: ben
Date: Sun Apr  1 14:52:25 2007
New Revision: 22885

Modified:
   trunk/vidix/sis_bridge.c
   trunk/vidix/sis_defs.h
   trunk/vidix/sis_vid.c

Log:
killed warnings in sis driver

Modified: trunk/vidix/sis_bridge.c
==============================================================================
--- trunk/vidix/sis_bridge.c	(original)
+++ trunk/vidix/sis_bridge.c	Sun Apr  1 14:52:25 2007
@@ -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;

Modified: trunk/vidix/sis_defs.h
==============================================================================
--- trunk/vidix/sis_defs.h	(original)
+++ trunk/vidix/sis_defs.h	Sun Apr  1 14:52:25 2007
@@ -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 */

Modified: trunk/vidix/sis_vid.c
==============================================================================
--- trunk/vidix/sis_vid.c	(original)
+++ trunk/vidix/sis_vid.c	Sun Apr  1 14:52:25 2007
@@ -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;