rpms/libraw1394/devel libraw1394-juju-bitfield-update.patch, NONE, 1.1 libraw1394.spec, 1.38, 1.39 firewire-cdev.h, 1.3, NONE

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/libraw1394/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32495

Modified Files:
	libraw1394.spec 
Added Files:
	libraw1394-juju-bitfield-update.patch 
Removed Files:
	firewire-cdev.h 
Log Message:
* Wed Jan 30 2008 Jarod Wilson <jwilson at redhat.com> - 1.3.0-4
- Use firewire-cdev.h provided by kernel-headers


libraw1394-juju-bitfield-update.patch:

--- NEW FILE libraw1394-juju-bitfield-update.patch ---
diff -Naurp libraw1394-1.3.0/juju/juju.h libraw1394-1.3.0.bitfield/juju/juju.h
--- libraw1394-1.3.0/juju/juju.h	2007-10-24 16:47:26.000000000 -0400
+++ libraw1394-1.3.0.bitfield/juju/juju.h	2007-10-24 16:50:47.000000000 -0400
@@ -29,8 +29,6 @@
 #include "../src/csr.h"
 #include "config.h"
 
-#define ACK_COMPLETE 1
-
 #define ptr_to_u64(p) ((__u64)(unsigned long)(p))
 #define u64_to_ptr(p) ((void *)(unsigned long)(p))
 
diff -Naurp libraw1394-1.3.0/juju/raw1394-iso.c libraw1394-1.3.0.bitfield/juju/raw1394-iso.c
--- libraw1394-1.3.0/juju/raw1394-iso.c	2007-10-24 16:47:26.000000000 -0400
+++ libraw1394-1.3.0.bitfield/juju/raw1394-iso.c	2007-10-24 16:53:06.000000000 -0400
@@ -40,13 +40,14 @@ queue_packet(raw1394handle_t handle,
 	int err;
 
 	p = &handle->iso.packets[handle->iso.packet_index];
-	p->payload_length = length;
-	p->interrupt =
-		handle->iso.packet_phase == handle->iso.irq_interval - 1;
-	p->skip = 0;
-	p->tag = tag;
-	p->sy = sy;
-	p->header_length = header_length;
+	p->control =
+		FW_CDEV_ISO_PAYLOAD_LENGTH(length) |
+		FW_CDEV_ISO_TAG(tag) |
+		FW_CDEV_ISO_SY(sy) |
+		FW_CDEV_ISO_HEADER_LENGTH(header_length);
+
+	if (handle->iso.packet_phase == handle->iso.irq_interval - 1)
+		p->control |= FW_CDEV_ISO_INTERRUPT;
 
 	handle->iso.head += length;
 	handle->iso.packet_count++;
@@ -291,12 +292,7 @@ int raw1394_iso_xmit_sync(raw1394handle_
 	struct fw_cdev_queue_iso queue_iso;
 	int len;
 
-	skip.payload_length = 0;
-	skip.interrupt = 1;
-	skip.skip = 1;
-	skip.tag = 0;
-	skip.sy = 0;
-	skip.header_length = 0;
+	skip.control = FW_CDEV_ISO_INTERRUPT | FW_CDEV_ISO_SKIP;
 
 	queue_iso.packets = ptr_to_u64(&skip);
 	queue_iso.size    = sizeof skip;


Index: libraw1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libraw1394.spec	24 Oct 2007 20:10:53 -0000	1.38
+++ libraw1394.spec	30 Jan 2008 19:52:39 -0000	1.39
@@ -1,18 +1,18 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
 Version:        1.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
 URL:            http://www.linux1394.org/
 ExcludeArch:    s390 s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	autoconf automake libtool
+BuildRequires:	autoconf automake libtool kernel-headers
 
-Source1:        firewire-cdev.h
 Patch0:         libraw1394-juju.patch
 Patch1:         libraw1394-juju-no-double-free-on-shutdown.patch
+Patch2:         libraw1394-juju-bitfield-update.patch
 
 %description
 The libraw1394 library provides direct access to the IEEE-1394 bus through
@@ -31,14 +31,9 @@
 
 %patch0 -p1 -b .juju
 %patch1 -p1 -b .free
+%patch2 -p1 -b .bitf
 
 %build
-
-if test ! -e %{_builddir}/linux/firewire-cdev.h; then
-	mkdir %{_builddir}/linux
-	cp %{_sourcedir}/firewire-cdev.h %{_builddir}/linux
-fi
-
 aclocal
 autoheader
 autoconf
@@ -79,8 +74,12 @@
 
 
 %changelog
+* Wed Jan 30 2008 Jarod Wilson <jwilson at redhat.com> - 1.3.0-4
+- Use firewire-cdev.h provided by kernel-headers
+
 * Wed Oct 24 2007 Jarod Wilson <jwilson at redhat.com> - 1.3.0-3
-- Update firewire-cdev.h to match kernel
+- Update firewire-cdev.h to match kernel and eliminate
+  bitfield usage, fixes capture on big-endian systems (#345221)
 
 * Fri Oct 19 2007 Jarod Wilson <jwilson at redhat.com> - 1.3.0-2
 - Fix the 'double free' crash on shutdown (#328011)


--- firewire-cdev.h DELETED ---