diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-09-29 04:41:58 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-10-16 18:00:08 -0400 |
commit | a64408b96b5f67c2778958a230b5cfa3408a4a81 (patch) | |
tree | 5dbd798b626f3693fa9950fa2a3b37e489aa6bbd /include/linux/firewire-cdev.h | |
parent | 02ff8f8ee151e880414b99a11f67cae0cecd4977 (diff) |
firewire: adopt read cycle timer ABI from raw1394
This duplicates the read cycle timer feature of raw1394 (added in Linux
2.6.21) in firewire-core's userspace ABI. The argument to the ioctl is
reordered though to ensure 32/64 bit compatibility.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Diffstat (limited to 'include/linux/firewire-cdev.h')
-rw-r--r-- | include/linux/firewire-cdev.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h index 1a45d6f41b09..0f0e271f97fa 100644 --- a/include/linux/firewire-cdev.h +++ b/include/linux/firewire-cdev.h | |||
@@ -178,6 +178,7 @@ union fw_cdev_event { | |||
178 | #define FW_CDEV_IOC_QUEUE_ISO _IOWR('#', 0x09, struct fw_cdev_queue_iso) | 178 | #define FW_CDEV_IOC_QUEUE_ISO _IOWR('#', 0x09, struct fw_cdev_queue_iso) |
179 | #define FW_CDEV_IOC_START_ISO _IOW('#', 0x0a, struct fw_cdev_start_iso) | 179 | #define FW_CDEV_IOC_START_ISO _IOW('#', 0x0a, struct fw_cdev_start_iso) |
180 | #define FW_CDEV_IOC_STOP_ISO _IOW('#', 0x0b, struct fw_cdev_stop_iso) | 180 | #define FW_CDEV_IOC_STOP_ISO _IOW('#', 0x0b, struct fw_cdev_stop_iso) |
181 | #define FW_CDEV_IOC_GET_CYCLE_TIMER _IOR('#', 0x0c, struct fw_cdev_get_cycle_timer) | ||
181 | 182 | ||
182 | /* FW_CDEV_VERSION History | 183 | /* FW_CDEV_VERSION History |
183 | * | 184 | * |
@@ -459,4 +460,18 @@ struct fw_cdev_stop_iso { | |||
459 | __u32 handle; | 460 | __u32 handle; |
460 | }; | 461 | }; |
461 | 462 | ||
463 | /** | ||
464 | * struct fw_cdev_get_cycle_timer - read cycle timer register | ||
465 | * @local_time: system time, in microseconds since the Epoch | ||
466 | * @cycle_timer: isochronous cycle timer, as per OHCI 1.1 clause 5.13 | ||
467 | * | ||
468 | * The %FW_CDEV_IOC_GET_CYCLE_TIMER ioctl reads the isochronous cycle timer | ||
469 | * and also the system clock. This allows to express the receive time of an | ||
470 | * isochronous packet as a system time with microsecond accuracy. | ||
471 | */ | ||
472 | struct fw_cdev_get_cycle_timer { | ||
473 | __u64 local_time; | ||
474 | __u32 cycle_timer; | ||
475 | }; | ||
476 | |||
462 | #endif /* _LINUX_FIREWIRE_CDEV_H */ | 477 | #endif /* _LINUX_FIREWIRE_CDEV_H */ |