diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
| commit | b8553086288629b4efb77e97f5582e08bc50ad65 (patch) | |
| tree | 0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /drivers/ieee1394/video1394.h | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'drivers/ieee1394/video1394.h')
| -rw-r--r-- | drivers/ieee1394/video1394.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/ieee1394/video1394.h b/drivers/ieee1394/video1394.h index 47b8e64a2..dc6e5c981 100644 --- a/drivers/ieee1394/video1394.h +++ b/drivers/ieee1394/video1394.h @@ -20,6 +20,8 @@ #ifndef _VIDEO_1394_H #define _VIDEO_1394_H +#define VIDEO1394_DRIVER_NAME "video1394" + #define VIDEO1394_MAX_SIZE 0x400000 enum { @@ -31,8 +33,12 @@ enum { enum { VIDEO1394_LISTEN_CHANNEL = 0, VIDEO1394_UNLISTEN_CHANNEL, - VIDEO1394_QUEUE_BUFFER, - VIDEO1394_WAIT_BUFFER + VIDEO1394_LISTEN_QUEUE_BUFFER, + VIDEO1394_LISTEN_WAIT_BUFFER, + VIDEO1394_TALK_CHANNEL, + VIDEO1394_UNTALK_CHANNEL, + VIDEO1394_TALK_QUEUE_BUFFER, + VIDEO1394_TALK_WAIT_BUFFER }; struct video1394_mmap { @@ -40,6 +46,8 @@ struct video1394_mmap { int sync_tag; int nb_buffers; int buf_size; + int packet_size; + int fps; }; struct video1394_wait { @@ -47,4 +55,5 @@ struct video1394_wait { int buffer; }; -#endif + +#endif |