From a645f8ecd55b543c1d0c80a0e8067e436719f6ed Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 7 Jun 2008 09:41:51 +0000 Subject: Remove unused variable, fixes the warning: vidix/sysdep/pci_linux.c:71: warning: unused variable 'config_cmd' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27003 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/sysdep/pci_linux.c | 1 - 1 file changed, 1 deletion(-) (limited to 'vidix') diff --git a/vidix/sysdep/pci_linux.c b/vidix/sysdep/pci_linux.c index 07d9566563..a4eb3ebdde 100644 --- a/vidix/sysdep/pci_linux.c +++ b/vidix/sysdep/pci_linux.c @@ -68,7 +68,6 @@ static long pci_config_read_long( int func, unsigned cmd) { - unsigned long config_cmd; pcic_t p; p.address = cmd; -- cgit v1.2.3 From 8e717d77c736aa949800a07192180d053302a0a6 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 7 Jun 2008 10:25:07 +0000 Subject: vidix s3 headers was missing proper header git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27004 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/s3_regs.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'vidix') diff --git a/vidix/s3_regs.h b/vidix/s3_regs.h index 440681ab5e..0add1bea54 100644 --- a/vidix/s3_regs.h +++ b/vidix/s3_regs.h @@ -1,3 +1,27 @@ +/* + * S3 chipsets registers definition. + * + * Copyright (C) 2004 Reza Jelveh + * Thanks to Alex Deucher for Support + * Trio/Virge support by Michael Kostylev + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_SAVAGE_REGS_H #define MPLAYER_SAVAGE_REGS_H -- cgit v1.2.3 From b7391dde399cd8a9557b7939a6965219ab4d3df2 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 7 Jun 2008 10:56:42 +0000 Subject: Drop some useless parameter from vidix init routine git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27007 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/vidixlib.c | 2 +- vidix/vidixlib.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vidix') diff --git a/vidix/vidixlib.c b/vidix/vidixlib.c index c1758c7597..9f22aec849 100644 --- a/vidix/vidixlib.c +++ b/vidix/vidixlib.c @@ -49,7 +49,7 @@ extern unsigned int vdlGetVersion( void ) return VIDIX_VERSION; } -VDL_HANDLE vdlOpen(const char *path,const char *name,unsigned cap,int verbose) +VDL_HANDLE vdlOpen(const char *name,unsigned cap,int verbose) { VDXContext *ctx; diff --git a/vidix/vidixlib.h b/vidix/vidixlib.h index f75fc8b287..b0e3f7de96 100644 --- a/vidix/vidixlib.h +++ b/vidix/vidixlib.h @@ -85,7 +85,7 @@ unsigned vdlGetVersion( void ); verbose - specifies verbose level returns !0 if ok else NULL. */ -VDL_HANDLE vdlOpen(const char *path,const char *name,unsigned cap,int verbose); +VDL_HANDLE vdlOpen(const char *name,unsigned cap,int verbose); /* Closes stream and corresponded driver. */ void vdlClose(VDL_HANDLE ctx); -- cgit v1.2.3 From 6212ebbcae6dca6bd2c66a9dbf3db7f9a78ef072 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 7 Jun 2008 11:43:57 +0000 Subject: remove useless vidix versioning stuff git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27009 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/mach64_vid.c | 1 - vidix/radeon_vid.c | 2 -- vidix/vidix.h | 2 -- vidix/vidixlib.c | 5 ----- vidix/vidixlib.h | 3 --- 5 files changed, 13 deletions(-) (limited to 'vidix') diff --git a/vidix/mach64_vid.c b/vidix/mach64_vid.c index 1c7935a35a..0163deb4c3 100644 --- a/vidix/mach64_vid.c +++ b/vidix/mach64_vid.c @@ -476,7 +476,6 @@ static int mach64_init(void) printf("[mach64] Driver was not probed but is being initializing\n"); return EINTR; } - 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(); diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c index 5bb9f082bb..5088a987fd 100644 --- a/vidix/radeon_vid.c +++ b/vidix/radeon_vid.c @@ -1297,8 +1297,6 @@ static int radeon_init(void) { int err; - if(verbosity > 0) printf("[radeon_vid] version %d\n", VIDIX_VERSION); - if(!probed) { printf(RADEON_MSG" Driver was not probed but is being initializing\n"); diff --git a/vidix/vidix.h b/vidix/vidix.h index 0a61adc6db..91f1993185 100644 --- a/vidix/vidix.h +++ b/vidix/vidix.h @@ -40,8 +40,6 @@ extern "C" { #endif -#define VIDIX_VERSION 100 - #define PROBE_NORMAL 0 /* normal probing */ #define PROBE_FORCE 1 /* ignore device_id but recognize device if it's known */ diff --git a/vidix/vidixlib.c b/vidix/vidixlib.c index 9f22aec849..78dc703e77 100644 --- a/vidix/vidixlib.c +++ b/vidix/vidixlib.c @@ -44,11 +44,6 @@ #include "libavutil/common.h" #include "mpbswap.h" -extern unsigned int vdlGetVersion( void ) -{ - return VIDIX_VERSION; -} - VDL_HANDLE vdlOpen(const char *name,unsigned cap,int verbose) { VDXContext *ctx; diff --git a/vidix/vidixlib.h b/vidix/vidixlib.h index b0e3f7de96..664579de23 100644 --- a/vidix/vidixlib.h +++ b/vidix/vidixlib.h @@ -74,9 +74,6 @@ typedef struct VDXContext { typedef VDXContext * VDL_HANDLE; - /* returns library version */ -unsigned vdlGetVersion( void ); - /* Opens corresponded video driver and returns handle of associated stream. path - specifies path where drivers are located. -- cgit v1.2.3 From d47186c5d85318df77cb67050eb08af1de3d4bd6 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 7 Jun 2008 11:45:25 +0000 Subject: Add default definition for SVGA device. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27010 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/dha.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vidix') diff --git a/vidix/dha.h b/vidix/dha.h index c19ed0fc07..7acc3c6c73 100644 --- a/vidix/dha.h +++ b/vidix/dha.h @@ -40,6 +40,10 @@ extern "C" { #endif +#ifndef DEV_SVGA +#define DEV_SVGA "/dev/svga" +#endif + #define MAX_DEV_PER_VENDOR_CFG1 64 #define MAX_PCI_DEVICES_PER_BUS 32 #define MAX_PCI_DEVICES 64 -- cgit v1.2.3 From 494da54eaf11c759f05c703aa635ce1f0324cbb8 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 7 Jun 2008 11:47:33 +0000 Subject: remove C++ inclusion guard from vidix headers git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27011 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/dha.h | 8 -------- vidix/pci_db2c.awk | 6 ------ vidix/vidix.h | 8 -------- vidix/vidixlib.h | 8 -------- 4 files changed, 30 deletions(-) (limited to 'vidix') diff --git a/vidix/dha.h b/vidix/dha.h index 7acc3c6c73..eb2a269c46 100644 --- a/vidix/dha.h +++ b/vidix/dha.h @@ -36,10 +36,6 @@ #ifndef MPLAYER_DHA_H #define MPLAYER_DHA_H -#ifdef __cplusplus -extern "C" { -#endif - #ifndef DEV_SVGA #define DEV_SVGA "/dev/svga" #endif @@ -92,8 +88,4 @@ extern void unmap_phys_mem(void *ptr, unsigned long size); #define MTRR_TYPE_WRBACK 6 extern int mtrr_set_type(unsigned base,unsigned size,int type); -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_DHA_H */ diff --git a/vidix/pci_db2c.awk b/vidix/pci_db2c.awk index 4f6a084bda..3d10297652 100644 --- a/vidix/pci_db2c.awk +++ b/vidix/pci_db2c.awk @@ -145,9 +145,6 @@ function print_head( out_file) function print_name_struct(out_file) { - print "#ifdef __cplusplus" >out_file - print "extern \"C\" {" >out_file - print "#endif" >out_file print "">out_file print "struct device_id_s" >out_file print "{" >out_file @@ -164,9 +161,6 @@ function print_name_struct(out_file) print "extern const char *pci_vendor_name(unsigned short id);">out_file print "extern const char *pci_device_name(unsigned short vendor_id, unsigned short device_id);">out_file print "">out_file - print "#ifdef __cplusplus" >out_file - print "}" >out_file - print "#endif" >out_file return } diff --git a/vidix/vidix.h b/vidix/vidix.h index 91f1993185..01a998b004 100644 --- a/vidix/vidix.h +++ b/vidix/vidix.h @@ -36,10 +36,6 @@ #ifndef MPLAYER_VIDIX_H #define MPLAYER_VIDIX_H -#ifdef __cplusplus -extern "C" { -#endif - #define PROBE_NORMAL 0 /* normal probing */ #define PROBE_FORCE 1 /* ignore device_id but recognize device if it's known */ @@ -309,8 +305,4 @@ typedef struct vidix_oem_fx_s char *name[80]; /* effect name to display */ } vidix_oem_fx_t; -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_VIDIX_H */ diff --git a/vidix/vidixlib.h b/vidix/vidixlib.h index 664579de23..08ca9639da 100644 --- a/vidix/vidixlib.h +++ b/vidix/vidixlib.h @@ -36,10 +36,6 @@ #ifndef MPLAYER_VIDIXLIB_H #define MPLAYER_VIDIXLIB_H -#ifdef __cplusplus -extern "C" { -#endif - #include "vidix.h" typedef struct VDXDriver { @@ -135,8 +131,4 @@ int vdlSetOemEffect(VDL_HANDLE, const vidix_oem_fx_t * ); /* Returns 0 if ok else errno */ int vdlPlaybackCopyFrame(VDL_HANDLE, const vidix_dma_t * ); -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_VIDIXLIB_H */ -- cgit v1.2.3