Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6cba4ee authored by Stefan Bader's avatar Stefan Bader Committed by Linus Torvalds
Browse files

[PATCH] s390: 3590 tape driver 



      Michael Holzheu <holzheu@de.ibm.com>,
      Martin Schwidefsky <schwidefsky@de.ibm.com>

Signed-off-by: default avatarStefan Bader <shbader@de.ibm.com>
Signed-off-by: default avatarMichael Holzheu <holzheu@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5f384338

drivers/s390/Kconfig

+7 −1
Original line number Original line Diff line number Diff line
@@ -183,7 +183,13 @@ config S390_TAPE_34XX 
	  tape subsystems and 100% compatibles.

	  tape subsystems and 100% compatibles.

	  It is safe to say "Y" here.

	  It is safe to say "Y" here.







config S390_TAPE_3590

	tristate "Support for 3590 tape hardware"

	depends on S390_TAPE

	help

	  Select this option if you want to access IBM 3590 magnetic

	  tape subsystems and 100% compatibles.

	  It is safe to say "Y" here.





config VMLOGRDR

config VMLOGRDR

	tristate "Support for the z/VM recording system services (VM only)"

	tristate "Support for the z/VM recording system services (VM only)"

drivers/s390/char/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -26,4 +26,5 @@ tape-$(CONFIG_PROC_FS) += tape_proc.o 
tape-objs := tape_core.o tape_std.o tape_char.o $(tape-y)

tape-objs := tape_core.o tape_std.o tape_char.o $(tape-y)

obj-$(CONFIG_S390_TAPE) += tape.o tape_class.o

obj-$(CONFIG_S390_TAPE) += tape.o tape_class.o

obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o

obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o

obj-$(CONFIG_S390_TAPE_3590) += tape_3590.o

obj-$(CONFIG_MONREADER) += monreader.o
 
obj-$(CONFIG_MONREADER) += monreader.o

drivers/s390/char/tape_34xx.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -2,8 +2,7 @@ 
 *  drivers/s390/char/tape_34xx.c

 *  drivers/s390/char/tape_34xx.c

 *    tape device discipline for 3480/3490 tapes.

 *    tape device discipline for 3480/3490 tapes.

 *

 *

 *  S390 and zSeries version

 *    Copyright (C) IBM Corp. 2001,2006

 *    Copyright (C) 2001,2002 IBM Deutschland Entwicklung GmbH, IBM Corporation

 *    Author(s): Carsten Otte <cotte@de.ibm.com>

 *    Author(s): Carsten Otte <cotte@de.ibm.com>

 *		 Tuan Ngo-Anh <ngoanh@de.ibm.com>

 *		 Tuan Ngo-Anh <ngoanh@de.ibm.com>

 *		 Martin Schwidefsky <schwidefsky@de.ibm.com>

 *		 Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -28,11 +27,6 @@ 
debug_info_t *TAPE_DBF_AREA = NULL;

debug_info_t *TAPE_DBF_AREA = NULL;

EXPORT_SYMBOL(TAPE_DBF_AREA);

EXPORT_SYMBOL(TAPE_DBF_AREA);





enum tape_34xx_type {

	tape_3480,

	tape_3490,

};



#define TAPE34XX_FMT_3480	0

#define TAPE34XX_FMT_3480	0

#define TAPE34XX_FMT_3480_2_XF	1

#define TAPE34XX_FMT_3480_2_XF	1

#define TAPE34XX_FMT_3480_XF	2

#define TAPE34XX_FMT_3480_XF	2