git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
ieee1394
/
ieee1394-ioctl.h
diff --git
a/drivers/ieee1394/ieee1394-ioctl.h
b/drivers/ieee1394/ieee1394-ioctl.h
index
f92b566
..
8f20750
100644
(file)
--- a/
drivers/ieee1394/ieee1394-ioctl.h
+++ b/
drivers/ieee1394/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
#ifndef __IEEE1394_IOCTL_H
#define __IEEE1394_IOCTL_H
@@
-7,14
+9,6
@@
#include <linux/ioctl.h>
#include <linux/types.h>
#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
/* DV1394 Gets 10 */
/* Get the driver ready to transmit video. pass a struct dv1394_init* as
@@
-104,8
+98,7
@@
_IOW ('#', 0x27, struct raw1394_iso_packets)
#define RAW1394_IOC_ISO_XMIT_SYNC \
_IO ('#', 0x28)
_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)
_IO ('#', 0x29)
-
#endif /* __IEEE1394_IOCTL_H */
#endif /* __IEEE1394_IOCTL_H */