diff options
author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-01 11:13:04 +0000 |
---|---|---|
committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-01 11:13:04 +0000 |
commit | cae5548c7da84764be34c82d2b9dd3eb8eee8a1c (patch) | |
tree | 1683ae292331e3296a5b4e4f6adbbcd8f829799c /vidix | |
parent | 257a77dc3d0e793d4051521391b3dc7bef59d522 (diff) | |
download | mpv-cae5548c7da84764be34c82d2b9dd3eb8eee8a1c.tar.bz2 mpv-cae5548c7da84764be34c82d2b9dd3eb8eee8a1c.tar.xz |
checking for dynamic drivers version number is now pointless
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22876 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r-- | vidix/cyberblade_vid.c | 8 | ||||
-rw-r--r-- | vidix/drivers.c | 10 | ||||
-rw-r--r-- | vidix/mach64_vid.c | 6 | ||||
-rw-r--r-- | vidix/mga_vid.c | 6 | ||||
-rw-r--r-- | vidix/nvidia_vid.c | 7 | ||||
-rw-r--r-- | vidix/pm3_vid.c | 7 | ||||
-rw-r--r-- | vidix/radeon_vid.c | 4 | ||||
-rw-r--r-- | vidix/savage_vid.c | 13 | ||||
-rw-r--r-- | vidix/sis_vid.c | 7 | ||||
-rw-r--r-- | vidix/unichrome_vid.c | 12 | ||||
-rw-r--r-- | vidix/vidixlib.h | 1 |
11 files changed, 0 insertions, 81 deletions
diff --git a/vidix/cyberblade_vid.c b/vidix/cyberblade_vid.c index b7acc0c251..5c6971fbd4 100644 --- a/vidix/cyberblade_vid.c +++ b/vidix/cyberblade_vid.c @@ -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, diff --git a/vidix/drivers.c b/vidix/drivers.c index 1bf2193806..daac53980e 100644 --- a/vidix/drivers.c +++ b/vidix/drivers.c @@ -56,16 +56,6 @@ static int vidix_probe_driver (VDXContext *ctx, VDXDriver *drv, 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; diff --git a/vidix/mach64_vid.c b/vidix/mach64_vid.c index a439da768c..aacf04e03c 100644 --- a/vidix/mach64_vid.c +++ b/vidix/mach64_vid.c @@ -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, diff --git a/vidix/mga_vid.c b/vidix/mga_vid.c index 47fbafbe09..b609bc7ce1 100644 --- a/vidix/mga_vid.c +++ b/vidix/mga_vid.c @@ -1436,11 +1436,6 @@ static int mga_query_fourcc(vidix_fourcc_t *to) 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, diff --git a/vidix/nvidia_vid.c b/vidix/nvidia_vid.c index faf5b9a4ec..84514f2cc5 100644 --- a/vidix/nvidia_vid.c +++ b/vidix/nvidia_vid.c @@ -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, diff --git a/vidix/pm3_vid.c b/vidix/pm3_vid.c index f9737e34da..9a7e73977f 100644 --- a/vidix/pm3_vid.c +++ b/vidix/pm3_vid.c @@ -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, diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c index cd0d9df0c0..141e70342b 100644 --- a/vidix/radeon_vid.c +++ b/vidix/radeon_vid.c @@ -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, diff --git a/vidix/savage_vid.c b/vidix/savage_vid.c index f0f14aca2f..7625de1472 100644 --- a/vidix/savage_vid.c +++ b/vidix/savage_vid.c @@ -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, diff --git a/vidix/sis_vid.c b/vidix/sis_vid.c index 39e6c439d3..1a24624113 100644 --- a/vidix/sis_vid.c +++ b/vidix/sis_vid.c @@ -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, diff --git a/vidix/unichrome_vid.c b/vidix/unichrome_vid.c index ac3c0bb424..b49fd92824 100644 --- a/vidix/unichrome_vid.c +++ b/vidix/unichrome_vid.c @@ -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, diff --git a/vidix/vidixlib.h b/vidix/vidixlib.h index cf4c38d7fa..b1e34e5b0d 100644 --- a/vidix/vidixlib.h +++ b/vidix/vidixlib.h @@ -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); |