ide-cd: re-organize handling of quirky devices

Re-organize handling of quirky devices:

* Add struct cd_list_entry, ide_cd_quirks_list[] and ide_cd_flags() helper.

* Set flags returned by ide_cd_flags() in ide_cdrom_setup().

* Add IDE_CD_FLAG_VERTOS_{300_SDD,600_ESD} and IDE_CD_FLAG_SANYO_3CD flags.

* Move device quirks from ide_cdrom_setup() to ide_cd_quirks_list[].

* Rename IDE_CD_FLAG_NEC260 to IDE_CD_FLAG_PRE_ATAPI12 and handle
  quirky Stingray 8X CD-ROM using ide_cd_quirks_list[].

* Add IDE_CD_FLAG_FULL_CAPS_PAGE flag and handle quirky ACER 50X CD-ROM
  / WPI 32X CD-ROM using ide_cd_quirk_list[].

* Add IDE_CD_FLAG_PLAY_AUDIO_OK flag and handle quirky MATSHITA DVD-ROMs
  using ide_cd_quirks_list[].

* Add IDE_CD_FLAG_LE_SPEED_FIELDS flag and handle quirky ACER/AOpen 24X
  CD-ROM using ide_cd_quirk_list[].

* Fix some comments about quirky devices while at it.

There should be no functionality changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h
index 34e9291c0a8e..fc8d6d626b8d 100644
--- a/drivers/ide/ide-cd.h
+++ b/drivers/ide/ide-cd.h
@@ -44,8 +44,8 @@ enum {
         IDE_CD_FLAG_NO_DOORLOCK         = (1 << 1),
         /* Drive cannot eject the disc. */
         IDE_CD_FLAG_NO_EJECT            = (1 << 2),
-        /* Drive is a pre-1.2 NEC 260 drive. */
-        IDE_CD_FLAG_NEC260              = (1 << 3),
+        /* Drive is a pre ATAPI 1.2 drive. */
+        IDE_CD_FLAG_PRE_ATAPI12         = (1 << 3),
         /* TOC addresses are in BCD. */
         IDE_CD_FLAG_TOCADDR_AS_BCD      = (1 << 4),
         /* TOC track numbers are in BCD. */
@@ -65,6 +65,12 @@ enum {
         IDE_CD_FLAG_DOOR_LOCKED         = (1 << 10),
         /* SET_CD_SPEED command is unsupported. */
         IDE_CD_FLAG_NO_SPEED_SELECT     = (1 << 11),
+        IDE_CD_FLAG_VERTOS_300_SSD      = (1 << 12),
+        IDE_CD_FLAG_VERTOS_600_ESD      = (1 << 13),
+        IDE_CD_FLAG_SANYO_3CD           = (1 << 14),
+        IDE_CD_FLAG_FULL_CAPS_PAGE      = (1 << 15),
+        IDE_CD_FLAG_PLAY_AUDIO_OK       = (1 << 16),
+        IDE_CD_FLAG_LE_SPEED_FIELDS     = (1 << 17),
 };
 
 /* Structure of a MSF cdrom address. */