commit libraw1394

Hello community, here is the log from the commit of package libraw1394 checked in at Wed Apr 2 22:03:25 CEST 2008. -------- --- libraw1394/libraw1394.changes 2007-08-04 17:22:45.000000000 +0200 +++ libraw1394/libraw1394.changes 2008-03-18 21:00:09.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Mar 18 20:58:03 CET 2008 - crrodriguez@suse.de + +- remove pointless libtool archive with empty dependency_libs +- remove static libraries +- update to version 1.3.0 + * added raw1394_read_cycle_timer() as used by FFADO project. + * added support for environment variable RAW1394DEV to override default device node /dev/raw1394. + * added --with-valgrind to configure script. other optimizations and bugfixes - see ChangeLog. + +------------------------------------------------------------------- Old: ---- libraw1394-1.2.1.tar.bz2 New: ---- libraw1394-1.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libraw1394.spec ++++++ --- /var/tmp/diff_new_pack.xo8155/_old 2008-04-02 21:53:24.000000000 +0200 +++ /var/tmp/diff_new_pack.xo8155/_new 2008-04-02 21:53:24.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libraw1394 (Version 1.2.1) +# spec file for package libraw1394 (Version 1.3.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,12 +10,13 @@ # norootforbuild + Name: libraw1394 -Version: 1.2.1 -Release: 53 -License: LGPL v2 or later +Version: 1.3.0 +Release: 1 +License: LGPL v2.1 or later Summary: A Firewire Interface -URL: http://www.linux1394.org/ +Url: http://www.linux1394.org/ Group: System/Kernel BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.linux1394.org/files/libraw1394/%{name}-%{version}.tar.bz2 @@ -41,6 +42,7 @@ Andreas Bombe %package 8 +License: LGPL v2.1 or later Summary: A Firewire Interface Group: System/Kernel @@ -62,11 +64,11 @@ Andreas Bombe %package devel +License: LGPL v2.1 or later Summary: Development and Include Files for libraw1394 Summary(pt_BR): Arquivos de desenvolvimento e cabe�alhos para o libraw1394 Group: Development/Libraries/C and C++ -Requires: %{name}-8 == %{version} -AutoProv: no +Requires: %{name}-8 == %{version} glibc-devel %description devel Libraw1394 is the only supported interface to the kernel side raw1394 @@ -97,18 +99,15 @@ %patch11 -p1 %build -%{?suse_update_config -ft} autoreconf --force --install export CFLAGS="%optflags" -./configure --prefix=/usr \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} +%configure --disable-static --with-pic %{__make} %{?jobs:-j%jobs} all %install -rm -rf $RPM_BUILD_ROOT -mkdir $RPM_BUILD_ROOT %{__make} install DESTDIR=%{buildroot} +# empty dependency libs +rm -f %{buildroot}%{_libdir}/libraw1394.la %clean rm -rf $RPM_BUILD_ROOT @@ -124,58 +123,62 @@ %{_bindir}/dumpiso %{_bindir}/sendiso %{_bindir}/mpg1394grab -%doc %{_mandir}/man*/* +%{_mandir}/man*/* %files 8 %defattr(-,root,root) -%{_libdir}/libraw1394.so.* +%{_libdir}/libraw1394.so.8* %files devel %defattr(-,root,root) %{_includedir}/libraw1394 -%defattr(644,root,root) -%{_libdir}/libraw1394.la -%{_libdir}/libraw1394.a %{_libdir}/libraw1394.so %{_libdir}/pkgconfig/libraw1394.pc %changelog -* Sat Aug 04 2007 - olh@suse.de +* Tue Mar 18 2008 crrodriguez@suse.de +- remove pointless libtool archive with empty dependency_libs +- remove static libraries +- update to version 1.3.0 + * added raw1394_read_cycle_timer() as used by FFADO project. + * added support for environment variable RAW1394DEV to override default device node /dev/raw1394. + * added --with-valgrind to configure script. other optimizations and bugfixes - see ChangeLog. +* Sat Aug 04 2007 olh@suse.de - remove isodump.5 man page split libraw1394-8 package which contains only libraries -* Mon Jan 29 2007 - olh@suse.de +* Mon Jan 29 2007 olh@suse.de - add mpg1394grab (#236537) -* Tue Jul 18 2006 - olh@suse.de +* Tue Jul 18 2006 olh@suse.de - update to version 1.2.1 generate compiler warnings on deprecated functions (legacy isochronous). bugfixes and optimizations. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jul 01 2005 - olh@suse.de +* Fri Jul 01 2005 olh@suse.de - update to version 1.2.0 add bugfix stalling on iso transmission underflow -* Tue Jan 11 2005 - olh@suse.de +* Tue Jan 11 2005 olh@suse.de - update to version 1.1.0 -* Mon Mar 08 2004 - lmuelle@suse.de +* Mon Mar 08 2004 lmuelle@suse.de - update to version 0.10.1 -* Fri Feb 20 2004 - kkaempf@suse.de +* Fri Feb 20 2004 kkaempf@suse.de - adapt aclocal definitions to automake 1.8.x (#34793) -* Sun Jan 11 2004 - adrian@suse.de +* Sun Jan 11 2004 adrian@suse.de - add %%run_ldconfig -* Mon Jan 27 2003 - kukuk@suse.de +* Mon Jan 27 2003 kukuk@suse.de - Move .so symlinks into -devel package [Bug #22382] -* Sun Jan 12 2003 - aj@suse.de +* Sun Jan 12 2003 aj@suse.de - Fix multiline strings. -* Thu Jun 20 2002 - ro@suse.de +* Thu Jun 20 2002 ro@suse.de - run autoreconf -* Thu Jun 06 2002 - bk@suse.de +* Thu Jun 06 2002 bk@suse.de - fix defattr properly(for perms of includedir, mandir, docdir) - never ever include %%{_mandir}/* (dirs!) into package filelist - fix rpm license tag to LGPL and add URL tag und use optflags -* Tue May 28 2002 - lmuelle@suse.de +* Tue May 28 2002 lmuelle@suse.de - fixed directory permissions of includedir -* Tue Feb 26 2002 - kraxel@suse.de +* Tue Feb 26 2002 kraxel@suse.de - added automake m4 file to devel package file list - fixed s390x build failure -* Sat Sep 22 2001 - bjacke@suse.de +* Sat Sep 22 2001 bjacke@suse.de - initial build: version 0.9.0 ++++++ libraw1394-1.2.1.tar.bz2 -> libraw1394-1.3.0.tar.bz2 ++++++ ++++ 26108 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/AUTHORS new/libraw1394-1.3.0/AUTHORS --- old/libraw1394-1.2.1/AUTHORS 2004-11-10 04:06:27.000000000 +0100 +++ new/libraw1394-1.3.0/AUTHORS 2007-10-14 04:21:40.000000000 +0200 @@ -8,3 +8,4 @@ Christian Toegel Dan Maas Ben Collins +Pieter Palmers diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/ChangeLog new/libraw1394-1.3.0/ChangeLog --- old/libraw1394-1.2.1/ChangeLog 2006-04-09 04:46:42.000000000 +0200 +++ new/libraw1394-1.3.0/ChangeLog 2007-10-14 04:28:24.000000000 +0200 @@ -1,4 +1,28 @@ ------------------------------------------------------------------------ +r172 | ddennedy | 2007-05-29 22:11:30 -0700 (Tue, 29 May 2007) | 1 line + +Apply patch from Jon Schewe to make valgrind happy. Adds --with-valgrind configure option. +------------------------------------------------------------------------ +r171 | ddennedy | 2007-02-16 18:30:13 -0800 (Fri, 16 Feb 2007) | 1 line + +add documentation about existence of RAW1394DEV +------------------------------------------------------------------------ +r170 | ddennedy | 2007-02-16 18:24:16 -0800 (Fri, 16 Feb 2007) | 1 line + +add support for RAW1394DEV environment variable to override default /dev/raw1394, but also attempt to failover to default. +------------------------------------------------------------------------ +r169 | ddennedy | 2007-02-13 21:29:18 -0800 (Tue, 13 Feb 2007) | 1 line + +added raw1394_read_cycle_timer, contributed by Pieter Palmers +------------------------------------------------------------------------ +r168 | ddennedy | 2006-10-16 20:39:37 -0700 (Mon, 16 Oct 2006) | 1 line + +bugfix segfault in raw1394_iso_shutdown on no iso activity due to not initializing raw1394_handle.iso_packet_infos to NULL in raw1394_new_handle +------------------------------------------------------------------------ +r167 | ddennedy | 2006-05-08 21:27:38 -0700 (Mon, 08 May 2006) | 1 line + +apply optimization patch from Pieter Palmers that removes modulo operator from high frequency isochronous code +------------------------------------------------------------------------ r165 | ddennedy | 2006-04-08 19:25:22 -0700 (Sat, 08 Apr 2006) | 1 line cleanup some compiler warnings diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/config.h.in new/libraw1394-1.3.0/config.h.in --- old/libraw1394-1.2.1/config.h.in 2006-04-09 04:27:03.000000000 +0200 +++ new/libraw1394-1.3.0/config.h.in 2007-10-14 04:17:07.000000000 +0200 @@ -30,6 +30,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_VALGRIND_VALGRIND_H + /* Name of package */ #undef PACKAGE @@ -48,7 +51,7 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* The size of a `void *', as computed by sizeof. */ +/* The size of `void *', as computed by sizeof. */ #undef SIZEOF_VOID_P /* Define to 1 if you have the ANSI C header files. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/configure.ac new/libraw1394-1.3.0/configure.ac --- old/libraw1394-1.2.1/configure.ac 2005-06-22 22:12:08.000000000 +0200 +++ new/libraw1394-1.3.0/configure.ac 2007-05-30 07:32:37.000000000 +0200 @@ -1,6 +1,6 @@ # process this file with autoconf to get a configure script -AC_INIT(libraw1394, 1.2.1) +AC_INIT(libraw1394, 1.3.0) AC_CONFIG_SRCDIR(src/raw1394.h) AM_CONFIG_HEADER(config.h) @@ -16,14 +16,19 @@ AC_C_BIGENDIAN # set the libtool so version numbers -lt_major=9 -lt_revision=1 -lt_age=1 +lt_major=10 +lt_revision=0 +lt_age=2 AC_SUBST(lt_major) AC_SUBST(lt_revision) AC_SUBST(lt_age) +dnl Check to see if valgrind is available +AC_ARG_WITH(valgrind, AC_HELP_STRING([--with-valgrind],[compile with valgrind support])) +if test x$with_valgrind = xyes ; then + AC_CHECK_HEADERS(valgrind/valgrind.h) +fi #CFLAGS=${CFLAGS:-"-Wall"} AC_OUTPUT([ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/libraw1394.pc new/libraw1394-1.3.0/libraw1394.pc --- old/libraw1394-1.2.1/libraw1394.pc 2006-04-09 04:27:40.000000000 +0200 +++ new/libraw1394-1.3.0/libraw1394.pc 2007-10-14 04:17:27.000000000 +0200 @@ -5,6 +5,6 @@ Name: libraw1394 Description: Interface library for the Linux IEEE1394 drivers. -Version: 1.2.1 +Version: 1.3.0 Libs: -L${libdir} -lraw1394 Cflags: -I${includedir} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/libraw1394.spec new/libraw1394-1.3.0/libraw1394.spec --- old/libraw1394-1.2.1/libraw1394.spec 2006-04-09 04:27:40.000000000 +0200 +++ new/libraw1394-1.3.0/libraw1394.spec 2007-10-14 04:17:27.000000000 +0200 @@ -1,13 +1,13 @@ %define prefix /usr Name: libraw1394 -Version: 1.2.1 +Version: 1.3.0 Release: 1 Copyright: LGPL Group: Libraries -Source: http://linux1394.org/libraw1394/libraw1394-1.2.1.tar.gz +Source: http://linux1394.org/libraw1394/libraw1394-1.3.0.tar.gz URL: http://linux1394.org -BuildRoot: /var/tmp/libraw1394-1.2.1-root +BuildRoot: /var/tmp/libraw1394-1.3.0-root Summary: Streaming library for IEEE1394 BuildRequires: openjade diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/missing new/libraw1394-1.3.0/missing --- old/libraw1394-1.2.1/missing 2006-04-09 04:27:06.000000000 +0200 +++ new/libraw1394-1.3.0/missing 2007-10-14 04:17:09.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/NEWS new/libraw1394-1.3.0/NEWS --- old/libraw1394-1.2.1/NEWS 2006-04-09 04:25:01.000000000 +0200 +++ new/libraw1394-1.3.0/NEWS 2007-10-14 04:15:25.000000000 +0200 @@ -1,3 +1,12 @@ +libraw1394 Release Notes + +Version 1.3.0: +- added raw1394_read_cycle_timer() as used by FFADO project. +- added support for environment variable RAW1394DEV to override default + device node /dev/raw1394. +- added --with-valgrind to configure script. +- other optimizations and bugfixes - see ChangeLog. + Version 1.2.1: - generate compiler warnings on deprecated functions (legacy isochronous). - bugfixes and optimizations. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/src/ieee1394-ioctl.h new/libraw1394-1.3.0/src/ieee1394-ioctl.h --- old/libraw1394-1.2.1/src/ieee1394-ioctl.h 2004-01-31 21:26:07.000000000 +0100 +++ new/libraw1394-1.3.0/src/ieee1394-ioctl.h 2007-02-12 06:15:25.000000000 +0100 @@ -1,5 +1,7 @@ -/* Base file for all ieee1394 ioctl's. Linux-1394 has allocated base '#' - * with a range of 0x00-0x3f. */ +/* + * Base file for all ieee1394 ioctl's. + * Linux-1394 has allocated base '#' with a range of 0x00-0x3f. + */ #ifndef __IEEE1394_IOCTL_H #define __IEEE1394_IOCTL_H @@ -7,14 +9,6 @@ #include #include - -/* AMDTP Gets 6 */ -#define AMDTP_IOC_CHANNEL _IOW('#', 0x00, struct amdtp_ioctl) -#define AMDTP_IOC_PLUG _IOW('#', 0x01, struct amdtp_ioctl) -#define AMDTP_IOC_PING _IOW('#', 0x02, struct amdtp_ioctl) -#define AMDTP_IOC_ZAP _IO ('#', 0x03) - - /* DV1394 Gets 10 */ /* Get the driver ready to transmit video. pass a struct dv1394_init* as @@ -104,8 +98,9 @@ _IOW ('#', 0x27, struct raw1394_iso_packets) #define RAW1394_IOC_ISO_XMIT_SYNC \ _IO ('#', 0x28) -#define RAW1394_IOC_ISO_RECV_FLUSH \ +#define RAW1394_IOC_ISO_RECV_FLUSH \ _IO ('#', 0x29) - +#define RAW1394_IOC_GET_CYCLE_TIMER \ + _IOR ('#', 0x30, struct raw1394_cycle_timer) #endif /* __IEEE1394_IOCTL_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/src/iso.c new/libraw1394-1.3.0/src/iso.c --- old/libraw1394-1.2.1/src/iso.c 2006-04-09 04:02:31.000000000 +0200 +++ new/libraw1394-1.3.0/src/iso.c 2007-02-12 06:15:25.000000000 +0100 @@ -22,6 +22,18 @@ #include "kernel-raw1394.h" #include "raw1394_private.h" +/* This implements + x = (x+1) % n + using a branch based implementation + */ +static inline int increment_and_wrap(int x, int n) +{ + ++x; + if (x >= n) + x = 0; + return x; +} + /* old ISO API - kept for backwards compatibility */ static int do_iso_listen(struct raw1394_handle *handle, int channel) @@ -328,9 +340,9 @@ /* advance packet cursors and cycle counter */ stat->n_packets--; - handle->next_packet = (handle->next_packet + 1) % stat->config.buf_packets; + handle->next_packet = increment_and_wrap(handle->next_packet, stat->config.buf_packets); if(stat->xmit_cycle != -1) - stat->xmit_cycle = (stat->xmit_cycle + 1) % 8000; + stat->xmit_cycle = increment_and_wrap(stat->xmit_cycle, 8000); packets.n_packets++; if(disp == RAW1394_ISO_DEFER) { @@ -416,9 +428,9 @@ return -1; stat->n_packets--; - handle->next_packet = (handle->next_packet + 1) % stat->config.buf_packets; + handle->next_packet = increment_and_wrap(handle->next_packet, stat->config.buf_packets); if(stat->xmit_cycle != -1) - stat->xmit_cycle = (stat->xmit_cycle + 1) % 8000; + stat->xmit_cycle = increment_and_wrap(stat->xmit_cycle, 8000); return 0; } @@ -486,6 +498,20 @@ handle->iso_mode = ISO_INACTIVE; } +int raw1394_read_cycle_timer(raw1394handle_t handle, + u_int32_t *cycle_timer, u_int64_t *local_time) +{ + int err; + struct raw1394_cycle_timer ctr = { 0 }; + + err = ioctl(handle->fd, RAW1394_IOC_GET_CYCLE_TIMER, &ctr); + if (!err) { + *cycle_timer = ctr.cycle_timer; + *local_time = ctr.local_time; + } + return err; +} + static int _raw1394_iso_recv_packets(raw1394handle_t handle) { struct raw1394_iso_status *stat = &handle->iso_status; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/src/kernel-raw1394.h new/libraw1394-1.3.0/src/kernel-raw1394.h --- old/libraw1394-1.2.1/src/kernel-raw1394.h 2004-11-06 01:26:44.000000000 +0100 +++ new/libraw1394-1.3.0/src/kernel-raw1394.h 2007-02-14 06:42:44.000000000 +0100 @@ -177,4 +177,14 @@ __s16 xmit_cycle; }; +/* argument to RAW1394_IOC_GET_CYCLE_TIMER ioctl */ +struct raw1394_cycle_timer { + /* contents of Isochronous Cycle Timer register, + as in OHCI 1.1 clause 5.13 (also with non-OHCI hosts) */ + __u32 cycle_timer; + + /* local time in microseconds since Epoch, + simultaneously read with cycle timer */ + __u64 local_time; +}; #endif /* IEEE1394_RAW1394_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/src/main.c new/libraw1394-1.3.0/src/main.c --- old/libraw1394-1.2.1/src/main.c 2005-02-16 17:17:38.000000000 +0100 +++ new/libraw1394-1.3.0/src/main.c 2007-02-17 03:43:44.000000000 +0100 @@ -103,7 +103,7 @@ } if (req.error) { - errno = 0; + errno = EPROTO; return -1; } memset(h->buffer, 0, HBUF_SIZE); @@ -115,6 +115,7 @@ struct raw1394_handle *raw1394_new_handle(void) { struct raw1394_handle *handle; + const char *defaultDevice = "/dev/raw1394"; handle = malloc(sizeof(struct raw1394_handle)); if (!handle) { @@ -122,17 +123,31 @@ return NULL; } - handle->fd = open("/dev/raw1394", O_RDWR); + handle->fd = open(getenv("RAW1394DEV") ? getenv("RAW1394DEV"): defaultDevice, O_RDWR); if (handle->fd < 0) { - free(handle); - return NULL; + /* failover to default in attempt to idiot proof */ + handle->fd = open(defaultDevice, O_RDWR); + if (handle->fd < 0) { + free(handle); + return NULL; + } } handle->generation = init_rawdevice(handle); if (handle->generation == -1) { + /* failover to default in attempt to idiot proof */ close(handle->fd); - free(handle); - return NULL; + handle->fd = open(defaultDevice, O_RDWR); + if (handle->fd < 0) { + free(handle); + return NULL; + } + handle->generation = init_rawdevice(handle); + if (handle->generation == -1) { + close(handle->fd); + free(handle); + return NULL; + } } handle->err = 0; @@ -140,8 +155,9 @@ handle->tag_handler = tag_handler_default; handle->arm_tag_handler = arm_tag_handler_default; memset(handle->iso_handler, 0, sizeof(handle->iso_handler)); - handle->iso_buffer = NULL; - handle->iso_mode = ISO_INACTIVE; + handle->iso_buffer = NULL; + handle->iso_mode = ISO_INACTIVE; + handle->iso_packet_infos = NULL; return handle; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/src/raw1394.h new/libraw1394-1.3.0/src/raw1394.h --- old/libraw1394-1.2.1/src/raw1394.h 2006-03-04 02:25:13.000000000 +0100 +++ new/libraw1394-1.3.0/src/raw1394.h 2007-10-14 04:24:08.000000000 +0200 @@ -118,7 +118,6 @@ RAW1394_MODIFY_FREE }; - #ifdef __cplusplus extern "C" { #endif @@ -328,6 +327,25 @@ **/ void raw1394_iso_shutdown(raw1394handle_t handle); +/** + * raw1394_get_cycle_timer - get the current value of the cycle timer + * @handle: libraw1394 handle + * @cycle_timer: buffer for Isochronous Cycle Timer + * @local_time: buffer for local system time in microseconds since Epoch + * + * Simultaneously reads the cycle timer register together with the system clock. + * + * Format of @cycle_timer, from MSB to LSB: 7 bits cycleSeconds (seconds, or + * number of cycleCount rollovers), 13 bits cycleCount (isochronous cycles, or + * cycleOffset rollovers), 12 bits cycleOffset (24.576 MHz clock ticks, not + * provided on some hardware). The union of cycleSeconds and cycleCount is the + * current cycle number. The nominal duration of a cycle is 125 microseconds. + * + * Returns: the error code of the ioctl, or 0 if successful. + **/ +int raw1394_read_cycle_timer(raw1394handle_t handle, + u_int32_t *cycle_timer, u_int64_t *local_time); + typedef int raw1394_errcode_t; #define raw1394_make_errcode(ack, rcode) (((ack) << 16) | rcode) #define raw1394_internal_err(errcode) ((errcode) < 0) @@ -380,9 +398,14 @@ * processes. It is allowed to create and use multiple handles, however. Use * one handle per thread which needs it in the multithreaded case. * + * The default device node is /dev/raw1394, but one can override the default + * by setting environment variable RAW1394DEV. However, if RAW1394DEV points to + * a non-existant or invalid device node, then it also attempts to open the + * default device node. + * * Returns: the created handle or %NULL when initialization fails. In the latter - * case errno either contains some OS specific error code or %0 if the error is - * that libraw1394 and raw1394 don't support each other's protocol versions. + * case errno either contains some OS specific error code or EPROTO if + * libraw1394 and raw1394 don't support each other's protocol versions. **/ raw1394handle_t raw1394_new_handle(void); @@ -406,6 +429,11 @@ * command-line programs that already know what port they want. If * raw1394_set_port() returns ESTALE, retries automatically. * + * The default device node is /dev/raw1394, but one can override the default + * by setting environment variable RAW1394DEV. However, if RAW1394DEV points to + * a non-existant or invalid device node, then it also attempts to open the + * default device node. + * * Returns: the new handle on success or NULL on failure **/ raw1394handle_t raw1394_new_handle_on_port(int port); @@ -1124,7 +1152,7 @@ * raw1394_update_config_rom - updates the configuration ROM of a host * @handle: libraw1394 handle * @new_rom: a pointer to the new ROM image - * @size: the size of the new ROM image in quadlets + * @size: the size of the new ROM image in bytes * @rom_version: the version numer of the current version, not the new * * @rom_version must be the current diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libraw1394-1.2.1/src/readwrite.c new/libraw1394-1.3.0/src/readwrite.c --- old/libraw1394-1.2.1/src/readwrite.c 2004-11-11 00:39:00.000000000 +0100 +++ new/libraw1394-1.3.0/src/readwrite.c 2007-05-30 07:05:53.000000000 +0200 @@ -30,6 +30,15 @@ #include "kernel-raw1394.h" #include "raw1394_private.h" +#if HAVE_VALGRIND_VALGRIND_H +# include +# ifndef VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE +#  define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(m, n) do {} while(0) +# endif +#else +# define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(m, n) do {} while(0) +#endif + int raw1394_start_read(struct raw1394_handle *handle, nodeid_t node, nodeaddr_t addr, size_t length, quadlet_t *buffer, @@ -218,13 +227,16 @@ &sd }; \ int err = 0 -#define SYNCFUNC_BODY \ +#define SYNCFUNC_BODY_WO_RETURN \ while (!sd.done) { \ if (err < 0) return err; \ err = raw1394_loop_iterate(handle); \ } \ handle->err = sd.errcode; \ - errno = raw1394_errcode_to_errno(sd.errcode); \ + errno = raw1394_errcode_to_errno(sd.errcode); + +#define SYNCFUNC_BODY \ + SYNCFUNC_BODY_WO_RETURN \ return (errno ? -1 : 0) int raw1394_read(struct raw1394_handle *handle, nodeid_t node, nodeaddr_t addr, @@ -235,7 +247,12 @@ err = raw1394_start_read(handle, node, addr, length, buffer, (unsigned long)&rh); - SYNCFUNC_BODY; + SYNCFUNC_BODY_WO_RETURN; + if(!errno) { + VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(buffer, length); + } + + return (errno ? -1 : 0); } int raw1394_write(struct raw1394_handle *handle, nodeid_t node, nodeaddr_t addr, @@ -258,7 +275,12 @@ err = raw1394_start_lock(handle, node, addr, extcode, data, arg, result, (unsigned long)&rh); - SYNCFUNC_BODY; + SYNCFUNC_BODY_WO_RETURN; + if(!errno) { + VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(result, sizeof(quadlet_t)); + } + + return (errno ? -1 : 0); } int raw1394_lock64(struct raw1394_handle *handle, nodeid_t node, nodeaddr_t addr, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org