diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /vidix | |
parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'vidix')
-rw-r--r-- | vidix/dha.h | 8 | ||||
-rw-r--r-- | vidix/mach64_vid.c | 1 | ||||
-rw-r--r-- | vidix/pci_db2c.awk | 6 | ||||
-rw-r--r-- | vidix/radeon_vid.c | 2 | ||||
-rw-r--r-- | vidix/s3_regs.h | 24 | ||||
-rw-r--r-- | vidix/sysdep/pci_linux.c | 1 | ||||
-rw-r--r-- | vidix/vidix.h | 10 | ||||
-rw-r--r-- | vidix/vidixlib.c | 7 | ||||
-rw-r--r-- | vidix/vidixlib.h | 13 |
9 files changed, 28 insertions, 44 deletions
diff --git a/vidix/dha.h b/vidix/dha.h index c19ed0fc07..eb2a269c46 100644 --- a/vidix/dha.h +++ b/vidix/dha.h @@ -36,8 +36,8 @@ #ifndef MPLAYER_DHA_H #define MPLAYER_DHA_H -#ifdef __cplusplus -extern "C" { +#ifndef DEV_SVGA +#define DEV_SVGA "/dev/svga" #endif #define MAX_DEV_PER_VENDOR_CFG1 64 @@ -88,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/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/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/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/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 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; diff --git a/vidix/vidix.h b/vidix/vidix.h index 0a61adc6db..01a998b004 100644 --- a/vidix/vidix.h +++ b/vidix/vidix.h @@ -36,12 +36,6 @@ #ifndef MPLAYER_VIDIX_H #define MPLAYER_VIDIX_H -#ifdef __cplusplus -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 */ @@ -311,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.c b/vidix/vidixlib.c index c1758c7597..78dc703e77 100644 --- a/vidix/vidixlib.c +++ b/vidix/vidixlib.c @@ -44,12 +44,7 @@ #include "libavutil/common.h" #include "mpbswap.h" -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..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 { @@ -74,9 +70,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. @@ -85,7 +78,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); @@ -138,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 */ |