Mercurial > mplayer.hg
changeset 22858:6c57087c5a2d
checking for dynamic drivers version number is now pointless
| author | ben |
|---|---|
| date | Sun, 01 Apr 2007 11:13:04 +0000 |
| parents | 77def5093daf |
| children | c5a45e3d6d16 |
| files | vidix/cyberblade_vid.c vidix/drivers.c vidix/mach64_vid.c vidix/mga_vid.c vidix/nvidia_vid.c vidix/pm3_vid.c vidix/radeon_vid.c vidix/savage_vid.c vidix/sis_vid.c vidix/unichrome_vid.c vidix/vidixlib.h |
| diffstat | 11 files changed, 0 insertions(+), 81 deletions(-) [+] |
line wrap: on
line diff
--- a/vidix/cyberblade_vid.c Sun Apr 01 11:06:06 2007 +0000 +++ b/vidix/cyberblade_vid.c Sun Apr 01 11:13:04 2007 +0000 @@ -135,13 +135,6 @@ { 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 @@ "cyberblade", NULL, .probe = cyberblade_probe, - .get_version = cyberblade_get_version, .get_caps = cyberblade_get_caps, .query_fourcc = cyberblade_query_fourcc, .init = cyberblade_init,
--- a/vidix/drivers.c Sun Apr 01 11:06:06 2007 +0000 +++ b/vidix/drivers.c Sun Apr 01 11:13:04 2007 +0000 @@ -56,16 +56,6 @@ 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;
--- a/vidix/mach64_vid.c Sun Apr 01 11:06:06 2007 +0000 +++ b/vidix/mach64_vid.c Sun Apr 01 11:13:04 2007 +0000 @@ -339,11 +339,6 @@ } -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 @@ "mach64", NULL, .probe = mach64_probe, - .get_version = mach64_get_version, .get_caps = mach64_get_caps, .query_fourcc = mach64_query_fourcc, .init = mach64_init,
--- a/vidix/mga_vid.c Sun Apr 01 11:06:06 2007 +0000 +++ b/vidix/mga_vid.c Sun Apr 01 11:13:04 2007 +0000 @@ -1436,11 +1436,6 @@ 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 @@ NULL, .probe = mga_probe, - .get_version = mga_get_version, .get_caps = mga_get_caps, .query_fourcc = mga_query_fourcc, .init = mga_init,
--- a/vidix/nvidia_vid.c Sun Apr 01 11:06:06 2007 +0000 +++ b/vidix/nvidia_vid.c Sun Apr 01 11:13:04 2007 +0000 @@ -52,12 +52,6 @@ { 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 @@ "nvidia", NULL, .probe = nv_probe, - .get_version = nv_get_version, .get_caps = nv_get_caps, .query_fourcc = nv_query_fourcc, .init = nv_init,
--- a/vidix/pm3_vid.c Sun Apr 01 11:06:06 2007 +0000 +++ b/vidix/pm3_vid.c Sun Apr 01 11:13:04 2007 +0000 @@ -65,12 +65,6 @@ { 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 @@ "pm3", NULL, .probe = pm3_probe, - .get_version = pm3_get_version, .get_caps = pm3_get_caps, .query_fourcc = pm3_query_fourcc, .init = pm3_init,
--- a/vidix/radeon_vid.c Sun Apr 01 11:06:06 2007 +0000 +++ b/vidix/radeon_vid.c Sun Apr 01 11:13:04 2007 +0000 @@ -794,9 +794,6 @@ 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 @@ NULL, .probe = radeon_probe, - .get_version = radeon_get_version, .get_caps = radeon_get_caps, .query_fourcc = radeon_query_fourcc, .init = radeon_init,
--- a/vidix/savage_vid.c Sun Apr 01 11:06:06 2007 +0000 +++ b/vidix/savage_vid.c Sun Apr 01 11:13:04 2007 +0000 @@ -763,18 +763,6 @@ 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 @@ "savage", NULL, .probe = savage_probe, - .get_version = savage_get_version, .get_caps = savage_get_caps, .query_fourcc = savage_query_fourcc, .init = savage_init,
--- a/vidix/sis_vid.c Sun Apr 01 11:06:06 2007 +0000 +++ b/vidix/sis_vid.c Sun Apr 01 11:13:04 2007 +0000 @@ -237,12 +237,6 @@ 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 @@ NULL, .probe = sis_probe, - .get_version = sis_get_version, .get_caps = sis_get_caps, .query_fourcc = sis_query_fourcc, .init = sis_init,
--- a/vidix/unichrome_vid.c Sun Apr 01 11:06:06 2007 +0000 +++ b/vidix/unichrome_vid.c Sun Apr 01 11:13:04 2007 +0000 @@ -117,17 +117,6 @@ }; /** - * @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 @@ "unichrome", NULL, .probe = unichrome_probe, - .get_version = unichrome_get_version, .get_caps = unichrome_get_caps, .query_fourcc = unichrome_query_fourcc, .init = unichrome_init,
--- a/vidix/vidixlib.h Sun Apr 01 11:06:06 2007 +0000 +++ b/vidix/vidixlib.h Sun Apr 01 11:13:04 2007 +0000 @@ -29,7 +29,6 @@ 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);