[MPlayer-cvslog] r25887 - in trunk/vidix: mach64_vid.c radeon_vid.c

[diego]

Author: diego
Date: Sun Jan 27 18:32:26 2008
New Revision: 25887

Log:
Fix illegal identifiers, names starting with __ are reserved for the system.


Modified:
   trunk/vidix/mach64_vid.c
   trunk/vidix/radeon_vid.c

Modified: trunk/vidix/mach64_vid.c
==============================================================================
--- trunk/vidix/mach64_vid.c	(original)
+++ trunk/vidix/mach64_vid.c	Sun Jan 27 18:32:26 2008
@@ -55,7 +55,7 @@ static int supports_lcd_v_stretch=0;
 
 static pciinfo_t pci_info;
 static int probed = 0;
-static int __verbose = 0;
+static int verbosity = 0;
 
 #define VERBOSE_LEVEL 1
 
@@ -292,7 +292,7 @@ static int mach64_get_vert_stretch(void)
     int yres= mach64_get_yres();
 
     if(!supports_lcd_v_stretch){
-        if(__verbose>0) printf("[mach64] vertical stretching not supported\n");
+        if(verbosity > 0) printf("[mach64] vertical stretching not supported\n");
         return 1<<16;
     }
 
@@ -315,7 +315,7 @@ static int mach64_get_vert_stretch(void)
     
     OUTREG(LCD_INDEX, lcd_index);
     
-    if(__verbose>0) printf("[mach64] vertical stretching factor= %d\n", ret);
+    if(verbosity > 0) printf("[mach64] vertical stretching factor= %d\n", ret);
     
     return ret;
 }
@@ -411,7 +411,7 @@ static int mach64_probe(int verbose,int 
   pciinfo_t lst[MAX_PCI_DEVICES];
   unsigned i,num_pci;
   int err;
-  __verbose = verbose;
+  verbosity = verbose;
   err = pci_scan(lst,&num_pci);
   if(err)
   {
@@ -476,7 +476,7 @@ static int mach64_init(void)
     printf("[mach64] Driver was not probed but is being initializing\n");
     return EINTR;
   }
-  if(__verbose>0) printf("[mach64] version %d\n", VIDIX_VERSION);
+  if(verbosity > 0) printf("[mach64] version %d\n", VIDIX_VERSION);
   
   if((mach64_mmio_base = map_phys_mem(pci_info.base2,0x1000))==(void *)-1) return ENOMEM;
   mach64_wait_for_idle();
@@ -524,7 +524,7 @@ static int mach64_init(void)
   reset_regs();
   mach64_vid_make_default();
 
-  if(__verbose > VERBOSE_LEVEL) mach64_vid_dump_regs();
+  if(verbosity > VERBOSE_LEVEL) mach64_vid_dump_regs();
   return 0;
 }
 
@@ -715,7 +715,7 @@ static void mach64_vid_display_video( vo
 	case IMGFMT_YUY2:
 	default:           OUTREG(VIDEO_FORMAT, 0x000B0000); break;
     }
-    if(__verbose > VERBOSE_LEVEL) mach64_vid_dump_regs();
+    if(verbosity > VERBOSE_LEVEL) mach64_vid_dump_regs();
 }
 
 static int mach64_vid_init_video( vidix_playback_t *config )
@@ -771,7 +771,7 @@ static int mach64_vid_init_video( vidix_
     besr.fourcc = config->fourcc;
     ecp = (INPLL(PLL_VCLK_CNTL) & PLL_ECP_DIV) >> 4;
 
-    if(__verbose>0) printf("[mach64] ecp: %d\n", ecp);
+    if(verbosity > 0) printf("[mach64] ecp: %d\n", ecp);
     v_inc = src_h * mach64_get_vert_stretch();
     
     if(mach64_is_interlace()) v_inc<<=1;
@@ -950,7 +950,7 @@ static int mach64_frame_sel(unsigned int
     OUTREG(SCALER_BUF1_OFFSET_V,	off[5]);
     if(num_mach64_buffers==2) mach64_wait_vsync(); //only wait for vsync if we do double buffering
        
-    if(__verbose > VERBOSE_LEVEL) mach64_vid_dump_regs();
+    if(verbosity > VERBOSE_LEVEL) mach64_vid_dump_regs();
     return 0;
 }
 

Modified: trunk/vidix/radeon_vid.c
==============================================================================
--- trunk/vidix/radeon_vid.c	(original)
+++ trunk/vidix/radeon_vid.c	Sun Jan 27 18:32:26 2008
@@ -66,7 +66,7 @@ static uint32_t firegl_shift = 0;
 #define RADEON_ASSERT(msg) printf(RADEON_MSG"################# FATAL:"msg);
 
 #define VERBOSE_LEVEL 0
-static int __verbose = 0;
+static int verbosity = 0;
 typedef struct bes_registers_s
 {
   /* base address of yuv framebuffer */
@@ -1209,7 +1209,7 @@ static int radeon_probe(int verbose, int
   pciinfo_t lst[MAX_PCI_DEVICES];
   unsigned i,num_pci;
   int err;
-  __verbose = verbose;
+  verbosity = verbose;
   err = pci_scan(lst,&num_pci);
   if(err)
   {
@@ -1302,7 +1302,7 @@ static int radeon_init(void)
 {
   int err;
 
-  if(__verbose>0) printf("[radeon_vid] version %d\n", VIDIX_VERSION);
+  if(verbosity > 0) printf("[radeon_vid] version %d\n", VIDIX_VERSION);
 
   if(!probed) 
   {
@@ -1552,8 +1552,8 @@ static void radeon_vid_display_video( vo
     OUTREG(OV0_FOUR_TAP_COEF_4,besr.four_tap_coeff[4]);
     if(besr.swap_uv) OUTREG(OV0_TEST,INREG(OV0_TEST)|OV0_SWAP_UV);
     OUTREG(OV0_REG_LOAD_CNTL,		0);
-    if(__verbose > VERBOSE_LEVEL) printf(RADEON_MSG"we wanted: scaler=%08X\n",bes_flags);
-    if(__verbose > VERBOSE_LEVEL) radeon_vid_dump_regs();
+    if(verbosity > VERBOSE_LEVEL) printf(RADEON_MSG"we wanted: scaler=%08X\n",bes_flags);
+    if(verbosity > VERBOSE_LEVEL) radeon_vid_dump_regs();
 }
 
 /* Goal of this function: hide RGB background and provide black screen around movie.
@@ -3183,7 +3183,7 @@ static int radeon_frame_select(unsigned 
     OUTREG(OV0_VID_BUF5_BASE_ADRS,	off[5]);
     OUTREG(OV0_REG_LOAD_CNTL,		0);
     if(besr.vid_nbufs == 2) radeon_wait_vsync();
-    if(__verbose > VERBOSE_LEVEL) radeon_vid_dump_regs();
+    if(verbosity > VERBOSE_LEVEL) radeon_vid_dump_regs();
     return 0;
 }