Skip to contentSkip to conversation

videotext: ioctls changed to use _IO macros

PATCH New Gerd Knorr 1 participant 1 message Jan 20, 2005

Subsystems (2)
lore
Share & tools
lore

Gerd Knorr

author
#0 lore raw

PATCH 1/1 videotext: ioctls changed to use _IO macros

From: [email protected] (Michael Geng)

This patch switches the videotext drivers over to use the _IO macros for ioctls. video_usercopy() works correctly then. The drivers will also map the old to the new ioctl numbers to make sure old apps don't break.

The patch also updates Documentation/ioctl.h to reflect that change. and deletes a unused struct in include/linux/videotext.h.

---
 Documentation/ioctl-number.txt |    3 -
 drivers/media/video/saa5246a.c |   49 +++++++++++++++++++
 drivers/media/video/saa5246a.h |    2 
 drivers/media/video/saa5249.c  |   54 ++++++++++++++++++++
 include/linux/videotext.h      |   85 ++++++++++++---------------------
 5 files changed, 138 insertions(+), 55 deletions(-)
Documentation/ioctl-number.txt +2 -1
Index: linux-2004-12-08/Documentation/ioctl-number.txt
===================================================================
@@ -145,7 +145,7 @@ Code	Seq#	Include File		Comments
 'p'	40-7F	linux/nvram.h
 'p'	80-9F				user-space parport
 					<mailto:[email protected]>
-'q'	00-1F	linux/videotext.h	conflict!
+'q'	00-1F	linux/serio.h
 'q'	80-FF				Internet PhoneJACK, Internet LineJACK
 					<http://www.quicknet.net>
 'r'	00-1F	linux/msdos_fs.h
@@ -163,6 +163,7 @@ Code	Seq#	Include File		Comments
 'z'	40-7F				CAN bus card
 					<mailto:[email protected]>
 0x80	00-1F	linux/fb.h
+0x81	00-1F	linux/videotext.h
 0x89	00-06	asm-i386/sockios.h
 0x89	0B-DF	linux/sockios.h
 0x89	E0-EF	linux/sockios.h		SIOCPROTOPRIVATE range
drivers/media/video/saa5246a.c +49 -0

61 lines not on this page · raw message

drivers/media/video/saa5246a.h +1 -1
Index: linux-2004-12-08/drivers/media/video/saa5246a.h
===================================================================
@@ -23,7 +23,7 @@
 #define __SAA5246A_H__
 
 #define MAJOR_VERSION 1		/* driver major version number */
-#define MINOR_VERSION 7		/* driver minor version number */
+#define MINOR_VERSION 8		/* driver minor version number */
 
 #define IF_NAME "SAA5246A"
 
drivers/media/video/saa5249.c +53 -1

76 lines not on this page · raw message

include/linux/videotext.h +33 -52

102 lines not on this page · raw message

Signature · 1 line
#define printk(args...) fprintf(stderr, ## args)