January 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main configure,1.364,1.365
by Nick Kurshev 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv3221/main Modified Files: configure Log Message: Additional AWK notes Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.364 retrieving revision 1.365 diff -u -r1.364 -r1.365 --- configure 12 Jan 2002 17:59:22 -0000 1.364 +++ configure 12 Jan 2002 18:58:41 -0000 1.365 @@ -1019,9 +1019,14 @@ _gawk_ver="$_gawk_ver, ok" ;; esac -echo Checking for gawk ... $_gawk_ver +echo Checking for awk ... $_gawk_ver if test "$_gawk_verc_fail" ; then -echo Gawk was not found or has wrong version. gawk-3.0.x is required +echo Awk was not found or has wrong version. +echo If you have no such one then it can be downloaded from: +echo ftp://ftp.gnu.org/gnu/gawk/ +echo Also check - maybe you already have gawk, mawk or nawk. +echo If test is succesful then make awk symlink. Example ln -sf gawk awk +echo Or rerun configure with --disable-vidix option. exit fi fi

1 0

CVS: main vobsub.c,1.2,1.3
by Kim Minh Kaplan CVS 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv28342 Modified Files: vobsub.c Log Message: Check for NULL vob->spudec before using. Index: vobsub.c =================================================================== RCS file: /cvsroot/mplayer/main/vobsub.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vobsub.c 10 Jan 2002 20:12:12 -0000 1.2 +++ vobsub.c 12 Jan 2002 18:34:50 -0000 1.3 @@ -754,18 +754,19 @@ { vobsub_t *vob = (vobsub_t *)vobhandle; unsigned int pts100 = 100 * pts; - if (vob->spudec) + if (vob->spudec) { spudec_heartbeat(vob->spudec, pts100); - if (vob->spu_streams && 0 <= vobsub_id && (unsigned) vobsub_id < vob->spu_streams_size) { - packet_queue_t *queue = vob->spu_streams + vobsub_id; - while (queue->current_index < queue->packets_size) { - packet_t *pkt = queue->packets + queue->current_index; - if (pkt->pts100 <= pts100) { - spudec_assemble(vob->spudec, pkt->data, pkt->size, pkt->pts100); - ++queue->current_index; + if (vob->spu_streams && 0 <= vobsub_id && (unsigned) vobsub_id < vob->spu_streams_size) { + packet_queue_t *queue = vob->spu_streams + vobsub_id; + while (queue->current_index < queue->packets_size) { + packet_t *pkt = queue->packets + queue->current_index; + if (pkt->pts100 <= pts100) { + spudec_assemble(vob->spudec, pkt->data, pkt->size, pkt->pts100); + ++queue->current_index; + } + else + break; } - else - break; } } }

1 0

CVS: main/libdha pci_db2c.awk,1.1,1.2
by Nick Kurshev 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/libdha In directory mplayer:/var/tmp.root/cvs-serv25945/main/libdha Modified Files: pci_db2c.awk Log Message: Solaris compatibility Index: pci_db2c.awk =================================================================== RCS file: /cvsroot/mplayer/main/libdha/pci_db2c.awk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pci_db2c.awk 9 Jan 2002 19:03:50 -0000 1.1 +++ pci_db2c.awk 12 Jan 2002 18:26:13 -0000 1.2 @@ -2,9 +2,11 @@ # For latest version of pci ids see: http://pciids.sf.net # Copyright 2002 Nick Kurshev # -# Usage gawk -f pci_db2c.awk pci.db +# Usage: awk -f pci_db2c.awk pci.db # # Tested with Gawk v 3.0.3 +# But there are reports that it works with Awk and Mawk +# (Nobody tested it with Nawk). # BEGIN { @@ -15,11 +17,6 @@ exit(1); } in_file = ARGV[1]; -# Try get input file attributes. - system("ls -o -q --time=ctime "in_file" >.tmp_file") - getline <".tmp_file" - in_file_attr = $0 - system("rm -f .tmp_file") vendor_file = "pci_vendors.h"; ids_file = "pci_ids.h" name_file = "pci_names.c" @@ -115,7 +112,7 @@ { print "/*" >out_file; printf(" * File: %s\n", out_file) >out_file; - printf(" * This file was generated automatically from:\n * %s\n", in_file_attr) >out_file; + printf(" * This file was generated automatically. Don't modify it.\n") >out_file; print "*/" >out_file; return; } @@ -196,9 +193,11 @@ function init_device_db() { - delete device_names +# delete device_names + for( i in device_names ) delete device_names[i]; device_names[1]="" - delete subdevice_names +# delete subdevice_names + for( i in subdevice_names ) delete subdevice_names[i]; subdevice_names[1] = "" } @@ -265,4 +264,4 @@ # Add new name in array of subdevice names subdevice_names[new_name] = new_name return new_name; -} \ No newline at end of file +}

1 0

CVS: main/libdha pci.c,1.1,1.2 AsmMacros.h,1.2,1.3
by Nick Kurshev 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/libdha In directory mplayer:/var/tmp.root/cvs-serv18482/main/libdha Modified Files: pci.c AsmMacros.h Log Message: Alpha patch by Falk Hueffner <falk.hueffner(a)student.uni-tuebingen.de> Index: pci.c =================================================================== RCS file: /cvsroot/mplayer/main/libdha/pci.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pci.c 4 Jan 2002 10:32:26 -0000 1.1 +++ pci.c 12 Jan 2002 18:00:25 -0000 1.2 @@ -269,7 +269,11 @@ #if defined(__GLIBC__) && __GLIBC__ >= 2 #if defined(linux) +#ifdef __i386__ #include <sys/perm.h> +#else +#include <sys/io.h> +#endif #endif #endif @@ -278,25 +282,6 @@ #include <asm/unistd.h> #define BUS(tag) (((tag)>>16)&0xff) #define DFN(tag) (((tag)>>8)&0xff) -static int pciconfig_read( - unsigned char bus, - unsigned char dfn, - unsigned char off, - unsigned char len, - void * buf) -{ - return syscall(__NR_pciconfig_read, bus, dfn, off, len, buf); -} - -static int pciconfig_write( - unsigned char bus, - unsigned char dfn, - unsigned char off, - unsigned char len, - void * buf) -{ - return syscall(__NR_pciconfig_write, bus, dfn, off, len, buf); -} #else Generate compiler error - scanpci unsupported on non-linux alpha platforms #endif /* linux */ Index: AsmMacros.h =================================================================== RCS file: /cvsroot/mplayer/main/libdha/AsmMacros.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AsmMacros.h 12 Jan 2002 09:40:07 -0000 1.2 +++ AsmMacros.h 12 Jan 2002 18:00:25 -0000 1.3 @@ -61,18 +61,7 @@ #if defined(__GNUC__) #if defined(linux) && (defined(__alpha__) || defined(__ia64__)) -#undef inb -#undef inw -#undef inl -#undef outb -#undef outw -#undef outl -#define inb _inb -#define inw _inw -#define inl _inl -#define outb(p,v) _outb((v),(p)) -#define outw(p,v) _outw((v),(p)) -#define outl(p,v) _outl((v),(p)) +#include <sys/io.h> #else #if defined(__sparc__) #ifndef ASI_PL

1 0

CVS: main configure,1.363,1.364
by Nick Kurshev 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv17923/main Modified Files: configure Log Message: gawk->awk Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.363 retrieving revision 1.364 diff -u -r1.363 -r1.364 --- configure 12 Jan 2002 15:53:26 -0000 1.363 +++ configure 12 Jan 2002 17:59:22 -0000 1.364 @@ -1009,18 +1009,14 @@ #checking for gawk if test "$_vidix" = yes ; then -_gawk_ver=`echo '' | gawk --version 2>&1 | sed -n 's/^.*wk $[^A-Za-z ]*[0-9.]*$.*$/\1/p'` +_gawk_ver=`echo '' | awk --version 2>&1 | sed -n 's/^.*wk $[^A-Za-z ]*[0-9.]*$.*$/\1/p'` case $_gawk_ver in '') _gawk_ver="v. ?.??, bad" _gawk_verc_fail=yes ;; - 3.[0-9]|3.[0-9].[0-9]) - _gawk_ver="$_gawk_ver, ok" - ;; *) - _gawk_ver="$_gawk_ver, bad" - _gawk_verc_fail=yes + _gawk_ver="$_gawk_ver, ok" ;; esac echo Checking for gawk ... $_gawk_ver

1 0

CVS: main/libdha Makefile,1.3,1.4
by Alex Beregszaszi 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/libdha In directory mplayer:/var/tmp.root/cvs-serv555 Modified Files: Makefile Log Message: gawk -> awk Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libdha/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 12 Jan 2002 11:39:07 -0000 1.3 +++ Makefile 12 Jan 2002 17:11:01 -0000 1.4 @@ -27,7 +27,7 @@ pci_names.c: gzip -d -c oth/pci.db.gz >pci.db - gawk -f pci_db2c.awk pci.db + awk -f pci_db2c.awk pci.db test: $(CC) test.c -o test $(SHORTNAME)

1 0

CVS: main configure,1.362,1.363
by Nick Kurshev 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv7789/main Modified Files: configure Log Message: Checking for gawk Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.362 retrieving revision 1.363 diff -u -r1.362 -r1.363 --- configure 11 Jan 2002 22:31:11 -0000 1.362 +++ configure 12 Jan 2002 15:53:26 -0000 1.363 @@ -238,7 +238,6 @@ esac done - # Determine our OS name and CPU architecture if test -z "$_target" ; then # OS name @@ -626,7 +625,6 @@ $_as libac3/downmix/downmix_i386.S -o $TMPO > /dev/null 2>&1 && _binutils=yes echores "$_binutils" - if x86 ; then extcheck() { if test "$1" = yes ; then @@ -1009,6 +1007,28 @@ fi fi +#checking for gawk +if test "$_vidix" = yes ; then +_gawk_ver=`echo '' | gawk --version 2>&1 | sed -n 's/^.*wk $[^A-Za-z ]*[0-9.]*$.*$/\1/p'` + case $_gawk_ver in + '') + _gawk_ver="v. ?.??, bad" + _gawk_verc_fail=yes + ;; + 3.[0-9]|3.[0-9].[0-9]) + _gawk_ver="$_gawk_ver, ok" + ;; + *) + _gawk_ver="$_gawk_ver, bad" + _gawk_verc_fail=yes + ;; + esac +echo Checking for gawk ... $_gawk_ver +if test "$_gawk_verc_fail" ; then +echo Gawk was not found or has wrong version. gawk-3.0.x is required +exit +fi +fi ######################

2 1

CVS: main/libvo vo_dxr3.c,1.29,1.30
by David Holm 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv9382/libvo Modified Files: vo_dxr3.c Log Message: Fixed a bug relating to libmp1e (actually the bug is in libmp1e, but this solution should be safe enough) Index: vo_dxr3.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- vo_dxr3.c 11 Jan 2002 22:30:28 -0000 1.29 +++ vo_dxr3.c 12 Jan 2002 15:59:47 -0000 1.30 @@ -459,8 +459,6 @@ static void uninit(void) { printf("VO: [dxr3] Uninitializing\n"); - if (mp1e_context) - rte_context_delete(mp1e_context); if (picture_data[0]) free(picture_data[0]); if (fd_video)

1 0

CVS: main/vidix/drivers radeon.h,1.1,1.2 radeon_vid.c,1.10,1.11
by Nick Kurshev 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/vidix/drivers In directory mplayer:/var/tmp.root/cvs-serv4671 Modified Files: radeon.h radeon_vid.c Log Message: Changes due new gawk generator Index: radeon.h =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- radeon.h 5 Jan 2002 18:18:19 -0000 1.1 +++ radeon.h 12 Jan 2002 11:40:39 -0000 1.2 @@ -11,24 +11,7 @@ #ifndef _RADEON_H #define _RADEON_H - -/* radeon PCI ids */ -#define PCI_DEVICE_ID_RADEON_QD 0x5144 -#define PCI_DEVICE_ID_RADEON_QE 0x5145 -#define PCI_DEVICE_ID_RADEON_QF 0x5146 -#define PCI_DEVICE_ID_RADEON_QG 0x5147 -#define PCI_DEVICE_ID_RADEON_QY 0x5159 -#define PCI_DEVICE_ID_RADEON_QZ 0x515A -#define PCI_DEVICE_ID_RADEON_LY 0x4C59 -#define PCI_DEVICE_ID_RADEON_LZ 0x4C5A -#define PCI_DEVICE_ID_RADEON_LW 0x4C57 -#define PCI_DEVICE_ID_R200_QL 0x514C -#define PCI_DEVICE_ID_RV200_QW 0x5157 -#define PCI_DEVICE_ID_R200_BB 0x4242 - #define RADEON_REGSIZE 0x4000 - - #define MM_INDEX 0x0000 /* MM_INDEX bit constants */ # define MM_APER 0x80000000 Index: radeon_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon_vid.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- radeon_vid.c 9 Jan 2002 18:58:25 -0000 1.10 +++ radeon_vid.c 12 Jan 2002 11:40:39 -0000 1.11 @@ -6,6 +6,7 @@ */ #include "../../libdha/pci_ids.h" +#include "../../libdha/pci_names.h" #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -501,13 +502,7 @@ unsigned vixGetVersion( void ) { return VIDIX_VERSION; } -struct ati_card_id_s -{ - const unsigned id; - const char name[17]; -}; - -const struct ati_card_id_s ati_card_ids[]= +static unsigned short ati_card_ids[] = { #ifdef RAGE128 /* @@ -521,74 +516,71 @@ fourccs (422 and 420 formats only). */ /* Rage128 Pro GL */ - { PCI_DEVICE_ID_ATI_Rage128_PA, "R128Pro PA" }, - { PCI_DEVICE_ID_ATI_Rage128_PB, "R128Pro PB" }, - { PCI_DEVICE_ID_ATI_Rage128_PC, "R128Pro PC" }, - { PCI_DEVICE_ID_ATI_Rage128_PD, "R128Pro PD" }, - { PCI_DEVICE_ID_ATI_Rage128_PE, "R128Pro PE" }, - { PCI_DEVICE_ID_ATI_RAGE128_PF, "R128Pro PF" }, + DEVICE_ATI_RAGE_128_PA_PRO, + DEVICE_ATI_RAGE_128_PB_PRO, + DEVICE_ATI_RAGE_128_PC_PRO, + DEVICE_ATI_RAGE_128_PD_PRO, + DEVICE_ATI_RAGE_128_PE_PRO, + DEVICE_ATI_RAGE_128_PF_PRO, /* Rage128 Pro VR */ - { PCI_DEVICE_ID_ATI_RAGE128_PG, "R128Pro PG" }, - { PCI_DEVICE_ID_ATI_RAGE128_PH, "R128Pro PH" }, - { PCI_DEVICE_ID_ATI_RAGE128_PI, "R128Pro PI" }, - { PCI_DEVICE_ID_ATI_RAGE128_PJ, "R128Pro PJ" }, - { PCI_DEVICE_ID_ATI_RAGE128_PK, "R128Pro PK" }, - { PCI_DEVICE_ID_ATI_RAGE128_PL, "R128Pro PL" }, - { PCI_DEVICE_ID_ATI_RAGE128_PM, "R128Pro PM" }, - { PCI_DEVICE_ID_ATI_RAGE128_PN, "R128Pro PN" }, - { PCI_DEVICE_ID_ATI_RAGE128_PO, "R128Pro PO" }, - { PCI_DEVICE_ID_ATI_RAGE128_PP, "R128Pro PP" }, - { PCI_DEVICE_ID_ATI_RAGE128_PQ, "R128Pro PQ" }, - { PCI_DEVICE_ID_ATI_RAGE128_PR, "R128Pro PR" }, - { PCI_DEVICE_ID_ATI_RAGE128_TR, "R128Pro TR" }, - { PCI_DEVICE_ID_ATI_RAGE128_PS, "R128Pro PS" }, - { PCI_DEVICE_ID_ATI_RAGE128_PT, "R128Pro PT" }, - { PCI_DEVICE_ID_ATI_RAGE128_PU, "R128Pro PU" }, - { PCI_DEVICE_ID_ATI_RAGE128_PV, "R128Pro PV" }, - { PCI_DEVICE_ID_ATI_RAGE128_PW, "R128Pro PW" }, - { PCI_DEVICE_ID_ATI_RAGE128_PX, "R128Pro PX" }, + DEVICE_ATI_RAGE_128_PG_PRO, + DEVICE_ATI_RAGE_128_PH_PRO, + DEVICE_ATI_RAGE_128_PI_PRO, + DEVICE_ATI_RAGE_128_PJ_PRO, + DEVICE_ATI_RAGE_128_PK_PRO, + DEVICE_ATI_RAGE_128_PL_PRO, + DEVICE_ATI_RAGE_128_PM_PRO, + DEVICE_ATI_RAGE_128_PN_PRO, + DEVICE_ATI_RAGE_128_PO_PRO, + DEVICE_ATI_RAGE_128_PP_PRO, + DEVICE_ATI_RAGE_128_PQ_PRO, + DEVICE_ATI_RAGE_128_PR_PRO, + DEVICE_ATI_RAGE_128_PS_PRO, + DEVICE_ATI_RAGE_128_PT_PRO, + DEVICE_ATI_RAGE_128_PU_PRO, + DEVICE_ATI_RAGE_128_PV_PRO, + DEVICE_ATI_RAGE_128_PW_PRO, + DEVICE_ATI_RAGE_128_PX_PRO, /* Rage128 GL */ - { PCI_DEVICE_ID_ATI_RAGE128_RE, "R128 RE" }, - { PCI_DEVICE_ID_ATI_RAGE128_RF, "R128 RF" }, - { PCI_DEVICE_ID_ATI_RAGE128_RG, "R128 RG" }, - { PCI_DEVICE_ID_ATI_RAGE128_RH, "R128 RH" }, - { PCI_DEVICE_ID_ATI_RAGE128_RI, "R128 RI" }, -/* Rage128 VR */ - { PCI_DEVICE_ID_ATI_RAGE128_RK, "R128 RK" }, - { PCI_DEVICE_ID_ATI_RAGE128_RL, "R128 RL" }, - { PCI_DEVICE_ID_ATI_RAGE128_RM, "R128 RM" }, - { PCI_DEVICE_ID_ATI_RAGE128_RN, "R128 RN" }, - { PCI_DEVICE_ID_ATI_RAGE128_RO, "R128 RO" }, -/* Rage128 M3 */ - { PCI_DEVICE_ID_ATI_RAGE128_LE, "R128 M3 LE" }, - { PCI_DEVICE_ID_ATI_RAGE128_LF, "R128 M3 LF" }, -/* Rage128 Pro Ultra */ - { PCI_DEVICE_ID_ATI_RAGE128_U1, "R128Pro U1" }, - { PCI_DEVICE_ID_ATI_RAGE128_U2, "R128Pro U2" }, - { PCI_DEVICE_ID_ATI_RAGE128_U3, "R128Pro U3" } + DEVICE_ATI_RAGE_128_RE_SG, + DEVICE_ATI_RAGE_128_RF_SG, + DEVICE_ATI_RAGE_128_RG, + DEVICE_ATI_RAGE_128_RK_VR, + DEVICE_ATI_RAGE_128_RL_VR, + DEVICE_ATI_RAGE_128_SE_4X, + DEVICE_ATI_RAGE_128_SF_4X, + DEVICE_ATI_RAGE_128_SG_4X, + DEVICE_ATI_RAGE_128_4X, + DEVICE_ATI_RAGE_128_SK_4X, + DEVICE_ATI_RAGE_128_SL_4X, + DEVICE_ATI_RAGE_128_SM_4X, + DEVICE_ATI_RAGE_128_4X2, + DEVICE_ATI_RAGE_128_PRO, + DEVICE_ATI_RAGE_128_PRO2, + DEVICE_ATI_RAGE_128_PRO3 #else /* Radeons (indeed: Rage 256 Pro ;) */ - { PCI_DEVICE_ID_RADEON_QD, "Radeon QD " }, - { PCI_DEVICE_ID_RADEON_QE, "Radeon QE " }, - { PCI_DEVICE_ID_RADEON_QF, "Radeon QF " }, - { PCI_DEVICE_ID_RADEON_QG, "Radeon QG " }, - { PCI_DEVICE_ID_RADEON_QY, "Radeon VE QY " }, - { PCI_DEVICE_ID_RADEON_QZ, "Radeon VE QZ " }, - { PCI_DEVICE_ID_RADEON_LY, "Radeon M6 LY " }, - { PCI_DEVICE_ID_RADEON_LZ, "Radeon M6 LZ " }, - { PCI_DEVICE_ID_RADEON_LW, "Radeon M7 LW " }, - { PCI_DEVICE_ID_R200_QL, "Radeon2 8500 QL " }, - { PCI_DEVICE_ID_R200_BB, "Radeon2 8500 AIW" }, - { PCI_DEVICE_ID_RV200_QW, "Radeon2 7500 QW " } + DEVICE_ATI_RADEON_8500_DV, + DEVICE_ATI_RADEON_MOBILITY_M6, + DEVICE_ATI_RADEON_MOBILITY_M62, + DEVICE_ATI_RADEON_MOBILITY_M63, + DEVICE_ATI_RADEON_QD, + DEVICE_ATI_RADEON_QE, + DEVICE_ATI_RADEON_QF, + DEVICE_ATI_RADEON_QG, + DEVICE_ATI_RADEON_QL, + DEVICE_ATI_RADEON_QW, + DEVICE_ATI_RADEON_VE_QY, + DEVICE_ATI_RADEON_VE_QZ #endif }; static int find_chip(unsigned chip_id) { unsigned i; - for(i = 0;i < sizeof(ati_card_ids)/sizeof(struct ati_card_id_s);i++) + for(i = 0;i < sizeof(ati_card_ids)/sizeof(unsigned short);i++) { - if(chip_id == ati_card_ids[i].id) return i; + if(chip_id == ati_card_ids[i]) return i; } return -1; } @@ -637,18 +629,18 @@ err = ENXIO; for(i=0;i<num_pci;i++) { - if(lst[i].vendor == PCI_VENDOR_ID_ATI) + if(lst[i].vendor == VENDOR_ATI) { int idx; idx = find_chip(lst[i].device); if(idx == -1) continue; - printf(RADEON_MSG" Found chip: %s\n",ati_card_ids[idx].name); + printf(RADEON_MSG" Found chip: %s\n",pci_device_name(VENDOR_ATI,ati_card_ids[idx])); #ifndef RAGE128 - if(ati_card_ids[idx].id == PCI_DEVICE_ID_R200_QL || - ati_card_ids[idx].id == PCI_DEVICE_ID_R200_BB || - ati_card_ids[idx].id == PCI_DEVICE_ID_RV200_QW) IsR200 = 1; + if(ati_card_ids[idx] == DEVICE_ATI_RADEON_QL || + ati_card_ids[idx] == DEVICE_ATI_RADEON_8500_DV || + ati_card_ids[idx] == DEVICE_ATI_RADEON_QW) IsR200 = 1; #endif - def_cap.device_id = ati_card_ids[idx].id; + def_cap.device_id = ati_card_ids[idx]; err = 0; memcpy(&pci_info,&lst[i],sizeof(pciinfo_t)); probed=1;

1 0

CVS: main/libdha Makefile,1.2,1.3
by Nick Kurshev 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/libdha In directory mplayer:/var/tmp.root/cvs-serv4280 Modified Files: Makefile Log Message: Gawk generator Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libdha/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 7 Jan 2002 09:28:20 -0000 1.2 +++ Makefile 12 Jan 2002 11:39:07 -0000 1.3 @@ -7,7 +7,7 @@ SHORTNAME = libdha.so LIBNAME = libdha-$(VERSION).so -SRCS=libdha.c pci.c +SRCS=libdha.c pci.c pci_names.c OBJS=$(SRCS:.c=.o) CFLAGS = $(OPTFLAGS) -fPIC -I. -I.. -Wall -W @@ -25,6 +25,10 @@ all: $(LIBNAME) $(SHORTNAME) +pci_names.c: + gzip -d -c oth/pci.db.gz >pci.db + gawk -f pci_db2c.awk pci.db + test: $(CC) test.c -o test $(SHORTNAME) @@ -33,6 +37,7 @@ distclean: rm -f Makefile.bak *.o *.so test *~ .depend + rm -f pci_dev_ids.c pci_ids.h pci_names.c pci_names.h pci_vendors.h pci.db dep: depend

1 0