diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/rspiusb/rspiusb.h | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/rspiusb/rspiusb.h')
-rw-r--r-- | drivers/staging/rspiusb/rspiusb.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/drivers/staging/rspiusb/rspiusb.h b/drivers/staging/rspiusb/rspiusb.h deleted file mode 100644 index 3fc1db7..0000000 --- a/drivers/staging/rspiusb/rspiusb.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef __RSPIUSB_H -#define __RSPIUSB_H - -#define PIUSB_MAGIC 'm' -#define PIUSB_IOCTL_BASE 192 - -#define PIUSB_IOR(offset) \ - _IOR(PIUSB_MAGIC, PIUSB_IOCTL_BASE + offset, struct ioctl_struct) -#define PIUSB_IOW(offset) \ - _IOW(PIUSB_MAGIC, PIUSB_IOCTL_BASE + offset, struct ioctl_struct) -#define PIUSB_IO(offset) \ - _IO(PIUSB_MAGIC, PIUSB_IOCTL_BASE + offset) - -#define PIUSB_GETVNDCMD PIUSB_IOR(1) -#define PIUSB_SETVNDCMD PIUSB_IOW(2) -#define PIUSB_WRITEPIPE PIUSB_IOW(3) -#define PIUSB_READPIPE PIUSB_IOR(4) -#define PIUSB_SETFRAMESIZE PIUSB_IOW(5) -#define PIUSB_WHATCAMERA PIUSB_IO(6) -#define PIUSB_USERBUFFER PIUSB_IOW(7) -#define PIUSB_ISHIGHSPEED PIUSB_IO(8) -#define PIUSB_UNMAP_USERBUFFER PIUSB_IOW(9) - -struct ioctl_struct { - unsigned char cmd; - unsigned long numbytes; - unsigned char dir; /* 1=out; 0=in */ - int endpoint; - int numFrames; - unsigned char *pData; -}; - -#endif |