summaryrefslogtreecommitdiffstats
path: root/juju
diff options
context:
space:
mode:
authorGravatar Jay Fenlason 2007-04-12 14:39:24 -0400
committerGravatar Kristian Høgsberg 2007-04-12 14:39:24 -0400
commitc896d53c9932b612407c4b197d3ba1b03bfef055 (patch)
treec9f74d1546c04280071b8d92828a3a88fcf6a408 /juju
parentUse power-of-two max packet sizes. (diff)
Use correct payload size for two-operand lock transactions.
Diffstat (limited to 'juju')
-rw-r--r--juju/raw1394.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/juju/raw1394.c b/juju/raw1394.c
index 56bd104..7f73b3b 100644
--- a/juju/raw1394.c
+++ b/juju/raw1394.c
@@ -1066,7 +1066,7 @@ setup_lock(int extcode, quadlet_t data, quadlet_t arg, quadlet_t *buffer)
case RAW1394_EXTCODE_WRAP_ADD:
buffer[0] = arg;
buffer[1] = data;
- return sizeof buffer;
+ return 2 * sizeof buffer[0];
default:
errno = EINVAL;
@@ -1089,7 +1089,7 @@ setup_lock64(int extcode, octlet_t data, octlet_t arg, octlet_t *buffer)
case RAW1394_EXTCODE_WRAP_ADD:
buffer[0] = arg;
buffer[1] = data;
- return sizeof buffer;
+ return 2 * sizeof buffer[0];
default:
errno = EINVAL;
000'>2003-01-15implement tag matching for rawiso receptionGravatar dmaas 3-4/+12 git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@101 53a565d1-3bb7-0310-b661-cf11e63c67ab 2003-01-06back out previous commit - don't drop the legacy API just yetGravatar dmaas 6-173/+130 git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@100 53a565d1-3bb7-0310-b661-cf11e63c67ab 2003-01-05emulate legacy ISO reception API on top of new rawiso APIGravatar dmaas 7-131/+174 git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@99 53a565d1-3bb7-0310-b661-cf11e63c67ab 2002-12-24update iso API for multi-channel reception and new packet buffer layoutGravatar dmaas 4-123/+236 git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@98 53a565d1-3bb7-0310-b661-cf11e63c67ab 2002-12-20oops, irq_interval needs to be signedGravatar anonymous 1-1/+1 git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@97 53a565d1-3bb7-0310-b661-cf11e63c67ab 2002-12-20dmaas - renamed exported arm definitions into the raw1394_ namespace; ↵Gravatar anonymous 3-124/+48 brought kernel-raw1394.h back in sync with the kernel version git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@96 53a565d1-3bb7-0310-b661-cf11e63c67ab 2002-12-16rawiso updates:Gravatar dmaas 3-18/+25 - changed return type of rawiso xmit/recv handlers from int to enum raw1394_iso_disposition - added an ioctl (RAW1394_ISO_QUEUE_ACTIVITY) to force an ISO_ACTIVITY event into the queue. This is needed for handling RAW1394_ISO_DEFER, to kick us out of the next read() instead of sleeping forever. - removed references to "8-byte" isochronous header - this is an OHCI-specific implementation detail git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@95 53a565d1-3bb7-0310-b661-cf11e63c67ab 2002-11-18fix cplusplus extern C blockGravatar ddennedy 1-4/+4 git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@94 53a565d1-3bb7-0310-b661-cf11e63c67ab 2002-11-18merged rawiso branchGravatar ddennedy 7-6/+488 git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@93 53a565d1-3bb7-0310-b661-cf11e63c67ab