Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / drivers / ide / ide-cd.c

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 89a112d513adc9fb9e1ccf2cf2d4c8a818eea675..f16bb4667238acb65d0a9f3af3ee1421858194a6 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1272,9 +1272,9 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
  */
 static void msf_from_bcd(struct atapi_msf *msf)
 {
-       msf->minute = BCD2BIN(msf->minute);
-       msf->second = BCD2BIN(msf->second);
-       msf->frame  = BCD2BIN(msf->frame);
+       msf->minute = bcd2bin(msf->minute);
+       msf->second = bcd2bin(msf->second);
+       msf->frame  = bcd2bin(msf->frame);
 }
 
 int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
@@ -1415,8 +1415,8 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)
                return stat;
 
        if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
-               toc->hdr.first_track = BCD2BIN(toc->hdr.first_track);
-               toc->hdr.last_track  = BCD2BIN(toc->hdr.last_track);
+               toc->hdr.first_track = bcd2bin(toc->hdr.first_track);
+               toc->hdr.last_track  = bcd2bin(toc->hdr.last_track);
        }
 
        ntracks = toc->hdr.last_track - toc->hdr.first_track + 1;
@@ -1456,8 +1456,8 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)
                        return stat;
 
                if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
-                       toc->hdr.first_track = (u8)BIN2BCD(CDROM_LEADOUT);
-                       toc->hdr.last_track = (u8)BIN2BCD(CDROM_LEADOUT);
+                       toc->hdr.first_track = (u8)bin2bcd(CDROM_LEADOUT);
+                       toc->hdr.last_track = (u8)bin2bcd(CDROM_LEADOUT);
                } else {
                        toc->hdr.first_track = CDROM_LEADOUT;
                        toc->hdr.last_track = CDROM_LEADOUT;
@@ -1470,14 +1470,14 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)
        toc->hdr.toc_length = be16_to_cpu(toc->hdr.toc_length);
 
        if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
-               toc->hdr.first_track = BCD2BIN(toc->hdr.first_track);
-               toc->hdr.last_track  = BCD2BIN(toc->hdr.last_track);
+               toc->hdr.first_track = bcd2bin(toc->hdr.first_track);
+               toc->hdr.last_track  = bcd2bin(toc->hdr.last_track);
        }
 
        for (i = 0; i <= ntracks; i++) {
                if (drive->atapi_flags & IDE_AFLAG_TOCADDR_AS_BCD) {
                        if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD)
-                               toc->ent[i].track = BCD2BIN(toc->ent[i].track);
+                               toc->ent[i].track = bcd2bin(toc->ent[i].track);
                        msf_from_bcd(&toc->ent[i].addr.msf);
                }
                toc->ent[i].addr.lba = msf_to_lba(toc->ent[i].addr.msf.minute,
@@ -1661,7 +1661,9 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive)
                cdi->mask &= ~CDC_PLAY_AUDIO;
 
        mechtype = buf[8 + 6] >> 5;
-       if (mechtype == mechtype_caddy || mechtype == mechtype_popup)
+       if (mechtype == mechtype_caddy ||
+           mechtype == mechtype_popup ||
+           (drive->atapi_flags & IDE_AFLAG_NO_AUTOCLOSE))
                cdi->mask |= CDC_CLOSE_TRAY;
 
        if (cdi->sanyo_slot > 0) {
@@ -1859,6 +1861,8 @@ static const struct cd_list_entry ide_cd_quirks_list[] = {
        { "MATSHITADVD-ROM SR-8176", NULL,   IDE_AFLAG_PLAY_AUDIO_OK         },
        { "MATSHITADVD-ROM SR-8174", NULL,   IDE_AFLAG_PLAY_AUDIO_OK         },
        { "Optiarc DVD RW AD-5200A", NULL,   IDE_AFLAG_PLAY_AUDIO_OK         },
+       { "Optiarc DVD RW AD-7200A", NULL,   IDE_AFLAG_PLAY_AUDIO_OK         },
+       { "Optiarc DVD RW AD-7543A", NULL,   IDE_AFLAG_NO_AUTOCLOSE          },
        { NULL, NULL, 0 }
 };