patch-2.4.2 linux/drivers/s390/char/hwc_rw.h

Next file: linux/drivers/s390/char/hwc_tty.c
Previous file: linux/drivers/s390/char/hwc_rw.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/drivers/s390/char/hwc_rw.h linux/drivers/s390/char/hwc_rw.h
@@ -12,31 +12,12 @@
 
 #include <linux/ioctl.h>
 
-#ifndef __HWC_RW_C__
-
-extern int hwc_init (void);
-
-extern int hwc_write (int from_user, const unsigned char *, unsigned int);
-
-extern unsigned int hwc_chars_in_buffer (unsigned char);
-
-extern unsigned int hwc_write_room (unsigned char);
-
-extern void hwc_flush_buffer (unsigned char);
-
-extern signed int hwc_ioctl (unsigned int, unsigned long);
-
-extern void do_hwc_interrupt (void);
-
-extern int hwc_printk (const char *,...);
-
-#else
-
-extern void store_hwc_input (unsigned char *, unsigned int);
+typedef struct {
 
-extern void wake_up_hwc_tty (void);
+	void (*move_input) (unsigned char *, unsigned int);
 
-#endif
+	void (*wake_up) (void);
+} hwc_high_level_calls_t;
 
 #define IN_HWCB      1
 #define IN_WRITE_BUF 2
@@ -45,7 +26,6 @@
 typedef unsigned short int ioctl_htab_t;
 typedef unsigned char ioctl_echo_t;
 typedef unsigned short int ioctl_cols_t;
-typedef unsigned char ioctl_code_t;
 typedef signed char ioctl_nl_t;
 typedef unsigned short int ioctl_obuf_t;
 typedef unsigned char ioctl_case_t;
@@ -55,7 +35,6 @@
 	ioctl_htab_t width_htab;
 	ioctl_echo_t echo;
 	ioctl_cols_t columns;
-	ioctl_code_t code;
 	ioctl_nl_t final_nl;
 	ioctl_obuf_t max_hwcb;
 	ioctl_obuf_t kmem_hwcb;
@@ -73,8 +52,6 @@
 
 #define TIOCHWCSCOLS	_IOW(HWC_IOCTL_LETTER, 2, _hwc_ioctls.columns)
 
-#define TIOCHWCSCODE	_IOW(HWC_IOCTL_LETTER, 3, _hwc_ioctls.code)
-
 #define TIOCHWCSNL	_IOW(HWC_IOCTL_LETTER, 4, _hwc_ioctls.final_nl)
 
 #define TIOCHWCSOBUF	_IOW(HWC_IOCTL_LETTER, 5, _hwc_ioctls.max_hwcb)
@@ -91,8 +68,6 @@
 
 #define TIOCHWCGCOLS	_IOR(HWC_IOCTL_LETTER, 12, _hwc_ioctls.columns)
 
-#define TIOCHWCGCODE	_IOR(HWC_IOCTL_LETTER, 13, _hwc_ioctls.code)
-
 #define TIOCHWCGNL	_IOR(HWC_IOCTL_LETTER, 14, _hwc_ioctls.final_nl)
 
 #define TIOCHWCGOBUF	_IOR(HWC_IOCTL_LETTER, 15, _hwc_ioctls.max_hwcb)
@@ -107,7 +82,30 @@
 
 #define TIOCHWCGCURR	_IOR(HWC_IOCTL_LETTER, 21, _hwc_ioctls)
 
-#define CODE_ASCII              0x0
-#define CODE_EBCDIC             0x1
+#ifndef __HWC_RW_C__
+
+extern int hwc_init (void);
+
+extern int hwc_write (int from_user, const unsigned char *, unsigned int);
+
+extern unsigned int hwc_chars_in_buffer (unsigned char);
+
+extern unsigned int hwc_write_room (unsigned char);
+
+extern void hwc_flush_buffer (unsigned char);
+
+extern void hwc_unblank (void);
+
+extern signed int hwc_ioctl (unsigned int, unsigned long);
+
+extern void do_hwc_interrupt (void);
+
+extern int hwc_printk (const char *,...);
+
+extern signed int hwc_register_calls (hwc_high_level_calls_t *);
+
+extern signed int hwc_unregister_calls (hwc_high_level_calls_t *);
+
+#endif
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)