[xine-cvs] HG: xine-lib-1.2: vidix: kill warnings.

[Torsten J. <t....@gm...>]

# HG changeset patch
# User Torsten Jager <t....@gm...>
# Date 1511888135 -3600
# Node ID cc4c2c32d631e5e94d5c443f91b204d89887269d
# Branch  default
# Parent  ad1c7438683bc2036be4ca0f498918d56f7d7bff
vidix: kill warnings.

diff --git a/contrib/vidix/drivers/mga_vid.c b/contrib/vidix/drivers/mga_vid.c
--- a/contrib/vidix/drivers/mga_vid.c
+++ b/contrib/vidix/drivers/mga_vid.c
@@ -1184,7 +1184,7 @@
 
     cregs.c2preload=(vsyncstart << 16) | (hsyncstart); // from
 
-    memset(config->dga_addr + config->offsets[config->num_frames], 0, config->frame_size); // clean spic area
+    memset((uint8_t *)(config->dga_addr) + config->offsets[config->num_frames], 0, config->frame_size); // clean spic area
     cregs.c2spicstartadd0=(uint32_t) mga_src_base + baseadrofs + config->num_frames*config->frame_size;
     //cregs.c2spicstartadd1=0; // not used
 
 --git a/contrib/vidix/drivers/nvidia_vid.c b/contrib/vidix/drivers/nvidia_vid.c
--- a/contrib/vidix/drivers/nvidia_vid.c
+++ b/contrib/vidix/drivers/nvidia_vid.c
@@ -339,8 +339,8 @@
     unsigned int screen_y;            /*screen height*/
 	unsigned long buffer_size;		 /* size of the image buffer	       */
 	struct rivatv_chip chip;	 /* NV architecture structure		       */
-	void* video_base;		 /* virtual address of control region	       */
-	void* control_base;		 /* virtual address of fb region	       */
+    uint8_t* video_base;		 /* virtual address of control region	       */
+    uint8_t* control_base;		 /* virtual address of fb region	       */
 	unsigned long picture_base;	 /* direct pointer to video picture	       */
 	unsigned long picture_offset;	 /* offset of video picture in frame buffer    */
 //	struct rivatv_dma dma;           /* DMA structure                              */
 --git a/contrib/vidix/drivers/pm2_vid.c b/contrib/vidix/drivers/pm2_vid.c
--- a/contrib/vidix/drivers/pm2_vid.c
+++ b/contrib/vidix/drivers/pm2_vid.c
@@ -54,8 +54,8 @@
 
 pciinfo_t pci_info;
 
-void *pm2_reg_base;
-void *pm2_mem;
+uint8_t *pm2_reg_base;
+uint8_t *pm2_mem;
 
 int pm2_vidmem = PM2_VIDMEM;
 
 --git a/contrib/vidix/drivers/pm3_vid.c b/contrib/vidix/drivers/pm3_vid.c
--- a/contrib/vidix/drivers/pm3_vid.c
+++ b/contrib/vidix/drivers/pm3_vid.c
@@ -50,7 +50,7 @@
 static pciinfo_t pci_info;
 
 void *pm3_reg_base;
-static void *pm3_mem;
+static uint8_t *pm3_mem;
 
 static int pm3_vidmem = PM3_VIDMEM;
 static int pm3_blank = 0;
@@ -146,7 +146,7 @@
 int VIDIX_NAME(vixInit)(const char *args)
 {
     if(args != NULL){
-	char *ac = strdup(args), *s, *opt;
+	char *ac = strdup(args), *s = NULL, *opt;
 
 	opt = strtok_r(ac, ",", &s);
 	while(opt){
 --git a/contrib/vidix/drivers/radeon_vid.c b/contrib/vidix/drivers/radeon_vid.c
--- a/contrib/vidix/drivers/radeon_vid.c
+++ b/contrib/vidix/drivers/radeon_vid.c
@@ -1105,9 +1105,9 @@
 
 static rinfo_t rinfo;
 
-static char * GET_MON_NAME(int type)
+static const char * GET_MON_NAME(int type)
 {
-  char *pret;
+  const char *pret;
   switch(type)
   {
     case MT_NONE: pret = "no"; break;
@@ -2447,7 +2447,7 @@
 {
     double V_scale_ratio;
     uint32_t i,src_w,src_h,dest_w,dest_h,pitch,left,leftUV,top,h_inc;
-    uint32_t val_OV0_P1_H_INC,val_OV0_P1_H_STEP_BY,val_OV0_P23_H_INC,val_OV0_P23_H_STEP_BY;
+    uint32_t val_OV0_P1_H_INC=0,val_OV0_P1_H_STEP_BY=0,val_OV0_P23_H_INC=0,val_OV0_P23_H_STEP_BY=0;
     uint32_t val_OV0_P1_X_START,val_OV0_P2_X_START;
     uint32_t val_OV0_P1_MAX_LN_IN_PER_LN_OUT,val_OV0_P23_MAX_LN_IN_PER_LN_OUT;
     uint32_t CRT_V_INC;
@@ -2751,10 +2751,10 @@
     besr.v_inc <<= 8;
     {
 	int ThereIsTwoTapVerticalFiltering,DoNotUseMostRecentlyFetchedLine;
-	int P1GroupSize;
+	int P1GroupSize = 0;
 	int P23GroupSize;
-	int P1StepSize;
-	int P23StepSize;
+	int P1StepSize = 0;
+	int P23StepSize = 0;
 
 	Calc_H_INC_STEP_BY(
 	    besr.surf_id,
@@ -3005,7 +3005,7 @@
 	Note: probably it's ont good idea to locate them in video memory
 	but as initial release it's OK */
 	radeon_video_size -= radeon_ram_size * sizeof(bm_list_descriptor) / 4096;
-	radeon_dma_desc_base = (void *) pci_info.base0 + radeon_video_size;
+	radeon_dma_desc_base = (uint8_t *) pci_info.base0 + radeon_video_size;
   }
 #endif
   for(;nfr>0; nfr--)
 --git a/contrib/vidix/drivers/savage_vid.c b/contrib/vidix/drivers/savage_vid.c
--- a/contrib/vidix/drivers/savage_vid.c
+++ b/contrib/vidix/drivers/savage_vid.c
@@ -247,8 +247,8 @@
     unsigned int screen_y;            /*screen height*/
     unsigned long buffer_size;		 /* size of the image buffer	       */
     struct savage_chip chip;	 /* NV architecture structure		       */
-    void* video_base;		 /* virtual address of control region	       */
-    void* control_base;		 /* virtual address of fb region	       */
+    uint8_t* video_base;		 /* virtual address of control region	       */
+    uint8_t* control_base;		 /* virtual address of fb region	       */
     unsigned long picture_base;	 /* direct pointer to video picture	       */
     unsigned long picture_offset;	 /* offset of video picture in frame buffer    */
 //	struct savage_dma dma;           /* DMA structure                              */
 --git a/contrib/vidix/drivers/sis_vid.c b/contrib/vidix/drivers/sis_vid.c
--- a/contrib/vidix/drivers/sis_vid.c
+++ b/contrib/vidix/drivers/sis_vid.c
@@ -103,7 +103,7 @@
 static pciinfo_t pci_info;
 unsigned int sis_verbose = 0;
 
-static void *sis_mem_base;
+static uint8_t *sis_mem_base;
 /* static void *sis_reg_base; */
 unsigned short sis_iobase;