summaryrefslogtreecommitdiffstats
path: root/src/ieee1394-ioctl.h
diff options
context:
space:
mode:
authorGravatar ddennedy 2007-02-14 05:29:18 +0000
committerGravatar ddennedy 2007-02-14 05:29:18 +0000
commitfa981a8b96ec3d09385a0b14b4342e574b7bbe29 (patch)
tree512bc4640fd1f1501d4c2af09469224d881f07b9 /src/ieee1394-ioctl.h
parentbugfix segfault in raw1394_iso_shutdown on no iso activity due to not initial... (diff)
added raw1394_read_cycle_timer, contributed by Pieter Palmers
git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@169 53a565d1-3bb7-0310-b661-cf11e63c67ab
Diffstat (limited to 'src/ieee1394-ioctl.h')
-rw-r--r--src/ieee1394-ioctl.h19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/ieee1394-ioctl.h b/src/ieee1394-ioctl.h
index f92b566..46878fe 100644
--- a/src/ieee1394-ioctl.h
+++ b/src/ieee1394-ioctl.h
@@ -1,5 +1,7 @@
-/* Base file for all ieee1394 ioctl's. Linux-1394 has allocated base '#'
- * with a range of 0x00-0x3f. */
+/*
+ * Base file for all ieee1394 ioctl's.
+ * Linux-1394 has allocated base '#' with a range of 0x00-0x3f.
+ */
#ifndef __IEEE1394_IOCTL_H
#define __IEEE1394_IOCTL_H
@@ -7,14 +9,6 @@
#include <linux/ioctl.h>
#include <linux/types.h>
-
-/* AMDTP Gets 6 */
-#define AMDTP_IOC_CHANNEL _IOW('#', 0x00, struct amdtp_ioctl)
-#define AMDTP_IOC_PLUG _IOW('#', 0x01, struct amdtp_ioctl)
-#define AMDTP_IOC_PING _IOW('#', 0x02, struct amdtp_ioctl)
-#define AMDTP_IOC_ZAP _IO ('#', 0x03)
-
-
/* DV1394 Gets 10 */
/* Get the driver ready to transmit video. pass a struct dv1394_init* as
@@ -104,8 +98,9 @@
_IOW ('#', 0x27, struct raw1394_iso_packets)
#define RAW1394_IOC_ISO_XMIT_SYNC \
_IO ('#', 0x28)
-#define RAW1394_IOC_ISO_RECV_FLUSH \
+#define RAW1394_IOC_ISO_RECV_FLUSH \
_IO ('#', 0x29)
-
+#define RAW1394_IOC_GET_CYCLE_TIMER \
+ _IOR ('#', 0x30, struct raw1394_cycle_timer)
#endif /* __IEEE1394_IOCTL_H */