diff -urN wt2-5f/drivers/ide/ide-floppy.c wt2/drivers/ide/ide-floppy.c --- wt2-5f/drivers/ide/ide-floppy.c Sun Mar 3 20:10:09 2002 +++ wt2/drivers/ide/ide-floppy.c Sun Mar 3 20:15:25 2002 @@ -71,6 +71,11 @@ * including set_bit patch from Rusty Russel * Ver 0.97 Jul 22 01 Merge 0.91-0.96 onto 0.9.sv for ac series * Ver 0.97.sv Aug 3 01 Backported from 2.4.7-ac3 + * Ver 0.98 Oct 26 01 Split idefloppy_transfer_pc into two pieces to + * fix a lost interrupt problem. It appears the busy + * bit was being deasserted by my IOMEGA ATAPI ZIP 100 + * drive before the drive was actually ready. + * Ver 0.98a Oct 29 01 Expose delay value so we can play. * Ver 0.99 Feb 24 02 Remove duplicate code, modify clik! detection code to support new PocketZip drives */ @@ -2027,20 +2032,12 @@ if (strcmp(drive->id->model, "IOMEGA ZIP 100 ATAPI") == 0) { + set_bit(IDEFLOPPY_ZIP_DRIVE, &floppy->flags); + /* This value will be visible in the /proc/ide/hdx/settings */ + floppy->ticks = IDEFLOPPY_TICKS_DELAY; for (i = 0; i < 1 << PARTN_BITS; i++) max_sectors[major][minor + i] = 64; } - /* - * Guess what? The IOMEGA Clik! drive also needs the - * above fix. It makes nasty clicking noises without - * it, so please don't remove this. - */ - if (strncmp(drive->id->model, "IOMEGA Clik", 11) == 0) - { - for (i = 0; i < 1 << PARTN_BITS; i++) - max_sectors[major][minor + i] = 64; - set_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags); - } (void) idefloppy_get_capacity (drive); idefloppy_add_settings(drive);