diff -u --recursive --new-file ftape-4.04/ChangeLog ftape-4.04a/ChangeLog --- ftape-4.04/ChangeLog Sun Jul 23 22:37:22 2000 +++ ftape-4.04a/ChangeLog Tue Jul 25 13:04:47 2000 @@ -1,3 +1,38 @@ +2000-07-25 Claus-Justus Heine + + * Release version 4.04a. + +2000-07-25 heine + + * include/linux/ftape.h, INSTALL, MCONFIG, README, RELEASE-NOTES: + Bump version to 4.04a. + + * scripts/kernel-inclusion/v2.4/Config.in: + Use "Comment" statement with empty string '', not without arg (looks + ugly with xconfig). + + * ftape/internal/fdc-internal.c: + Seemingly, -1U is unequal to (unsigned short)-1. So better compare + fdc->sra with 0xffff. Caused a kernel Oops with linux-2.2.x. + + * ftape/lowlevel/fdc-isr.c: Remove unprintable characters. + +2000-07-23 heine + + * ChangeLog: Document release of 4.04. + + * RELEASE-NOTES: Update for release of version 4.04. + + * BUGS: Update. Report bug fixes. + + * include/linux/ftape.h: Bump version to 4.04. + + * ftape/zftape/zftape-ctl.c: Update of copyright notice. + + * ftape/lowlevel/ftape-read.c: + New bug work-around for format parameter inconsistency caused by other + programs. + 2000-07-23 Claus-Justus Heine * Release version 4.04. diff -u --recursive --new-file ftape-4.04/INSTALL ftape-4.04a/INSTALL --- ftape-4.04/INSTALL Tue Jul 4 04:01:40 2000 +++ ftape-4.04a/INSTALL Tue Jul 25 13:04:47 2000 @@ -57,23 +57,23 @@ 2. Read the file `README' ~~~~~~~~~~~~~~~~~~~~~~~~~ -Please read the file `README' in this directory. It lists additional -documentation and packages that might be useful when trying to use -`ftape'. It is strongly recommended that you obtain the -`ftape-4.x-doc' and the `ftape-tools' package as well as the -`ftape-4.03' package itself. Please refer to the file `README'. +Please read the file `README' in this directory. It lists additional +documentation and packages that might be useful when trying to use +`ftape'. It is strongly recommended that you obtain the `ftape-doc' +and the `ftape-tools' package as well. Please refer to the file +`README'. 3. Installation ~~~~~~~~~~~~~~~ -1. `cd' to the directory containing the sources of `ftape-4.03'. You - probably already have done this. Edit the file `MCONFIG' in this - directory and try to follow the instructions contained - therein. Most settings which are tunable in `MCONFIG' can be - changed at module load time by setting appropriate module - parameters. Examples are given below and in the file +1. `cd' to the directory containing the sources of `ftape-4.04a'. You + probably already have done this. Edit the file `MCONFIG' in this + directory and try to follow the instructions contained + therein. Most settings which are tunable in `MCONFIG' can be + changed at module load time by setting appropriate module + parameters. Examples are given below and in the file `./modules/insert'. 2. If you are using Linux v1.2.13 or v2.0.x, then you should consider @@ -82,12 +82,12 @@ `./patches/v2.0' README for more information. After applying the patches you will have to recompile and install your new kernel. -3. Type `make' to compile `ftape-4.03'. There shouldn't be any - warnings and no errors. If you get warnings or errors during - compilation, then please check first whether the value of the - variable `LINUX_LOCATION' in the file `./MCONFIG' is set to the - location of your kernel source tree. The kernel source tree - (probably `/usr/src/linux') should have been configured properly +3. Type `make' to compile `ftape-4.04a'. There shouldn't be any + warnings and no errors. If you get warnings or errors during + compilation, then please check first whether the value of the + variable `LINUX_LOCATION' in the file `./MCONFIG' is set to the + location of your kernel source tree. The kernel source tree + (probably `/usr/src/linux') should have been configured properly prior to attempting to compile `ftape', and you should have typed a `make dep' in the directory containing the kernel sources (probably `/usr/src/linux'). diff -u --recursive --new-file ftape-4.04/MCONFIG ftape-4.04a/MCONFIG --- ftape-4.04/MCONFIG Thu Jul 13 13:38:49 2000 +++ ftape-4.04a/MCONFIG Tue Jul 25 13:04:47 2000 @@ -17,8 +17,8 @@ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # # $RCSfile: MCONFIG,v $ -# $Revision: 1.77 $ -# $Date: 2000/07/13 11:38:49 $ +# $Revision: 1.79 $ +# $Date: 2000/07/25 10:53:59 $ # # Compile time configuration for the QIC-40/80/3010/3020 ftape # driver for Linux diff -u --recursive --new-file ftape-4.04/README ftape-4.04a/README --- ftape-4.04/README Fri Jul 7 14:05:06 2000 +++ ftape-4.04a/README Tue Jul 25 13:04:47 2000 @@ -5,7 +5,7 @@ This directory and its subdirectories contain the sources for - ftape-4.03 + ftape-4.04a `ftape' is a device driver for floppy tape drives written for the operating system Linux. diff -u --recursive --new-file ftape-4.04/RELEASE-NOTES ftape-4.04a/RELEASE-NOTES --- ftape-4.04/RELEASE-NOTES Sun Jul 23 22:34:56 2000 +++ ftape-4.04a/RELEASE-NOTES Tue Jul 25 13:04:47 2000 @@ -1,5 +1,10 @@ Hey, Emacs, we're -*-Text-*- mode! +===== Release notes for ftape-4.04a 25/07/00 ==== + +-- Fix a silly bug in ftape-internal which could cause an Oops when + accessing /proc/ioports. + ===== Release notes for ftape-4.04 23/07/00 ===== -- Fix a severe bug in the volume table code. Applies only to diff -u --recursive --new-file ftape-4.04/ftape/internal/fdc-internal.c ftape-4.04a/ftape/internal/fdc-internal.c --- ftape-4.04/ftape/internal/fdc-internal.c Fri Jun 30 12:52:55 2000 +++ ftape-4.04a/ftape/internal/fdc-internal.c Tue Jul 25 13:04:47 2000 @@ -1,6 +1,6 @@ /* * Copyright (C) 1993-1996 Bas Laarhoven, - * 1996-1998 Claus-Justus Heine, + * 1996-2000 Claus-Justus Heine, * 1997 Jochen Hoenicke. This program is free software; you can redistribute it and/or modify @@ -54,8 +54,8 @@ /* Global vars. */ char fdc_int_internal_src[] __initdata = "$RCSfile: fdc-internal.c,v $"; -char fdc_int_internal_rev[] __initdata = "$Revision: 1.39 $"; -char fdc_int_internal_dat[] __initdata = "$Date: 2000/06/30 10:52:55 $"; +char fdc_int_internal_rev[] __initdata = "$Revision: 1.40 $"; +char fdc_int_internal_dat[] __initdata = "$Date: 2000/07/25 10:36:40 $"; #ifdef fdc #error foo @@ -306,7 +306,8 @@ } } if (fdc->sra != 0x3f0 && (fdc->dma == 2 || fdc->irq == 6)) { - if (check_region(0x3f2, 1) < 0) { + if (check_region(0x3f0, 6) < 0 || + check_region(0x3f0 + 7, 1) < 0) { #ifndef BROKEN_FLOPPY_DRIVER TRACE_EXIT -EBUSY; #else @@ -684,11 +685,11 @@ break; } if (ft_fdc_fc10[sel]) { - if (fdc->sra == -1U) fdc->sra = 0x180; + if (fdc->sra == 0xffff) fdc->sra = 0x180; if (fdc->irq == -1) fdc->irq = 9; if (fdc->dma == -1) fdc->dma = 3; } else if (ft_fdc_mach2[sel]) { - if (fdc->sra == -1U) fdc->sra = 0x1e0; + if (fdc->sra == 0xffff) fdc->sra = 0x1e0; if (fdc->irq == -1) fdc->irq = 6; if (fdc->dma == -1) fdc->dma = 2; } @@ -704,6 +705,7 @@ * parameter */ fdc->buffers_needed = CONFIG_FT_NR_BUFFERS; + TRACE_EXIT; } @@ -738,7 +740,7 @@ #endif /* FIXME: autoprobe default parameters. */ - if (fdc->sra == -1U) { + if (fdc->sra == 0xffff) { TRACE(ft_t_err, "Need the I/O port base address of the FDC"); TRACE_EXIT -ENXIO; } diff -u --recursive --new-file ftape-4.04/ftape/lowlevel/fdc-isr.c ftape-4.04a/ftape/lowlevel/fdc-isr.c --- ftape-4.04/ftape/lowlevel/fdc-isr.c Wed Mar 17 12:17:50 1999 +++ ftape-4.04a/ftape/lowlevel/fdc-isr.c Tue Jul 25 13:04:47 2000 @@ -18,8 +18,8 @@ * * $RCSfile: fdc-isr.c,v $ - * $Revision: 1.30 $ - * $Date: 1999/03/17 11:17:50 $ + * $Revision: 1.31 $ + * $Date: 2000/07/25 10:34:20 $ * * This file contains the interrupt service routine and * associated code for the QIC-40/80/3010/3020 floppy-tape driver @@ -1123,7 +1123,7 @@ /* cH: 23/02/97: if the last sector in the * segment was a hard error, then it doesn't * make sense to retry. This occasion seldom - * occurs but ... @:³²¸`@%&§$ + * occurs but ... @:,`@%&$ */ if (retry && skip < 32) { retry_sector(fdc, HEAD, fdc->mode, skip); diff -u --recursive --new-file ftape-4.04/include/linux/ftape.h ftape-4.04a/include/linux/ftape.h --- ftape-4.04/include/linux/ftape.h Sun Jul 23 22:32:35 2000 +++ ftape-4.04a/include/linux/ftape.h Tue Jul 25 13:04:47 2000 @@ -21,15 +21,15 @@ * * $RCSfile: ftape.h,v $ - * $Revision: 1.59 $ - * $Date: 2000/07/23 20:32:35 $ + * $Revision: 1.60 $ + * $Date: 2000/07/25 10:48:00 $ * * This file contains global definitions, typedefs and macro's * for the QIC-40/80/3010/3020 floppy-tape driver for Linux. * */ -#define FTAPE_VERSION "ftape v4.04 07/23/2000" +#define FTAPE_VERSION "ftape v4.04a 07/25/2000" #ifdef __KERNEL__ #include diff -u --recursive --new-file ftape-4.04/scripts/kernel-inclusion/v2.4/Config.in ftape-4.04a/scripts/kernel-inclusion/v2.4/Config.in --- ftape-4.04/scripts/kernel-inclusion/v2.4/Config.in Thu Jul 6 16:57:40 2000 +++ ftape-4.04a/scripts/kernel-inclusion/v2.4/Config.in Tue Jul 25 13:04:47 2000 @@ -104,7 +104,7 @@ CONFIG_FT_FDC_IRQ_0 -1 int ' DMA channel of the floppy disk controller' \ CONFIG_FT_FDC_DMA_0 -1 - comment + comment '' fi fi fi @@ -178,7 +178,7 @@ CONFIG_FT_FDC_IRQ_1 -1 int ' DMA channel of the floppy disk controller' \ CONFIG_FT_FDC_DMA_1 -1 - comment + comment '' fi fi fi @@ -252,7 +252,7 @@ CONFIG_FT_FDC_IRQ_2 -1 int ' DMA channel of the floppy disk controller' \ CONFIG_FT_FDC_DMA_2 -1 - comment + comment '' fi fi fi @@ -326,7 +326,7 @@ CONFIG_FT_FDC_IRQ_3 -1 int ' DMA channel of the floppy disk controller' \ CONFIG_FT_FDC_DMA_3 -1 - comment + comment '' fi fi fi