Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
ide-cd: use bcd2bin/bin2bcd
Change ide-cd to use the new bcd2bin/bin2bcd functions instead of the
obsolete BCD2BIN/BIN2BCD macros.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
authored by Adrian Bunk and committed by Bartlomiej Zolnierkiewicz fc99856a bce31b67
+10
-10
drivers/ide/ide-cd.c
+10
-10
drivers/ide/ide-cd.c
···
1272
*/
1273
static void msf_from_bcd(struct atapi_msf *msf)
1274
{
1275
-
msf->minute = BCD2BIN(msf->minute);
1276
-
msf->second = BCD2BIN(msf->second);
1277
-
msf->frame = BCD2BIN(msf->frame);
1278
}
1279
1280
int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
···
1415
return stat;
1416
1417
if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
1418
-
toc->hdr.first_track = BCD2BIN(toc->hdr.first_track);
1419
-
toc->hdr.last_track = BCD2BIN(toc->hdr.last_track);
1420
}
1421
1422
ntracks = toc->hdr.last_track - toc->hdr.first_track + 1;
···
1456
return stat;
1457
1458
if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
1459
-
toc->hdr.first_track = (u8)BIN2BCD(CDROM_LEADOUT);
1460
-
toc->hdr.last_track = (u8)BIN2BCD(CDROM_LEADOUT);
1461
} else {
1462
toc->hdr.first_track = CDROM_LEADOUT;
1463
toc->hdr.last_track = CDROM_LEADOUT;
···
1470
toc->hdr.toc_length = be16_to_cpu(toc->hdr.toc_length);
1471
1472
if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
1473
-
toc->hdr.first_track = BCD2BIN(toc->hdr.first_track);
1474
-
toc->hdr.last_track = BCD2BIN(toc->hdr.last_track);
1475
}
1476
1477
for (i = 0; i <= ntracks; i++) {
1478
if (drive->atapi_flags & IDE_AFLAG_TOCADDR_AS_BCD) {
1479
if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD)
1480
-
toc->ent[i].track = BCD2BIN(toc->ent[i].track);
1481
msf_from_bcd(&toc->ent[i].addr.msf);
1482
}
1483
toc->ent[i].addr.lba = msf_to_lba(toc->ent[i].addr.msf.minute,
···
1272
*/
1273
static void msf_from_bcd(struct atapi_msf *msf)
1274
{
1275
+
msf->minute = bcd2bin(msf->minute);
1276
+
msf->second = bcd2bin(msf->second);
1277
+
msf->frame = bcd2bin(msf->frame);
1278
}
1279
1280
int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
···
1415
return stat;
1416
1417
if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
1418
+
toc->hdr.first_track = bcd2bin(toc->hdr.first_track);
1419
+
toc->hdr.last_track = bcd2bin(toc->hdr.last_track);
1420
}
1421
1422
ntracks = toc->hdr.last_track - toc->hdr.first_track + 1;
···
1456
return stat;
1457
1458
if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
1459
+
toc->hdr.first_track = (u8)bin2bcd(CDROM_LEADOUT);
1460
+
toc->hdr.last_track = (u8)bin2bcd(CDROM_LEADOUT);
1461
} else {
1462
toc->hdr.first_track = CDROM_LEADOUT;
1463
toc->hdr.last_track = CDROM_LEADOUT;
···
1470
toc->hdr.toc_length = be16_to_cpu(toc->hdr.toc_length);
1471
1472
if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {
1473
+
toc->hdr.first_track = bcd2bin(toc->hdr.first_track);
1474
+
toc->hdr.last_track = bcd2bin(toc->hdr.last_track);
1475
}
1476
1477
for (i = 0; i <= ntracks; i++) {
1478
if (drive->atapi_flags & IDE_AFLAG_TOCADDR_AS_BCD) {
1479
if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD)
1480
+
toc->ent[i].track = bcd2bin(toc->ent[i].track);
1481
msf_from_bcd(&toc->ent[i].addr.msf);
1482
}
1483
toc->ent[i].addr.lba = msf_to_lba(toc->ent[i].addr.msf.minute,