[LV-kern-commit] CVS: kernel-2.4/drivers/char/ftape/lowlevel Makefile,1.1.1.1,1.2 fc-10.c,1.1.1.1,1.2 fc-10.h,1.1.1.1,1.2 fdc-io.c,1.1.1.1,1.2 fdc-io.h,1.1.1.1,1.2 fdc-isr.c,1.1.1.2,1.2 fdc-isr.h,1.1.1.1,1.2 ftape-bsm.c,1.1.1.1,1.2 ftape-bsm.h,1.1.1.1,1.2 ftape-buffer.c,1.1.1.2,1.2 ftape-buffer.h,1.1.1.1,1.2 ftape-calibr.c,1.1.1.1,1.2 ftape-calibr.h,1.1.1.1,1.2 ftape-ctl.c,1.1.1.1,1.2 ftape-ctl.h,1.1.1.1,1.2 ftape-ecc.c,1.1.1.1,1.2 ftape-ecc.h,1.1.1.1,1.2 ftape-format.c,1.1.1.1,1.2 ftape-format.h,1.1.1.1,1.2 ftape-init.c,1.1.1.1,1.2 ftape-init.h,1.1.1.1,1.2 ftape-io.c,1.1.1.1,1.2 ftape-io.h,1.1.1.1,1.2 ftape-proc.c,1.1.1.1,1.2 ftape-proc.h,1.1.1.1,1.2 ftape-read.c,1.1.1.1,1.2 ftape-read.h,1.1.1.1,1.2 ftape-rw.c,1.1.1.1,1.2 ftape-rw.h,1.1.1.1,1.2 ftape-setup.c,1.1.1.1,1.2 ftape-tracing.c,1.1.1.1,1.2 ftape-tracing.h,1.1.1.1,1.2 ftape-write.c,1.1.1.1,1.2 ftape-write.h,1.1.1.1,1.2 ftape_syms.c,1.1.1.1,1.2 ftape_syms.h,1.1.1.1,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel
In directory usw-pr-cvs1:/tmp/cvs-serv17293/char/ftape/lowlevel

Modified Files:
	Makefile fc-10.c fc-10.h fdc-io.c fdc-io.h fdc-isr.c fdc-isr.h 
	ftape-bsm.c ftape-bsm.h ftape-buffer.c ftape-buffer.h 
	ftape-calibr.c ftape-calibr.h ftape-ctl.c ftape-ctl.h 
	ftape-ecc.c ftape-ecc.h ftape-format.c ftape-format.h 
	ftape-init.c ftape-init.h ftape-io.c ftape-io.h ftape-proc.c 
	ftape-proc.h ftape-read.c ftape-read.h ftape-rw.c ftape-rw.h 
	ftape-setup.c ftape-tracing.c ftape-tracing.h ftape-write.c 
	ftape-write.h ftape_syms.c ftape_syms.h 
Log Message:
synch 2.4.15 commit 55


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: fc-10.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/fc-10.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: fc-10.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/fc-10.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: fdc-io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/fdc-io.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: fdc-io.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/fdc-io.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: fdc-isr.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/fdc-isr.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2

Index: fdc-isr.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/fdc-isr.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-bsm.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-bsm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-bsm.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-bsm.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-buffer.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-buffer.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2

Index: ftape-buffer.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-buffer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-calibr.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-calibr.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ftape-calibr.c	14 Jan 2001 17:58:38 -0000	1.1.1.1
+++ ftape-calibr.c	11 Apr 2002 13:31:02 -0000	1.2
@@ -31,7 +31,7 @@
 #include <asm/io.h>
 #if defined(__alpha__)
 # include <asm/hwrpb.h>
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 # include <linux/timex.h>
 #endif
 #include <linux/ftape.h>
@@ -41,7 +41,7 @@
 
 #undef DEBUG
 
-#if !defined(__alpha__) && !defined(__i386__)
+#if !defined(__alpha__) && !defined(__i386__) && !defined(__x86_64__)
 # error Ftape is not implemented for this architecture!
 #endif
 
@@ -70,7 +70,7 @@
 
 	asm volatile ("rpcc %0" : "=r" (r));
 	return r;
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 	unsigned long flags;
 	__u16 lo;
 	__u16 hi;
@@ -90,7 +90,7 @@
 {
 #if defined(__alpha__)
 	return ftape_timestamp();
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 	unsigned int count;
  	unsigned long flags;
  
@@ -108,7 +108,7 @@
 {
 #if defined(__alpha__)
 	return (t1 <= t0) ? t1 + (1UL << 32) - t0 : t1 - t0;
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 	/*
 	 * This is tricky: to work for both short and full ftape_timestamps
 	 * we'll have to discriminate between these.
@@ -124,7 +124,7 @@
 {
 #if defined(__alpha__)
 	return (ps_per_cycle * count) / 1000000UL;
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 	return (10000 * count) / ((CLOCK_TICK_RATE + 50) / 100);
 #endif
 }
@@ -164,7 +164,7 @@
 
 static void init_clock(void)
 {
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
 	unsigned int t;
 	int i;
 	TRACE_FUN(ft_t_any);
@@ -214,7 +214,7 @@
 	unsigned int tc = 0;
 	unsigned int count;
 	unsigned int time;
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
 	unsigned int old_tc = 0;
 	unsigned int old_count = 1;
 	unsigned int old_time = 1;
@@ -265,7 +265,7 @@
 		if (time >= 100*1000) {
 			break;
 		}
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 		/*
 		 * increase the count until the resulting time nears 2/HZ,
 		 * then the tc will drop sharply because we lose LATCH counts.

Index: ftape-calibr.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-calibr.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-ctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-ctl.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-ctl.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-ctl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-ecc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-ecc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-ecc.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-ecc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-format.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-format.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-format.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-format.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-init.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ftape-init.c	14 Jan 2001 17:58:19 -0000	1.1.1.1
+++ ftape-init.c	11 Apr 2002 13:31:02 -0000	1.2
@@ -153,6 +153,7 @@
 	"(c) 1996, 1997 Claus-Justus Heine (cl...@mo...)");
 MODULE_DESCRIPTION(
 	"QIC-117 driver for QIC-40/80/3010/3020 floppy tape drives.");
+MODULE_LICENSE("GPL");
 #endif
 
 /*  Called by modules package when installing the driver

Index: ftape-init.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-init.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-io.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-io.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-io.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-proc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-proc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-proc.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-proc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-read.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-read.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-read.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-read.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-rw.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-rw.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-rw.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-rw.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-setup.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-setup.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-tracing.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-tracing.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-tracing.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-tracing.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-write.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-write.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape-write.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape-write.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape_syms.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape_syms.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ftape_syms.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/ftape/lowlevel/ftape_syms.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2