diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-01 08:28:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-01 08:28:15 -0700 |
| commit | f285e3d329ce68cc355fadf4ab2c8f34d7f264cb (patch) | |
| tree | a40ae43a277bedeec732fd20eee166990974fb58 /include | |
| parent | c1a834dc704763673df10282995257f2de93cbe9 (diff) | |
| parent | ca9a7af35f1ce4a990c6c3aace65ed36f89d50bf (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: Install firewire-constants.h and firewire-cdev.h for userspace.
firewire: Change struct fw_cdev_iso_packet to not use bitfields.
firewire: Implement suspend/resume PCI driver hooks.
firewire: add to MAINTAINERS
firewire: fw-sbp2: implement sysfs ieee1394_id
ieee1394: sbp2: offer SAM-conforming target port ID in sysfs
ieee1394: fix calculation of sysfs attribute "address"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/Kbuild | 2 | ||||
| -rw-r--r-- | include/linux/firewire-cdev.h | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index e1013156c25..f317c270d4b 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -62,6 +62,8 @@ header-y += fadvise.h header-y += fd.h header-y += fdreg.h header-y += fib_rules.h +header-y += firewire-cdev.h +header-y += firewire-constants.h header-y += fuse.h header-y += genetlink.h header-y += gen_stats.h diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h index d4455eb2ae3..efbe1fda1a2 100644 --- a/include/linux/firewire-cdev.h +++ b/include/linux/firewire-cdev.h @@ -198,13 +198,15 @@ struct fw_cdev_create_iso_context { __u32 handle; }; +#define FW_CDEV_ISO_PAYLOAD_LENGTH(v) (v) +#define FW_CDEV_ISO_INTERRUPT (1 << 16) +#define FW_CDEV_ISO_SKIP (1 << 17) +#define FW_CDEV_ISO_TAG(v) ((v) << 18) +#define FW_CDEV_ISO_SY(v) ((v) << 20) +#define FW_CDEV_ISO_HEADER_LENGTH(v) ((v) << 24) + struct fw_cdev_iso_packet { - __u16 payload_length; /* Length of indirect payload. */ - __u32 interrupt : 1; /* Generate interrupt on this packet */ - __u32 skip : 1; /* Set to not send packet at all. */ - __u32 tag : 2; - __u32 sy : 4; - __u32 header_length : 8; /* Length of immediate header. */ + __u32 control; __u32 header[0]; }; |