X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Documentation%2FDocBook%2Fvideobook.tmpl;h=b3d93ee27693057e5ab5555049a0d9500e92b634;hb=b297d520b9af536d5580ac505dd316be4cf5560c;hp=3ec6c875588ab7e8d1268e9ee974655c0cb843ca;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=linux-2.6
diff --git a/Documentation/DocBook/videobook.tmpl b/Documentation/DocBook/videobook.tmpl
index 3ec6c87558..b3d93ee276 100644
--- a/Documentation/DocBook/videobook.tmpl
+++ b/Documentation/DocBook/videobook.tmpl
@@ -96,7 +96,6 @@ static struct video_device my_radio
{
"My radio",
VID_TYPE_TUNER,
- VID_HARDWARE_MYRADIO,
radio_open.
radio_close,
NULL, /* no read */
@@ -118,13 +117,6 @@ static struct video_device my_radio
indicates that the device can be tuned. Clearly our radio is going to have some
way to change channel so it is tuneable.
-
- The VID_HARDWARE_ types are unique to each device. Numbers are assigned by
- alan@redhat.com when device drivers are going to be released. Until then you
- can pull a suitably large number out of your hat and use it. 10000 should be
- safe for a very long time even allowing for the huge number of vendors
- making new and different radio cards at the moment.
-
We declare an open and close routine, but we do not need read or write,
which are used to read and write video data to or from the card itself. As
@@ -229,7 +221,7 @@ int __init myradio_init(struct video_init *v)
static int users = 0;
-static int radio_open(stuct video_device *dev, int flags)
+static int radio_open(struct video_device *dev, int flags)
{
if(users)
return -EBUSY;
@@ -844,7 +836,6 @@ static struct video_device my_camera
"My Camera",
VID_TYPE_OVERLAY|VID_TYPE_SCALES|\
VID_TYPE_CAPTURE|VID_TYPE_CHROMAKEY,
- VID_HARDWARE_MYCAMERA,
camera_open.
camera_close,
camera_read, /* no read */
@@ -949,7 +940,7 @@ int __init mycamera_init(struct video_init *v)
static int users = 0;
-static int camera_open(stuct video_device *dev, int flags)
+static int camera_open(struct video_device *dev, int flags)
{
if(users)
return -EBUSY;
@@ -976,7 +967,7 @@ static int camera_close(struct video_device *dev)
Interrupt Handling
Our example handler is for an ISA bus device. If it was PCI you would be
- able to share the interrupt and would have set SA_SHIRQ to indicate a
+ able to share the interrupt and would have set IRQF_SHARED to indicate a
shared IRQ. We pass the device pointer as the interrupt routine argument. We
don't need to since we only support one card but doing this will make it
easier to upgrade the driver for multiple devices in the future.