mplayer.hg: vidix/sis_bridge.c comparison

comparison vidix/sis_bridge.c @ 37107:3c5c93a30fb7

vidix: Replace printf with mp_msg - Make MPlayer more quiet when requested (e.g. when using -really-quiet) - Additionally change some minor capitalization and "bla:" to "[bla]" Patch-by: Arne Bochem >arneb.mp ccan de< Patch-also-OKed-by: Reimar

author	al
date	Sat, 17 May 2014 01:38:00 +0000
parents	36818ea5ce95
children

comparison

equal deleted inserted replaced

-:1b9907dfe2f4
+:3c5c93a30fb7
 #include "dha.h"
 #include "sis_bridge.h"
 #include "sis_regs.h"
 #include "sis_defs.h"
+#include "mp_msg.h"
 static void sis_ddc2_delay(unsigned short delaytime)
 {
 unsigned short i;
 		break;
 	}
 	if (result) {
 	    if (biosflag & 0x01) {
 		if (sis_verbose > 1) {
-		    printf
+		    mp_msg(MSGT_VO, MSGL_STATUS,
-			("[SiS] SiS30x: Detected TV connected to SCART output\n");
+			"[SiS] SiS30x: Detected TV connected to SCART output\n");
 		}
 		sis_vbflags |= TV_SCART;
 		orSISIDXREG(SISCR, 0x32, 0x04);
 		/*pSiS->postVBCR32 |= 0x04; */
 	    } else {
 		if (sis_verbose > 1) {
-		    printf
+		    mp_msg(MSGT_VO, MSGL_STATUS,
-			("[SiS] SiS30x: Detected secondary VGA connection\n");
+			"[SiS] SiS30x: Detected secondary VGA connection\n");
 		}
 		sis_vbflags |= VGA2_CONNECTED;
 		orSISIDXREG(SISCR, 0x32, 0x10);
 		/*pSiS->postVBCR32 |= 0x10; */
 	    }
 	if ((result == 0) || (result >= 2))
 	    break;
 }
 if (result) {
 	if (sis_verbose > 1) {
-	    printf
+	    mp_msg(MSGT_VO, MSGL_STATUS,
-		("[SiS] SiS30x: Detected TV connected to SVIDEO output\n");
+		"[SiS] SiS30x: Detected TV connected to SVIDEO output\n");
 	}
 	/* TW: So we can be sure that there IS a SVIDEO output */
 	sis_vbflags |= TV_SVIDEO;
 	orSISIDXREG(SISCR, 0x32, 0x02);
 	//pSiS->postVBCR32 |= 0x02;
 	    if ((result == 0) || (result >= 2))
 		break;
 	}
 	if (result) {
 	    if (sis_verbose > 1) {
-		printf
+		mp_msg(MSGT_VO, MSGL_STATUS,
-		    ("[SiS] SiS30x: Detected TV connected to COMPOSITE output\n");
+		    "[SiS] SiS30x: Detected TV connected to COMPOSITE output\n");
 	    }
 	    sis_vbflags |= TV_AVIDEO;
 	    orSISIDXREG(SISCR, 0x32, 0x01);
 	    //pSiS->postVBCR32 |= 0x01;
 	}
 	    /* BIOS detected CRT1, leave/switch it on */
 	    sis_crt1_off = 0;
 	}
 }
 if (sis_verbose > 0) {
-	printf("[SiS] %sCRT1 connection detected\n",
+	mp_msg(MSGT_VO, MSGL_STATUS, "[SiS] %sCRT1 connection detected\n",
 	       sis_crt1_off ? "No " : "");
 }
 }
 static void sis_detect_tv(void)
 if (sis_vbflags &
 	(TV_SCART | TV_SVIDEO | TV_AVIDEO | TV_HIVISION | TV_CHSCART |
 	 TV_CHHDTV)) {
 	if (sis_verbose > 0) {
-	    printf("[SiS] %sTV standard %s\n",
+	    mp_msg(MSGT_VO, MSGL_STATUS, "[SiS] %sTV standard %s\n",
 		   (sis_vbflags & (TV_CHSCART | TV_CHHDTV)) ? "Using " :
 		   "Detected default ",
 		   (sis_vbflags & TV_NTSC) ? ((sis_vbflags & TV_CHHDTV) ?
 					      "480i HDTV" : "NTSC")
 		   : ((sis_vbflags & TV_PALM) ? "PALM"
 	temp1 &= 0xff;
 	if (temp1 >= 0xE0) {
 	    sis_vbflags |= VB_302LV;
 	    //pSiS->sishw_ext.ujVBChipID = VB_CHIP_302LV;
 	    if (sis_verbose > 1) {
-		printf
+		mp_msg(MSGT_VO, MSGL_STATUS,
-		    ("[SiS] Detected SiS302LV video bridge (ID 1; Revision 0x%x)\n",
+		    "[SiS] Detected SiS302LV video bridge (ID 1; Revision 0x%x)\n",
 		     temp1);
 	    }
 	} else if (temp1 >= 0xD0) {
 	    sis_vbflags |= VB_301LV;
 	    //pSiS->sishw_ext.ujVBChipID = VB_CHIP_301LV;
 	    if (sis_verbose > 1) {
-		printf
+		mp_msg(MSGT_VO, MSGL_STATUS,
-		    ("[SiS] Detected SiS301LV video bridge (ID 1; Revision 0x%x)\n",
+		    "[SiS] Detected SiS301LV video bridge (ID 1; Revision 0x%x)\n",
 		     temp1);
 	    }
 	} else if (temp1 >= 0xB0) {
 	    sis_vbflags |= VB_301B;
 	    //pSiS->sishw_ext.ujVBChipID = VB_CHIP_301B;
 	    inSISIDXREG(SISPART4, 0x23, temp2);
 	    if (!(temp2 & 0x02))
 		sis_vbflags |= VB_30xBDH;
 	    if (sis_verbose > 1) {
-		printf
+		mp_msg(MSGT_VO, MSGL_STATUS,
-		    ("[SiS] Detected SiS301B%s video bridge (Revision 0x%x)\n",
+		    "[SiS] Detected SiS301B%s video bridge (Revision 0x%x)\n",
 		     (temp2 & 0x02) ? "" : " (DH)", temp1);
 	    }
 	} else {
 	    sis_vbflags |= VB_301;
 	    //pSiS->sishw_ext.ujVBChipID = VB_CHIP_301;
 	    if (sis_verbose > 1) {
-		printf
+		mp_msg(MSGT_VO, MSGL_STATUS,
-		    ("[SiS] Detected SiS301 video bridge (Revision 0x%x)\n",
+		    "[SiS] Detected SiS301 video bridge (Revision 0x%x)\n",
 		     temp1);
 	    }
 	}
 	sis_sense_30x();
 	temp1 &= 0xff;
 	if (temp1 >= 0xE0) {
 	    sis_vbflags |= VB_302LV;
 	    //pSiS->sishw_ext.ujVBChipID = VB_CHIP_302LV;
 	    if (sis_verbose > 1) {
-		printf
+		mp_msg(MSGT_VO, MSGL_STATUS,
-		    ("[SiS] Detected SiS302LV video bridge (ID 2; Revision 0x%x)\n",
+		    "[SiS] Detected SiS302LV video bridge (ID 2; Revision 0x%x)\n",
 		     temp1);
 	    }
 	} else if (temp1 >= 0xD0) {
 	    sis_vbflags |= VB_301LV;
 	    //pSiS->sishw_ext.ujVBChipID = VB_CHIP_301LV;
 	    if (sis_verbose > 1) {
-		printf
+		mp_msg(MSGT_VO, MSGL_STATUS,
-		    ("[SiS] Detected SiS301LV video bridge (ID 2; Revision 0x%x)\n",
+		    "[SiS] Detected SiS301LV video bridge (ID 2; Revision 0x%x)\n",
 		     temp1);
 	    }
 	} else {
 	    sis_vbflags |= VB_302B;
 	    //pSiS->sishw_ext.ujVBChipID = VB_CHIP_302B;
 	    inSISIDXREG(SISPART4, 0x23, temp2);
 	    if (!(temp & 0x02))
 		sis_vbflags |= VB_30xBDH;
 	    if (sis_verbose > 1) {
-		printf
+		mp_msg(MSGT_VO, MSGL_STATUS,
-		    ("[SiS] Detected SiS302B%s video bridge (Revision 0x%x)\n",
+		    "[SiS] Detected SiS302B%s video bridge (Revision 0x%x)\n",
 		     (temp2 & 0x02) ? "" : " (DH)", temp1);
 	    }
 	}
 	sis_sense_30x();
 } else if (temp == 3) {
 	if (sis_verbose > 1) {
-	    printf("[SiS] Detected SiS303 video bridge - not supported\n");
+	    mp_msg(MSGT_VO, MSGL_STATUS, "[SiS] Detected SiS303 video bridge - not supported\n");
 	}
 } else {
 	/* big scary mess of code to handle unknown or Chrontel LVDS */
 	/* skipping it for now */
 	if (sis_verbose > 1) {
-	    printf
+	    mp_msg(MSGT_VO, MSGL_STATUS,
-		("[SiS] Detected Chrontel video bridge - not supported\n");
+		"[SiS] Detected Chrontel video bridge - not supported\n");
 	}
 }
 /* this is probably not relevant to video overlay driver... */
 /* detects if brdige uses LCDA for low res text modes */
 			    }
 			}
 		    }
 		}
 	    if (sis_vbflags & VB_USELCDA) {
-		/* printf("Bridge uses LCDA for low resolution and text modes\n"); */
+		/* mp_msg(MSGT_VO, MSGL_STATUS, "[SiS] Bridge uses LCDA for low resolution and text modes\n"); */
 	    }
 	}
 }
 	    )
 	    sis_vbflags = sis_vbflags | CRT2_LCD;
 	else {
 	    sis_vbflags = sis_vbflags & ~(CRT2_LCD);
 	    if (sis_verbose > 0) {
-		printf
+		mp_msg(MSGT_VO, MSGL_STATUS,
-		    ("[SiS] Can't force CRT2 to LCD, no panel detected\n");
+		    "[SiS] Can't force CRT2 to LCD, no panel detected\n");
 	    }
 	}
 	break;
 case CRT2_VGA:
 	if (sis_vbflags & VB_LVDS) {
 	    if (sis_verbose > 0) {
-		printf("[SiS] LVDS does not support secondary VGA\n");
+		mp_msg(MSGT_VO, MSGL_STATUS, "[SiS] LVDS does not support secondary VGA\n");
 	    }
 	    break;
 	}
 	if (sis_vbflags & (VB_301LV | VB_302LV)) {
 	    if (sis_verbose > 0) {
-		printf
+		mp_msg(MSGT_VO, MSGL_STATUS,
-		    ("[SiS] SiS30xLV bridge does not support secondary VGA\n");
+		    "[SiS] SiS30xLV bridge does not support secondary VGA\n");
 	    }
 	    break;
 	}
 	sis_vbflags = sis_vbflags & ~(CRT2_TV | CRT2_LCD);
 	if (sis_vbflags & VB_VIDEOBRIDGE)
 } else {			/* TW: CRT1 only ------------------------------- */
 	sis_vbflags |= (VB_DISPMODE_SINGLE | DISPTYPE_CRT1);
 }
 if (sis_verbose > 0) {
-	printf("[SiS] Using hardware overlay on CRT%d\n",
+	mp_msg(MSGT_VO, MSGL_STATUS, "[SiS] Using hardware overlay on CRT%d\n",
 	       sis_overlay_on_crt1 ? 1 : 2);
 }
 }

Mercurial > mplayer.hg

comparison vidix/sis_bridge.c @ 37107:3c5c93a30fb7