peter
/
libraw1394
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update the juju implementation to follow the recent bitfield changes.

This commit is contained in:
Kristian Høgsberg 2007-06-13 18:31:59 -04:00
parent fcba731c21
commit 78a77758c7
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
juju/juju.h
View File

@ -29,8 +29,6 @@
#include "../src/csr.h" #include "../src/csr.h"
#include "config.h" #include "config.h"
#define ACK_COMPLETE 1
#define ptr_to_u64(p) ((__u64)(unsigned long)(p)) #define ptr_to_u64(p) ((__u64)(unsigned long)(p))
#define u64_to_ptr(p) ((void *)(unsigned long)(p)) #define u64_to_ptr(p) ((void *)(unsigned long)(p))

23
juju/raw1394-iso.c
View File

@ -40,13 +40,14 @@ queue_packet(raw1394handle_t handle,
int err; int err;
p = &handle->iso.packets[handle->iso.packet_index]; p = &handle->iso.packets[handle->iso.packet_index];
p->payload_length = length; p->control =
p->interrupt = FW_CDEV_ISO_PAYLOAD_LENGTH(length) |
handle->iso.packet_phase == handle->iso.irq_interval - 1; FW_CDEV_ISO_TAG(tag) |
p->skip = 0; FW_CDEV_ISO_SY(sy) |
p->tag = tag; FW_CDEV_ISO_HEADER_LENGTH(header_length);
p->sy = sy;
p->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.head += length;
handle->iso.packet_count++; handle->iso.packet_count++;
@ -291,13 +292,7 @@ int raw1394_iso_xmit_sync(raw1394handle_t handle)
struct fw_cdev_queue_iso queue_iso; struct fw_cdev_queue_iso queue_iso;
int len; int len;
skip.payload_length = 0; skip.control = FW_CDEV_ISO_INTERRUPT | FW_CDEV_ISO_SKIP;
skip.interrupt = 1;
skip.skip = 1;
skip.tag = 0;
skip.sy = 0;
skip.header_length = 0;
queue_iso.packets = ptr_to_u64(&skip); queue_iso.packets = ptr_to_u64(&skip);
queue_iso.size = sizeof skip; queue_iso.size = sizeof skip;
queue_iso.data = 0; queue_iso.data = 0;