firewire: Future proof the iso ioctls by adding a handle for the iso context.

Currently create context always returns 0 and the other iso
ioctls will expect user space to pass that in for subsequent ioctls.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/firewire/fw-device-cdev.h b/drivers/firewire/fw-device-cdev.h
index f2355e034eb4..026c768e3bf1 100644
--- a/drivers/firewire/fw-device-cdev.h
+++ b/drivers/firewire/fw-device-cdev.h
@@ -133,10 +133,10 @@ union fw_cdev_event {
 #define FW_CDEV_IOC_ADD_DESCRIPTOR      _IOWR('#', 0x06, struct fw_cdev_add_descriptor)
 #define FW_CDEV_IOC_REMOVE_DESCRIPTOR   _IOW('#', 0x07, struct fw_cdev_remove_descriptor)
 
-#define FW_CDEV_IOC_CREATE_ISO_CONTEXT  _IOW('#', 0x08, struct fw_cdev_create_iso_context)
+#define FW_CDEV_IOC_CREATE_ISO_CONTEXT  _IOWR('#', 0x08, struct fw_cdev_create_iso_context)
 #define FW_CDEV_IOC_QUEUE_ISO           _IOWR('#', 0x09, struct fw_cdev_queue_iso)
 #define FW_CDEV_IOC_START_ISO           _IOW('#', 0x0a, struct fw_cdev_start_iso)
-#define FW_CDEV_IOC_STOP_ISO            _IO('#', 0x0b)
+#define FW_CDEV_IOC_STOP_ISO            _IOW('#', 0x0b, struct fw_cdev_stop_iso)
 
 /* FW_CDEV_VERSION History
  *
@@ -233,6 +233,8 @@ struct fw_cdev_create_iso_context {
         __u32 header_size;
         __u32 channel;
         __u32 speed;
+        __u64 closure;
+        __u32 handle;
 };
 
 struct fw_cdev_iso_packet {
@@ -249,12 +251,18 @@ struct fw_cdev_queue_iso {
         __u64 packets;
         __u64 data;
         __u32 size;
+        __u32 handle;
 };
 
 struct fw_cdev_start_iso {
         __s32 cycle;
         __u32 sync;
         __u32 tags;
+        __u32 handle;
+};
+
+struct fw_cdev_stop_iso {
+        __u32 handle;
 };
 
 #endif /* __fw_cdev_h */