2.5.48 s390 (15/16): sclp driver part 1.

PATCH New Martin Schwidefsky 1 participant 1 message Nov 18, 2002

Subsystems (2)

s390 Char and misc drivers

lore

Share & tools

lore

Martin Schwidefsky

author

2002-11-18 19:36 UTC #0 lore raw

PATCH 1/1 2.5.48 s390 (15/16): sclp driver part 1.

Reworked sclp driver part 1.

arch/s390/defconfig +4 -3

diff -urN linux-2.5.48/arch/s390/defconfig linux-2.5.48-s390/arch/s390/defconfig
@@ -108,9 +108,10 @@
 # CONFIG_TN3270 is not set
 CONFIG_TN3215=y
 CONFIG_TN3215_CONSOLE=y
-CONFIG_HWC=y
-CONFIG_HWC_CONSOLE=y
-CONFIG_HWC_CPI=m
+CONFIG_SCLP=y
+CONFIG_SCLP_TTY=y
+CONFIG_SCLP_CONSOLE=y
+CONFIG_SCLP_CPI=m
 CONFIG_S390_TAPE=m
 
 #

arch/s390/kernel/setup.c +11 ~~-11~~

diff -urN linux-2.5.48/arch/s390/kernel/setup.c linux-2.5.48-s390/arch/s390/kernel/setup.c
@@ -164,9 +164,9 @@
 
 static int __init conmode_setup(char *str)
 {
-#if defined(CONFIG_HWC_CONSOLE)
-	if (strncmp(str, "hwc", 4) == 0)
-                SET_CONSOLE_HWC;
+#if defined(CONFIG_SCLP_CONSOLE)
+	if (strncmp(str, "hwc", 4) == 0 || strncmp(str, "sclp", 5) == 0)
+                SET_CONSOLE_SCLP;
 #endif
 #if defined(CONFIG_TN3215_CONSOLE)
 	if (strncmp(str, "3215", 5) == 0)

@@ -198,8 +198,8 @@
 		 */
 		cpcmd("TERM CONMODE 3215", NULL, 0);
 		if (ptr == NULL) {
-#if defined(CONFIG_HWC_CONSOLE)
-			SET_CONSOLE_HWC;
+#if defined(CONFIG_SCLP_CONSOLE)
+			SET_CONSOLE_SCLP;
 #endif
 			return;
 		}

@@ -208,16 +208,16 @@
 			SET_CONSOLE_3270;
 #elif defined(CONFIG_TN3215_CONSOLE)
 			SET_CONSOLE_3215;
-#elif defined(CONFIG_HWC_CONSOLE)
-			SET_CONSOLE_HWC;
+#elif defined(CONFIG_SCLP_CONSOLE)
+			SET_CONSOLE_SCLP;
 #endif
 		} else if (strncmp(ptr + 8, "3215", 4) == 0) {
 #if defined(CONFIG_TN3215_CONSOLE)
 			SET_CONSOLE_3215;
 #elif defined(CONFIG_TN3270_CONSOLE)
 			SET_CONSOLE_3270;
-#elif defined(CONFIG_HWC_CONSOLE)
-			SET_CONSOLE_HWC;
+#elif defined(CONFIG_SCLP_CONSOLE)
+			SET_CONSOLE_SCLP;
 #endif
 		}
         } else if (MACHINE_IS_P390) {

@@ -227,8 +227,8 @@
 		SET_CONSOLE_3270;
 #endif
 	} else {
-#if defined(CONFIG_HWC_CONSOLE)
-		SET_CONSOLE_HWC;
+#if defined(CONFIG_SCLP_CONSOLE)
+		SET_CONSOLE_SCLP;
 #endif
 	}
 }

arch/s390x/defconfig +4 -3

diff -urN linux-2.5.48/arch/s390x/defconfig linux-2.5.48-s390/arch/s390x/defconfig
@@ -166,9 +166,10 @@
 # CONFIG_TN3270 is not set
 CONFIG_TN3215=y
 CONFIG_TN3215_CONSOLE=y
-CONFIG_HWC=y
-CONFIG_HWC_CONSOLE=y
-CONFIG_HWC_CPI=m
+CONFIG_SCLP=y
+CONFIG_SCLP_TTY=y
+CONFIG_SCLP_CONSOLE=y
+CONFIG_SCLP_CPI=m
 CONFIG_S390_TAPE=m
 
 #

arch/s390x/kernel/setup.c +11 ~~-11~~

diff -urN linux-2.5.48/arch/s390x/kernel/setup.c linux-2.5.48-s390/arch/s390x/kernel/setup.c
@@ -164,9 +164,9 @@
 
 static int __init conmode_setup(char *str)
 {
-#if defined(CONFIG_HWC_CONSOLE)
-	if (strncmp(str, "hwc", 4) == 0)
-                SET_CONSOLE_HWC;
+#if defined(CONFIG_SCLP_CONSOLE)
+	if (strncmp(str, "hwc", 4) == 0 || strncmp(str, "sclp", 5) == 0)
+                SET_CONSOLE_SCLP;
 #endif
 #if defined(CONFIG_TN3215_CONSOLE)
 	if (strncmp(str, "3215", 5) == 0)

@@ -198,8 +198,8 @@
 		 */
 		cpcmd("TERM CONMODE 3215", NULL, 0);
 		if (ptr == NULL) {
-#if defined(CONFIG_HWC_CONSOLE)
-			SET_CONSOLE_HWC;
+#if defined(CONFIG_SCLP_CONSOLE)
+			SET_CONSOLE_SCLP;
 #endif
 			return;
 		}

@@ -208,16 +208,16 @@
 			SET_CONSOLE_3270;
 #elif defined(CONFIG_TN3215_CONSOLE)
 			SET_CONSOLE_3215;
-#elif defined(CONFIG_HWC_CONSOLE)
-			SET_CONSOLE_HWC;
+#elif defined(CONFIG_SCLP_CONSOLE)
+			SET_CONSOLE_SCLP;
 #endif
 		} else if (strncmp(ptr + 8, "3215", 4) == 0) {
 #if defined(CONFIG_TN3215_CONSOLE)
 			SET_CONSOLE_3215;
 #elif defined(CONFIG_TN3270_CONSOLE)
 			SET_CONSOLE_3270;
-#elif defined(CONFIG_HWC_CONSOLE)
-			SET_CONSOLE_HWC;
+#elif defined(CONFIG_SCLP_CONSOLE)
+			SET_CONSOLE_SCLP;
 #endif
 		}
         } else if (MACHINE_IS_P390) {

@@ -227,8 +227,8 @@
 		SET_CONSOLE_3270;
 #endif
 	} else {
-#if defined(CONFIG_HWC_CONSOLE)
-		SET_CONSOLE_HWC;
+#if defined(CONFIG_SCLP_CONSOLE)
+		SET_CONSOLE_SCLP;
 #endif
 	}
 }

drivers/char/tty_io.c +6 -7

diff -urN linux-2.5.48/drivers/char/tty_io.c linux-2.5.48-s390/drivers/char/tty_io.c
@@ -146,10 +146,9 @@
 extern void console_8xx_init(void);
 extern int rs_8xx_init(void);
 extern void mac_scc_console_init(void);
-extern void hwc_console_init(void);
-extern void hwc_tty_init(void);
+extern void sclp_console_init(void);
+extern void sclp_tty_init(void);
 extern void con3215_init(void);
-extern void tty3215_init(void);
 extern void tub3270_con_init(void);
 extern void tub3270_init(void);
 extern void uart_console_init(void);

@@ -2208,8 +2207,8 @@
 #ifdef CONFIG_TN3215
 	con3215_init();
 #endif
-#ifdef CONFIG_HWC
-        hwc_console_init();
+#ifdef CONFIG_SCLP_CONSOLE
+        sclp_console_init();
 #endif
 #ifdef CONFIG_STDIO_CONSOLE
 	stdio_console_init();

@@ -2349,8 +2348,8 @@
 #ifdef CONFIG_TN3215
 	tty3215_init();
 #endif
-#ifdef CONFIG_HWC
-	hwc_tty_init();
+#ifdef CONFIG_SCLP
+	sclp_tty_init();
 #endif
 #ifdef CONFIG_A2232
 	a2232board_init();

drivers/s390/Kconfig +15 -9

diff -urN linux-2.5.48/drivers/s390/Kconfig linux-2.5.48-s390/drivers/s390/Kconfig
@@ -257,24 +257,30 @@
 	  Include support for using an IBM 3215 line-mode terminal as a
 	  Linux system console.
 
-config HWC
-	bool "Support for HWC line mode terminal"
+config SCLP
+	bool "Support for SCLP"
 	help
-	  Include support for IBM HWC line-mode terminals.
+	  Include support for the SCLP interface to the service element.
 
-config HWC_CONSOLE
-	bool "console on HWC line mode terminal"
-	depends on HWC
+config SCLP_TTY
+	bool "Support for SCLP line mode terminal"
+	depends on SCLP
+	help
+	  Include support for IBM SCLP line-mode terminals.
+
+config SCLP_CONSOLE
+	bool "Support for console on SCLP line mode terminal"
+	depends on SCLP_TTY
 	help
 	  Include support for using an IBM HWC line-mode terminal as the Linux
 	  system console.
 
-config HWC_CPI
+config SCLP_CPI
 	tristate "Control-Program Identification"
-	depends on HWC
+	depends on SCLP
 	help
 	  This option enables the hardware console interface for system
-	  identification This is commonly used for workload management and
+	  identification. This is commonly used for workload management and
 	  gives you a nice name for the system on the service element.
 	  Please select this option as a module since built-in operation is
 	  completely untested.

drivers/s390/char/Makefile +10 ~~-15~~

diff -urN linux-2.5.48/drivers/s390/char/Makefile linux-2.5.48-s390/drivers/s390/char/Makefile
@@ -2,28 +2,23 @@
 # S/390 character devices
 #
 
-export-objs := hwc_rw.o tape.o tape34xx.o
+export-objs := sclp_rw.o tape_core.o tape_devmap.o tape_std.o
 
 tub3270-objs := tuball.o tubfs.o tubtty.o \
                      tubttyaid.o tubttybld.o tubttyscl.o \
                      tubttyrcl.o tubttysiz.o
 
-tape390-$(CONFIG_S390_TAPE_CHAR)  += tapechar.o
-tape390-$(CONFIG_S390_TAPE_BLOCK) += tapeblock.o
-
-tape390-objs   := tape.o tape34xx.o $(sort $(tape390-y))
-tape_3480_mod-objs := tape3480.o
-tape_3490_mod-objs := tape3490.o 
-
-
 obj-y += ctrlchar.o
 obj-$(CONFIG_TN3215) += con3215.o
-obj-$(CONFIG_HWC) += hwc_con.o hwc_rw.o hwc_tty.o
-obj-$(CONFIG_HWC_CPI) += hwc_cpi.o
+obj-$(CONFIG_SCLP) += sclp.o
+obj-$(CONFIG_SCLP_TTY) += sclp_rw.o sclp_tty.o
+obj-$(CONFIG_SCLP_CONSOLE) += sclp_con.o
+obj-$(CONFIG_SCLP_CPI) += sclp_cpi.o
 obj-$(CONFIG_TN3270) += tub3270.o
-obj-$(CONFIG_S390_TAPE)       += tape390.o
-obj-$(CONFIG_S390_TAPE_3480)  += tape_3480_mod.o
-obj-$(CONFIG_S390_TAPE_3490)  += tape_3490_mod.o
+tape-$(CONFIG_S390_TAPE_BLOCK) += tape_block.o
+tape-$(CONFIG_PROC_FS) += tape_proc.o
+tape-objs := tape_core.o tape_std.o tape_char.o $(tape-y)
+obj-$(CONFIG_S390_TAPE) += tape.o
+obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o
 
 include $(TOPDIR)/Rules.make
-

drivers/s390/char/hwc.h +0 ~~-280~~

280 lines not on this page · raw message

drivers/s390/char/hwc_con.c +0 ~~-92~~

92 lines not on this page · raw message

drivers/s390/char/hwc_cpi.c +0 ~~-212~~

212 lines not on this page · raw message

drivers/s390/char/hwc_rw.c +0 ~~-2456~~

2,177 lines not on this page · raw message

drivers/s390/char/hwc_rw.h +0 ~~-132~~

132 lines not on this page · raw message

drivers/s390/char/hwc_tty.c +0 ~~-276~~

276 lines not on this page · raw message

include/asm-s390/setup.h +3 -3

diff -urN linux-2.5.48/include/asm-s390/setup.h linux-2.5.48-s390/include/asm-s390/setup.h

Lines of this file are not shown. View the raw message.

include/asm-s390x/setup.h +3 -3

diff -urN linux-2.5.48/include/asm-s390x/setup.h linux-2.5.48-s390/include/asm-s390x/setup.h

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.