Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (f3191248) · Commits · 戴 / test

Documentation/ide/ChangeLog.ide-cd.1994-2004

0 → 100644

+268 −0

Original line number	Diff line number	Diff line
		/*
		* 1.00 Oct 31, 1994 -- Initial version.
		* 1.01 Nov 2, 1994 -- Fixed problem with starting request in
		* cdrom_check_status.
		* 1.03 Nov 25, 1994 -- leaving unmask_intr[] as a user-setting (as for disks)
		* (from mlord) -- minor changes to cdrom_setup()
		* -- renamed ide_dev_s to ide_drive_t, enable irq on command
		* 2.00 Nov 27, 1994 -- Generalize packet command interface;
		* add audio ioctls.
		* 2.01 Dec 3, 1994 -- Rework packet command interface to handle devices
		* which send an interrupt when ready for a command.
		* 2.02 Dec 11, 1994 -- Cache the TOC in the driver.
		* Don't use SCMD_PLAYAUDIO_TI; it's not included
		* in the current version of ATAPI.
		* Try to use LBA instead of track or MSF addressing
		* when possible.
		* Don't wait for READY_STAT.
		* 2.03 Jan 10, 1995 -- Rewrite block read routines to handle block sizes
		* other than 2k and to move multiple sectors in a
		* single transaction.
		* 2.04 Apr 21, 1995 -- Add work-around for Creative Labs CD220E drives.
		* Thanks to Nick Saw <cwsaw@pts7.pts.mot.com> for
		* help in figuring this out. Ditto for Acer and
		* Aztech drives, which seem to have the same problem.
		* 2.04b May 30, 1995 -- Fix to match changes in ide.c version 3.16 -ml
		* 2.05 Jun 8, 1995 -- Don't attempt to retry after an illegal request
		* or data protect error.
		* Use HWIF and DEV_HWIF macros as in ide.c.
		* Always try to do a request_sense after
		* a failed command.
		* Include an option to give textual descriptions
		* of ATAPI errors.
		* Fix a bug in handling the sector cache which
		* showed up if the drive returned data in 512 byte
		* blocks (like Pioneer drives). Thanks to
		* Richard Hirst <srh@gpt.co.uk> for diagnosing this.
		* Properly supply the page number field in the
		* MODE_SELECT command.
		* PLAYAUDIO12 is broken on the Aztech; work around it.
		* 2.05x Aug 11, 1995 -- lots of data structure renaming/restructuring in ide.c
		* (my apologies to Scott, but now ide-cd.c is independent)
		* 3.00 Aug 22, 1995 -- Implement CDROMMULTISESSION ioctl.
		* Implement CDROMREADAUDIO ioctl (UNTESTED).
		* Use input_ide_data() and output_ide_data().
		* Add door locking.
		* Fix usage count leak in cdrom_open, which happened
		* when a read-write mount was attempted.
		* Try to load the disk on open.
		* Implement CDROMEJECT_SW ioctl (off by default).
		* Read total cdrom capacity during open.
		* Rearrange logic in cdrom_decode_status. Issue
		* request sense commands for failed packet commands
		* from here instead of from cdrom_queue_packet_command.
		* Fix a race condition in retrieving error information.
		* Suppress printing normal unit attention errors and
		* some drive not ready errors.
		* Implement CDROMVOLREAD ioctl.
		* Implement CDROMREADMODE1/2 ioctls.
		* Fix race condition in setting up interrupt handlers
		* when the `serialize' option is used.
		* 3.01 Sep 2, 1995 -- Fix ordering of reenabling interrupts in
		* cdrom_queue_request.
		* Another try at using ide_[input,output]_data.
		* 3.02 Sep 16, 1995 -- Stick total disk capacity in partition table as well.
		* Make VERBOSE_IDE_CD_ERRORS dump failed command again.
		* Dump out more information for ILLEGAL REQUEST errs.
		* Fix handling of errors occurring before the
		* packet command is transferred.
		* Fix transfers with odd bytelengths.
		* 3.03 Oct 27, 1995 -- Some Creative drives have an id of just `CD'.
		* `DCI-2S10' drives are broken too.
		* 3.04 Nov 20, 1995 -- So are Vertos drives.
		* 3.05 Dec 1, 1995 -- Changes to go with overhaul of ide.c and ide-tape.c
		* 3.06 Dec 16, 1995 -- Add support needed for partitions.
		* More workarounds for Vertos bugs (based on patches
		* from Holger Dietze <dietze@aix520.informatik.uni-leipzig.de>).
		* Try to eliminate byteorder assumptions.
		* Use atapi_cdrom_subchnl struct definition.
		* Add STANDARD_ATAPI compilation option.
		* 3.07 Jan 29, 1996 -- More twiddling for broken drives: Sony 55D,
		* Vertos 300.
		* Add NO_DOOR_LOCKING configuration option.
		* Handle drive_cmd requests w/NULL args (for hdparm -t).
		* Work around sporadic Sony55e audio play problem.
		* 3.07a Feb 11, 1996 -- check drive->id for NULL before dereferencing, to fix
		* problem with "hde=cdrom" with no drive present. -ml
		* 3.08 Mar 6, 1996 -- More Vertos workarounds.
		* 3.09 Apr 5, 1996 -- Add CDROMCLOSETRAY ioctl.
		* Switch to using MSF addressing for audio commands.
		* Reformat to match kernel tabbing style.
		* Add CDROM_GET_UPC ioctl.
		* 3.10 Apr 10, 1996 -- Fix compilation error with STANDARD_ATAPI.
		* 3.11 Apr 29, 1996 -- Patch from Heiko Eißfeldt <heiko@colossus.escape.de>
		* to remove redundant verify_area calls.
		* 3.12 May 7, 1996 -- Rudimentary changer support. Based on patches
		* from Gerhard Zuber <zuber@berlin.snafu.de>.
		* Let open succeed even if there's no loaded disc.
		* 3.13 May 19, 1996 -- Fixes for changer code.
		* 3.14 May 29, 1996 -- Add work-around for Vertos 600.
		* (From Hennus Bergman <hennus@sky.ow.nl>.)
		* 3.15 July 2, 1996 -- Added support for Sanyo 3 CD changers
		* from Ben Galliart <bgallia@luc.edu> with
		* special help from Jeff Lightfoot
		* <jeffml@pobox.com>
		* 3.15a July 9, 1996 -- Improved Sanyo 3 CD changer identification
		* 3.16 Jul 28, 1996 -- Fix from Gadi to reduce kernel stack usage for ioctl.
		* 3.17 Sep 17, 1996 -- Tweak audio reads for some drives.
		* Start changing CDROMLOADFROMSLOT to CDROM_SELECT_DISC.
		* 3.18 Oct 31, 1996 -- Added module and DMA support.
		*
		* 4.00 Nov 5, 1996 -- New ide-cd maintainer,
		* Erik B. Andersen <andersee@debian.org>
		* -- Newer Creative drives don't always set the error
		* register correctly. Make sure we see media changes
		* regardless.
		* -- Integrate with generic cdrom driver.
		* -- CDROMGETSPINDOWN and CDROMSETSPINDOWN ioctls, based on
		* a patch from Ciro Cattuto <>.
		* -- Call set_device_ro.
		* -- Implement CDROMMECHANISMSTATUS and CDROMSLOTTABLE
		* ioctls, based on patch by Erik Andersen
		* -- Add some probes of drive capability during setup.
		*
		* 4.01 Nov 11, 1996 -- Split into ide-cd.c and ide-cd.h
		* -- Removed CDROMMECHANISMSTATUS and CDROMSLOTTABLE
		* ioctls in favor of a generalized approach
		* using the generic cdrom driver.
		* -- Fully integrated with the 2.1.X kernel.
		* -- Other stuff that I forgot (lots of changes)
		*
		* 4.02 Dec 01, 1996 -- Applied patch from Gadi Oxman <gadio@netvision.net.il>
		* to fix the drive door locking problems.
		*
		* 4.03 Dec 04, 1996 -- Added DSC overlap support.
		* 4.04 Dec 29, 1996 -- Added CDROMREADRAW ioclt based on patch
		* by Ales Makarov (xmakarov@sun.felk.cvut.cz)
		*
		* 4.05 Nov 20, 1997 -- Modified to print more drive info on init
		* Minor other changes
		* Fix errors on CDROMSTOP (If you have a "Dolphin",
		* you must define IHAVEADOLPHIN)
		* Added identifier so new Sanyo CD-changer works
		* Better detection if door locking isn't supported
		*
		* 4.06 Dec 17, 1997 -- fixed endless "tray open" messages -ml
		* 4.07 Dec 17, 1997 -- fallback to set pc->stat on "tray open"
		* 4.08 Dec 18, 1997 -- spew less noise when tray is empty
		* -- fix speed display for ACER 24X, 18X
		* 4.09 Jan 04, 1998 -- fix handling of the last block so we return
		* an end of file instead of an I/O error (Gadi)
		* 4.10 Jan 24, 1998 -- fixed a bug so now changers can change to a new
		* slot when there is no disc in the current slot.
		* -- Fixed a memory leak where info->changer_info was
		* malloc'ed but never free'd when closing the device.
		* -- Cleaned up the global namespace a bit by making more
		* functions static that should already have been.
		* 4.11 Mar 12, 1998 -- Added support for the CDROM_SELECT_SPEED ioctl
		* based on a patch for 2.0.33 by Jelle Foks
		* <jelle@scintilla.utwente.nl>, a patch for 2.0.33
		* by Toni Giorgino <toni@pcape2.pi.infn.it>, the SCSI
		* version, and my own efforts. -erik
		* -- Fixed a stupid bug which egcs was kind enough to
		* inform me of where "Illegal mode for this track"
		* was never returned due to a comparison on data
		* types of limited range.
		* 4.12 Mar 29, 1998 -- Fixed bug in CDROM_SELECT_SPEED so write speed is
		* now set ionly for CD-R and CD-RW drives. I had
		* removed this support because it produced errors.
		* It produced errors _only_ for non-writers. duh.
		* 4.13 May 05, 1998 -- Suppress useless "in progress of becoming ready"
		* messages, since this is not an error.
		* -- Change error messages to be const
		* -- Remove a "\t" which looks ugly in the syslogs
		* 4.14 July 17, 1998 -- Change to pointing to .ps version of ATAPI spec
		* since the .pdf version doesn't seem to work...
		* -- Updated the TODO list to something more current.
		*
		* 4.15 Aug 25, 1998 -- Updated ide-cd.h to respect mechine endianess,
		* patch thanks to "Eddie C. Dost" <ecd@skynet.be>
		*
		* 4.50 Oct 19, 1998 -- New maintainers!
		* Jens Axboe <axboe@image.dk>
		* Chris Zwilling <chris@cloudnet.com>
		*
		* 4.51 Dec 23, 1998 -- Jens Axboe <axboe@image.dk>
		* - ide_cdrom_reset enabled since the ide subsystem
		* handles resets fine now. <axboe@image.dk>
		* - Transfer size fix for Samsung CD-ROMs, thanks to
		* "Ville Hallik" <ville.hallik@mail.ee>.
		* - other minor stuff.
		*
		* 4.52 Jan 19, 1999 -- Jens Axboe <axboe@image.dk>
		* - Detect DVD-ROM/RAM drives
		*
		* 4.53 Feb 22, 1999 - Include other model Samsung and one Goldstar
		* drive in transfer size limit.
		* - Fix the I/O error when doing eject without a medium
		* loaded on some drives.
		* - CDROMREADMODE2 is now implemented through
		* CDROMREADRAW, since many drives don't support
		* MODE2 (even though ATAPI 2.6 says they must).
		* - Added ignore parameter to ide-cd (as a module), eg
		* insmod ide-cd ignore='hda hdb'
		* Useful when using ide-cd in conjunction with
		* ide-scsi. TODO: non-modular way of doing the
		* same.
		*
		* 4.54 Aug 5, 1999 - Support for MMC2 class commands through the generic
		* packet interface to cdrom.c.
		* - Unified audio ioctl support, most of it.
		* - cleaned up various deprecated verify_area().
		* - Added ide_cdrom_packet() as the interface for
		* the Uniform generic_packet().
		* - bunch of other stuff, will fill in logs later.
		* - report 1 slot for non-changers, like the other
		* cd-rom drivers. don't report select disc for
		* non-changers as well.
		* - mask out audio playing, if the device can't do it.
		*
		* 4.55 Sep 1, 1999 - Eliminated the rest of the audio ioctls, except
		* for CDROMREADTOC[ENTRY\|HEADER]. Some of the drivers
		* use this independently of the actual audio handling.
		* They will disappear later when I get the time to
		* do it cleanly.
		* - Minimize the TOC reading - only do it when we
		* know a media change has occurred.
		* - Moved all the CDROMREADx ioctls to the Uniform layer.
		* - Heiko Eißfeldt <heiko@colossus.escape.de> supplied
		* some fixes for CDI.
		* - CD-ROM leaving door locked fix from Andries
		* Brouwer <Andries.Brouwer@cwi.nl>
		* - Erik Andersen <andersen@xmission.com> unified
		* commands across the various drivers and how
		* sense errors are handled.
		*
		* 4.56 Sep 12, 1999 - Removed changer support - it is now in the
		* Uniform layer.
		* - Added partition based multisession handling.
		* - Mode sense and mode select moved to the
		* Uniform layer.
		* - Fixed a problem with WPI CDS-32X drive - it
		* failed the capabilities
		*
		* 4.57 Apr 7, 2000 - Fixed sense reporting.
		* - Fixed possible oops in ide_cdrom_get_last_session()
		* - Fix locking mania and make ide_cdrom_reset relock
		* - Stop spewing errors to log when magicdev polls with
		* TEST_UNIT_READY on some drives.
		* - Various fixes from Tobias Ringstrom:
		* tray if it was locked prior to the reset.
		* - cdrom_read_capacity returns one frame too little.
		* - Fix real capacity reporting.
		*
		* 4.58 May 1, 2000 - Clean up ACER50 stuff.
		* - Fix small problem with ide_cdrom_capacity
		*
		* 4.59 Aug 11, 2000 - Fix changer problem in cdrom_read_toc, we weren't
		* correctly sensing a disc change.
		* - Rearranged some code
		* - Use extended sense on drives that support it for
		* correctly reporting tray status -- from
		* Michael D Johnson <johnsom@orst.edu>
		* 4.60 Dec 17, 2003 - Add mt rainier support
		* - Bump timeout for packet commands, matches sr
		* - Odd stuff
		* 4.61 Jan 22, 2004 - support hardware sector sizes other than 2kB,
		* Pascal Schmidt <der.eremit@email.de>
		*/

Documentation/ide/ChangeLog.ide-floppy.1996-2002

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		/*
		* Many thanks to Lode Leroy <Lode.Leroy@www.ibase.be>, who tested so many
		* ALPHA patches to this driver on an EASYSTOR LS-120 ATAPI floppy drive.
		*
		* Ver 0.1 Oct 17 96 Initial test version, mostly based on ide-tape.c.
		* Ver 0.2 Oct 31 96 Minor changes.
		* Ver 0.3 Dec 2 96 Fixed error recovery bug.
		* Ver 0.4 Jan 26 97 Add support for the HDIO_GETGEO ioctl.
		* Ver 0.5 Feb 21 97 Add partitions support.
		* Use the minimum of the LBA and CHS capacities.
		* Avoid hwgroup->rq == NULL on the last irq.
		* Fix potential null dereferencing with DEBUG_LOG.
		* Ver 0.8 Dec 7 97 Increase irq timeout from 10 to 50 seconds.
		* Add media write-protect detection.
		* Issue START command only if TEST UNIT READY fails.
		* Add work-around for IOMEGA ZIP revision 21.D.
		* Remove idefloppy_get_capabilities().
		* Ver 0.9 Jul 4 99 Fix a bug which might have caused the number of
		* bytes requested on each interrupt to be zero.
		* Thanks to <shanos@es.co.nz> for pointing this out.
		* Ver 0.9.sv Jan 6 01 Sam Varshavchik <mrsam@courier-mta.com>
		* Implement low level formatting. Reimplemented
		* IDEFLOPPY_CAPABILITIES_PAGE, since we need the srfp
		* bit. My LS-120 drive barfs on
		* IDEFLOPPY_CAPABILITIES_PAGE, but maybe it's just me.
		* Compromise by not reporting a failure to get this
		* mode page. Implemented four IOCTLs in order to
		* implement formatting. IOCTls begin with 0x4600,
		* 0x46 is 'F' as in Format.
		* Jan 9 01 Userland option to select format verify.
		* Added PC_SUPPRESS_ERROR flag - some idefloppy drives
		* do not implement IDEFLOPPY_CAPABILITIES_PAGE, and
		* return a sense error. Suppress error reporting in
		* this particular case in order to avoid spurious
		* errors in syslog. The culprit is
		* idefloppy_get_capability_page(), so move it to
		* idefloppy_begin_format() so that it's not used
		* unless absolutely necessary.
		* If drive does not support format progress indication
		* monitor the dsc bit in the status register.
		* Also, O_NDELAY on open will allow the device to be
		* opened without a disk available. This can be used to
		* open an unformatted disk, or get the device capacity.
		* Ver 0.91 Dec 11 99 Added IOMEGA Clik! drive support by
		* <paul@paulbristow.net>
		* Ver 0.92 Oct 22 00 Paul Bristow became official maintainer for this
		* driver. Included Powerbook internal zip kludge.
		* Ver 0.93 Oct 24 00 Fixed bugs for Clik! drive
		* no disk on insert and disk change now works
		* Ver 0.94 Oct 27 00 Tidied up to remove strstr(Clik) everywhere
		* Ver 0.95 Nov 7 00 Brought across to kernel 2.4
		* Ver 0.96 Jan 7 01 Actually in line with release version of 2.4.0
		* including set_bit patch from Rusty Russell
		* 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
		*/

drivers/cdrom/cdrom.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -2787,12 +2787,6 @@ int cdrom_ioctl(struct file * file, struct cdrom_device_info *cdi,
		return -ENOSYS;
		}

		static inline
		int msf_to_lba(char m, char s, char f)
		{
		return (((m * CD_SECS) + s) * CD_FRAMES + f) - CD_MSF_OFFSET;
		}

		/*
		* Required when we need to use READ_10 to issue other than 2048 block
		* reads

drivers/ide/Kconfig

+32 −23

File changed.

Preview size limit exceeded, changes collapsed.

drivers/ide/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -40,8 +40,10 @@ obj-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o
		obj-$(CONFIG_IDE_H8300) += h8300/
		obj-$(CONFIG_IDE_GENERIC) += ide-generic.o

		ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o

		obj-$(CONFIG_BLK_DEV_IDEDISK) += ide-disk.o
		obj-$(CONFIG_BLK_DEV_IDECD) += ide-cd.o
		obj-$(CONFIG_BLK_DEV_IDECD) += ide-cd_mod.o
		obj-$(CONFIG_BLK_DEV_IDETAPE) += ide-tape.o
		obj-$(CONFIG_BLK_DEV_IDEFLOPPY) += ide-floppy.o

Admin message