[MPlayer-cvslog] r22876 - in trunk/vidix: cyberblade_vid.c drivers.c mach64_vid.c mga_vid.c nvidia_vid.c pm3_vid.c radeon_vid.c savage_vid.c sis_vid.c unichrome_vid.c vidixlib.h

ben subversion at mplayerhq.hu
Sun Apr 1 13:13:04 CEST 2007


Author: ben
Date: Sun Apr  1 13:13:04 2007
New Revision: 22876

Modified:
   trunk/vidix/cyberblade_vid.c
   trunk/vidix/drivers.c
   trunk/vidix/mach64_vid.c
   trunk/vidix/mga_vid.c
   trunk/vidix/nvidia_vid.c
   trunk/vidix/pm3_vid.c
   trunk/vidix/radeon_vid.c
   trunk/vidix/savage_vid.c
   trunk/vidix/sis_vid.c
   trunk/vidix/unichrome_vid.c
   trunk/vidix/vidixlib.h

Log:
checking for dynamic drivers version number is now pointless

Modified: trunk/vidix/cyberblade_vid.c
==============================================================================
--- trunk/vidix/cyberblade_vid.c	(original)
+++ trunk/vidix/cyberblade_vid.c	Sun Apr  1 13:13:04 2007
@@ -135,13 +135,6 @@ static vidix_capability_t cyberblade_cap
 	{ 0, 0, 0, 0 }
 };
 
-
-static unsigned int cyberblade_get_version(void)
-{
-	return(VIDIX_VERSION);
-}
-
-
 static unsigned short cyberblade_card_ids[] =
 {
 	DEVICE_TRIDENT_CYBERBLADE_I7,
@@ -649,7 +642,6 @@ VDXDriver cyberblade_drv = {
   "cyberblade",
   NULL,
   .probe = cyberblade_probe,
-  .get_version = cyberblade_get_version,
   .get_caps = cyberblade_get_caps,
   .query_fourcc = cyberblade_query_fourcc,
   .init = cyberblade_init,

Modified: trunk/vidix/drivers.c
==============================================================================
--- trunk/vidix/drivers.c	(original)
+++ trunk/vidix/drivers.c	Sun Apr  1 13:13:04 2007
@@ -56,16 +56,6 @@ static int vidix_probe_driver (VDXContex
   if (verbose)
     printf ("vidixlib: PROBING: %s\n", drv->name);
 
-  if (!drv->get_version)
-    return 0;
-  
-  if (drv->get_version () != VIDIX_VERSION)
-  {
-    if (verbose)
-      printf ("vidixlib: %s has wrong version\n", drv->name);
-    return 0;
-  }
-
   if (!drv->probe || drv->probe (verbose, PROBE_NORMAL) != 0)
     return 0;
 

Modified: trunk/vidix/mach64_vid.c
==============================================================================
--- trunk/vidix/mach64_vid.c	(original)
+++ trunk/vidix/mach64_vid.c	Sun Apr  1 13:13:04 2007
@@ -339,11 +339,6 @@ static void mach64_vid_dump_regs( void )
 }
 
 
-static unsigned int mach64_get_version(void)
-{
-    return(VIDIX_VERSION);
-}
-
 static unsigned short ati_card_ids[] = 
 {
  DEVICE_ATI_215CT_MACH64_CT,
@@ -1069,7 +1064,6 @@ VDXDriver mach64_drv = {
   "mach64",
   NULL,
   .probe = mach64_probe,
-  .get_version = mach64_get_version,
   .get_caps = mach64_get_caps,
   .query_fourcc = mach64_query_fourcc,
   .init = mach64_init,

Modified: trunk/vidix/mga_vid.c
==============================================================================
--- trunk/vidix/mga_vid.c	(original)
+++ trunk/vidix/mga_vid.c	Sun Apr  1 13:13:04 2007
@@ -1436,11 +1436,6 @@ static int mga_query_fourcc(vidix_fourcc
     return(0);
 }
 
-static unsigned int mga_get_version(void)
-{
-    return(VIDIX_VERSION);
-}
-
 static int mga_get_caps(vidix_capability_t *to)
 {
     memcpy(to, &mga_cap, sizeof(vidix_capability_t));
@@ -1518,7 +1513,6 @@ VDXDriver mga_crtc2_drv = {
   NULL,
     
   .probe = mga_probe,
-  .get_version = mga_get_version,
   .get_caps = mga_get_caps,
   .query_fourcc = mga_query_fourcc,
   .init = mga_init,

Modified: trunk/vidix/nvidia_vid.c
==============================================================================
--- trunk/vidix/nvidia_vid.c	(original)
+++ trunk/vidix/nvidia_vid.c	Sun Apr  1 13:13:04 2007
@@ -52,12 +52,6 @@ static vidix_capability_t nvidia_cap = {
     { 0, 0, 0, 0 }
 };
 
-
-static unsigned int nv_get_version(void){
-    return(VIDIX_VERSION);
-}
-
-
 #define NV_ARCH_03  0x03
 #define NV_ARCH_04  0x04
 #define NV_ARCH_10  0x10
@@ -938,7 +932,6 @@ VDXDriver nvidia_drv = {
   "nvidia",
   NULL,
   .probe = nv_probe,
-  .get_version = nv_get_version,
   .get_caps = nv_get_caps,
   .query_fourcc = nv_query_fourcc,
   .init = nv_init,

Modified: trunk/vidix/pm3_vid.c
==============================================================================
--- trunk/vidix/pm3_vid.c	(original)
+++ trunk/vidix/pm3_vid.c	Sun Apr  1 13:13:04 2007
@@ -65,12 +65,6 @@ static vidix_capability_t pm3_cap =
     { 0, 0, 0, 0 }
 };
 
-
-static unsigned int pm3_get_version(void)
-{
-    return(VIDIX_VERSION);
-}
-
 static unsigned short pm3_card_ids[] = 
 {
     DEVICE_3DLABS_GLINT_R3
@@ -379,7 +373,6 @@ VDXDriver pm3_drv = {
   "pm3",
   NULL,
   .probe = pm3_probe,
-  .get_version = pm3_get_version,
   .get_caps = pm3_get_caps,
   .query_fourcc = pm3_query_fourcc,
   .init = pm3_init,

Modified: trunk/vidix/radeon_vid.c
==============================================================================
--- trunk/vidix/radeon_vid.c	(original)
+++ trunk/vidix/radeon_vid.c	Sun Apr  1 13:13:04 2007
@@ -794,9 +794,6 @@ static void radeon_vid_make_default(void
   besr.ckey_cntl = VIDEO_KEY_FN_TRUE|GRAPHIC_KEY_FN_TRUE|CMP_MIX_AND;
 }
 
-
-static unsigned int radeon_get_version( void ) { return VIDIX_VERSION; }
-
 static unsigned short ati_card_ids[] = 
 {
 #ifdef RAGE128
@@ -2111,7 +2108,6 @@ VDXDriver radeon_drv = {
   NULL,
     
   .probe = radeon_probe,
-  .get_version = radeon_get_version,
   .get_caps = radeon_get_caps,
   .query_fourcc = radeon_query_fourcc,
   .init = radeon_init,

Modified: trunk/vidix/savage_vid.c
==============================================================================
--- trunk/vidix/savage_vid.c	(original)
+++ trunk/vidix/savage_vid.c	Sun Apr  1 13:13:04 2007
@@ -763,18 +763,6 @@ static void SavageStreamsOff(void)
     info->videoFlags &= ~VF_STREAMS_ON;
 }
 
-
-/**
- * @brief Check age of driver.
- *
- * @return vidix version number.
- */
-static unsigned int
-savage_get_version (void)
-{
-  return (VIDIX_VERSION);
-}
-
 /**
  * @brief Find chip index in Unichrome compliant devices list.
  *
@@ -1477,7 +1465,6 @@ VDXDriver savage_drv = {
   "savage",
   NULL,
   .probe = savage_probe,
-  .get_version = savage_get_version,
   .get_caps = savage_get_caps,
   .query_fourcc = savage_query_fourcc,
   .init = savage_init,

Modified: trunk/vidix/sis_vid.c
==============================================================================
--- trunk/vidix/sis_vid.c	(original)
+++ trunk/vidix/sis_vid.c	Sun Apr  1 13:13:04 2007
@@ -237,12 +237,6 @@ static uint8_t vblank_active_CRT2(void)
     return ((ret & 0x02) ^ 0x02);
 }
 
-
-static unsigned int sis_get_version(void)
-{
-    return (VIDIX_VERSION);
-}
-
 static int find_chip(unsigned chip_id)
 {
     unsigned i;
@@ -1567,7 +1561,6 @@ VDXDriver sis_drv = {
   NULL,
     
   .probe = sis_probe,
-  .get_version = sis_get_version,
   .get_caps = sis_get_caps,
   .query_fourcc = sis_query_fourcc,
   .init = sis_init,

Modified: trunk/vidix/unichrome_vid.c
==============================================================================
--- trunk/vidix/unichrome_vid.c	(original)
+++ trunk/vidix/unichrome_vid.c	Sun Apr  1 13:13:04 2007
@@ -117,17 +117,6 @@ static unsigned short uc_card_ids[] = {
 };
 
 /**
- * @brief Check age of driver.
- *
- * @return vidix version number.
- */
-static unsigned int
-unichrome_get_version (void)
-{
-  return (VIDIX_VERSION);
-}
-
-/**
  * @brief Find chip index in Unichrome compliant devices list.
  *
  * @param chip_id PCI device ID.
@@ -982,7 +971,6 @@ VDXDriver unichrome_drv = {
   "unichrome",
   NULL,
   .probe = unichrome_probe,
-  .get_version = unichrome_get_version,
   .get_caps = unichrome_get_caps,
   .query_fourcc = unichrome_query_fourcc,
   .init = unichrome_init,

Modified: trunk/vidix/vidixlib.h
==============================================================================
--- trunk/vidix/vidixlib.h	(original)
+++ trunk/vidix/vidixlib.h	Sun Apr  1 13:13:04 2007
@@ -29,7 +29,6 @@ typedef struct VDXDriver {
   const char *name;
   struct VDXDriver *next;
   int (* probe) (int verbose, int force);
-  unsigned int (* get_version)(void);
   int (* get_caps) (vidix_capability_t *cap);
   int (*query_fourcc)(vidix_fourcc_t *);
   int (*init)(void);



More information about the MPlayer-cvslog mailing list