d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return the right format (LBA/MSF) in TOC entries.

Browse Source 
Null the TOC on media change even if no media present.

Reported by: des
This commit is contained in:
Søren Schmidt 2005-10-28 21:41:42 +00:00
parent 2ad08c56d8
commit ae539be6f8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=151826
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/ata/atapi-cd.c
View File

@ -337,9 +337,11 @@ acd_geom_ioctl(struct g_provider *pp, u_long cmd, void *addr, int fflag, struct
bcopy(&cdp->toc, toc, sizeof(struct toc));
entry = toc->tab + (toc->hdr.ending_track + 1 -
toc->hdr.starting_track) + 1;
while (--entry >= toc->tab)
while (--entry >= toc->tab) {
lba2msf(ntohl(entry->addr.lba), &entry->addr.msf.minute,
&entry->addr.msf.second, &entry->addr.msf.frame);
entry->addr_type = CD_MSF_FORMAT;
}
}
error = copyout(toc->tab + starting_track - toc->hdr.starting_track,
te->data, len);
@ -940,17 +942,17 @@ acd_read_toc(device_t dev)
int8_t ccb[16];
int track, ntracks, len;
if (acd_test_ready(dev))
return;
if (!(atadev->flags & ATA_D_MEDIA_CHANGED))
return;
atadev->flags &= ~ATA_D_MEDIA_CHANGED;
bzero(&cdp->toc, sizeof(cdp->toc));
bzero(ccb, sizeof(ccb));
cdp->disk_size = -1; /* hack for GEOM SOS */
if (acd_test_ready(dev))
return;
bzero(ccb, sizeof(ccb));
len = sizeof(struct ioc_toc_header) + sizeof(struct cd_toc_entry);
ccb[0] = ATAPI_READ_TOC;
ccb[7] = len>>8;