rpms/libraw1394/F-8 libraw1394-juju-bitfield-update.patch,NONE,1.1

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/libraw1394/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17988

Added Files:
	libraw1394-juju-bitfield-update.patch 
Log Message:
duh, helps to add the new patch to cvs if you want koji to build it...

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;