mplayer.hg: vidix/mach64_vid.c comparison

comparison vidix/mach64_vid.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	945eab072c9d
children

comparison

equal deleted inserted replaced

-:1b9907dfe2f4
+:3c5c93a30fb7
 #include "vidix.h"
 #include "fourcc.h"
 #include "dha.h"
 #include "pci_ids.h"
 #include "pci_names.h"
+#include "mp_msg.h"
 #include "mach64.h"
 #define UNUSED(x) ((void)(x)) /**< Removes warning about unused arguments */
 int ext_vert_stretch;
 int ret;
 int yres= mach64_get_yres();
 if(!supports_lcd_v_stretch){
-if(verbosity > 0) printf("[mach64] vertical stretching not supported\n");
+if(verbosity > 0) mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] vertical stretching not supported\n");
 return 1<<16;
 }
 lcd_index= INREG(LCD_INDEX);
 //    lcd_gen_ctrl = ATIGetMach64LCDReg(LCD_GEN_CNTL);
 OUTREG(LCD_INDEX, lcd_index);
-if(verbosity > 0) printf("[mach64] vertical stretching factor= %d\n", ret);
+if(verbosity > 0) mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] vertical stretching factor= %d\n", ret);
 return ret;
 }
 static void mach64_vid_make_default(void)
 }
 static void mach64_vid_dump_regs( void )
 {
 size_t i;
-printf("[mach64] *** Begin of DRIVER variables dump ***\n");
+mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] *** Begin of DRIVER variables dump ***\n");
-printf("[mach64] mach64_mmio_base=%p\n",mach64_mmio_base);
+mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] mach64_mmio_base=%p\n",mach64_mmio_base);
-printf("[mach64] mach64_mem_base=%p\n",mach64_mem_base);
+mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] mach64_mem_base=%p\n",mach64_mem_base);
-printf("[mach64] mach64_overlay_off=%08X\n",mach64_overlay_offset);
+mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] mach64_overlay_off=%08X\n",mach64_overlay_offset);
-printf("[mach64] mach64_ram_size=%08X\n",mach64_ram_size);
+mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] mach64_ram_size=%08X\n",mach64_ram_size);
-printf("[mach64] video mode: %ux%u@%u\n",mach64_get_xres(),mach64_get_yres(),mach64_vid_get_dbpp());
+mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] video mode: %ux%u@%u\n",mach64_get_xres(),mach64_get_yres(),mach64_vid_get_dbpp());
-printf("[mach64] *** Begin of OV0 registers dump ***\n");
+mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] *** Begin of OV0 registers dump ***\n");
 for(i=0;i<sizeof(vregs)/sizeof(video_registers_t);i++)
 {
 	mach64_wait_for_idle();
-	printf("[mach64] %s = %08X\n",vregs[i].sname,INREG(vregs[i].name));
+	mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] %s = %08X\n",vregs[i].sname,INREG(vregs[i].name));
 }
-printf("[mach64] *** End of OV0 registers dump ***\n");
+mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] *** End of OV0 registers dump ***\n");
 }
 static unsigned short ati_card_ids[] =
 {
 int err;
 verbosity = verbose;
 err = pci_scan(lst,&num_pci);
 if(err)
 {
-printf("[mach64] Error occurred during pci scan: %s\n",strerror(err));
+mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] Error occurred during pci scan: %s\n",strerror(err));
 return err;
 }
 else
 {
 err = ENXIO;
 	const char *dname;
 	idx = find_chip(lst[i].device);
 	if(idx == -1 && force == PROBE_NORMAL) continue;
 	dname = pci_device_name(VENDOR_ATI,lst[i].device);
 	dname = dname ? dname : "Unknown chip";
-	printf("[mach64] Found chip: %s\n",dname);
+	mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] Found chip: %s\n",dname);
 #if 0
 	if ((lst[i].command & PCI_COMMAND_IO) == 0)
 	{
-		printf("[mach64] Device is disabled, ignoring\n");
+		mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] Device is disabled, ignoring\n");
 		continue;
 	}
 #endif
 	if(force > PROBE_NORMAL)
 	{
-	    printf("[mach64] Driver was forced. Was found %sknown chip\n",idx == -1 ? "un" : "");
+	    mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] Driver was forced. Was found %sknown chip\n",idx == -1 ? "un" : "");
 	    if(idx == -1)
-		printf("[mach64] Assuming it as Mach64\n");
+		mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] Assuming it as Mach64\n");
 	}
 	mach64_cap.device_id = lst[i].device;
 	err = 0;
 	memcpy(&pci_info,&lst[i],sizeof(pciinfo_t));
 	probed=1;
 	break;
 }
 }
 }
-if(err && verbose) printf("[mach64] Can't find chip\n");
+if(err && verbose) mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] Can't find chip\n");
 return err;
 }
 static void reset_regs( void )
 {
 static int mach64_init(void)
 {
 int err;
 if(!probed)
 {
-printf("[mach64] Driver was not probed but is being initializing\n");
+mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] Driver was not probed but is being initializing\n");
 return EINTR;
 }
 if((mach64_mmio_base = map_phys_mem(pci_info.base2,0x1000))==(void *)-1) return ENOMEM;
 mach64_wait_for_idle();
 else if (mach64_ram_size < 12) mach64_ram_size = (mach64_ram_size - 3) * 1024;
 else mach64_ram_size = (mach64_ram_size - 7) * 2048;
 mach64_ram_size *= 0x400; /* KB -> bytes */
 if((mach64_mem_base = map_phys_mem(pci_info.base0,mach64_ram_size))==(void *)-1) return ENOMEM;
 memset(&besr,0,sizeof(bes_registers_t));
-printf("[mach64] Video memory = %uMb\n",mach64_ram_size/0x100000);
+mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] Video memory = %uMb\n",mach64_ram_size/0x100000);
 err = mtrr_set_type(pci_info.base0,mach64_ram_size,MTRR_TYPE_WRCOMB);
-if(!err) printf("[mach64] Set write-combining type of video memory\n");
+if(!err) mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] Set write-combining type of video memory\n");
 /* save this */
 mach64_wait_for_idle();
 SAVED_OVERLAY_GRAPHICS_KEY_CLR = INREG(OVERLAY_GRAPHICS_KEY_CLR);
 	mach64_wait_for_idle();
 	mach64_fifo_wait(2);
 	if(INREG(SCALER_BUF0_OFFSET_U)) 	supports_planar=1;
 }
-if(supports_planar)	printf("[mach64] Planar YUV formats are supported :)\n");
+if(supports_planar)	mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] Planar YUV formats are supported :)\n");
-else			printf("[mach64] Planar YUV formats are not supported :(\n");
+else			mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] Planar YUV formats are not supported :(\n");
 if(   mach64_cap.device_id==DEVICE_ATI_RAGE_MOBILITY_P_M
 || mach64_cap.device_id==DEVICE_ATI_RAGE_MOBILITY_P_M2
 || mach64_cap.device_id==DEVICE_ATI_RAGE_MOBILITY_L
 || mach64_cap.device_id==DEVICE_ATI_RAGE_MOBILITY_L2)
 dest_w = config->dest.w;
 dest_h = config->dest.h;
 besr.fourcc = config->fourcc;
 ecp = (INPLL(PLL_VCLK_CNTL) & PLL_ECP_DIV) >> 4;
-if(verbosity > 0) printf("[mach64] ecp: %d\n", ecp);
+if(verbosity > 0) mp_msg(MSGT_VO, MSGL_STATUS, "[mach64] ecp: %d\n", ecp);
 v_inc = src_h * mach64_get_vert_stretch();
 if(mach64_is_interlace()) v_inc<<=1;
 if(mach64_is_dbl_scan() ) v_inc>>=1;
 v_inc>>=4; // convert 16.16 -> 20.12
 static int mach64_frame_sel(unsigned int frame)
 {
 uint32_t off[6];
 int i;
 int last_frame= (frame-1+num_mach64_buffers) % num_mach64_buffers;
-//printf("Selecting frame %d\n", frame);
+//mp_msg(MSGT_VO, MSGL_STATUS, "Selecting frame %d\n", frame);
 /*
 buf3-5 always should point onto second buffer for better
 deinterlacing and TV-in
 */
 if(num_mach64_buffers==1) return 0;

Mercurial > mplayer.hg

comparison vidix/mach64_vid.c @ 37107:3c5c93a30fb7