system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 14:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

I knew it, I introduced new bugs :)

Browse source 
The lun is not incremented in the ata-disk driver when ATA_STATIC_ID
is not defined, thanks to Kenneth Wayne Culver <culverk@wam.umd.edu>
for finding that one.

PHK pointed at the & problem in atapi-cd in devstat_end_transaction_buf.

Too little sleep I guess...
This commit is contained in:
Søren Schmidt 1999-09-22 07:15:46 +00:00
parent 3ab9676ab3
commit 0720c0ebbe
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=51539
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/dev/ata/ata-disk.c
View file

@ -205,26 +205,26 @@ ad_attach(void *notused)
if (bootverbose)
printf("ad%d: piomode=%d dmamode=%d udmamode=%d\n",
adnlun, apiomode(adp->ata_parm),
adp->lun, apiomode(adp->ata_parm),
wdmamode(adp->ata_parm), udmamode(adp->ata_parm));
printf("ad%d: <%s/%s> ATA-%c disk at ata%d as %s\n",
adnlun, model_buf, revision_buf,
adp->lun, model_buf, revision_buf,
ad_version(adp->ata_parm->versmajor), ctlr,
(adp->unit == ATA_MASTER) ? "master" : "slave ");
printf("ad%d: %luMB (%u sectors), "
"%u cyls, %u heads, %u S/T, %u B/S\n",
adnlun, adp->total_secs / ((1024L * 1024L) / DEV_BSIZE),
adp->lun, adp->total_secs / ((1024L * 1024L)/DEV_BSIZE),
adp->total_secs, adp->cylinders, adp->heads,
adp->sectors, DEV_BSIZE);
printf("ad%d: %d secs/int, %d depth queue, %s\n",
adnlun, adp->transfersize / DEV_BSIZE, adp->num_tags,
adp->lun, adp->transfersize / DEV_BSIZE, adp->num_tags,
ata_mode2str(adp->controller->mode[
(adp->unit == ATA_MASTER) ? 0 : 1]));
devstat_add_entry(&adp->stats, "ad", adnlun, DEV_BSIZE,
devstat_add_entry(&adp->stats, "ad", adp->lun, DEV_BSIZE,
DEVSTAT_NO_ORDERED_TAGS,
DEVSTAT_TYPE_DIRECT | DEVSTAT_TYPE_IF_IDE,
0x180);
@ -237,6 +237,7 @@ ad_attach(void *notused)
dev1->si_drv1 = adp;
bufq_init(&adp->queue);
adnlun++;
}
}
}

2
sys/dev/ata/atapi-cd.c
View file

@ -1127,7 +1127,7 @@ acd_done(struct atapi_request *request)
if ((bp->b_flags & B_READ) == B_WRITE)
cdp->flags |= F_WRITTEN;
}
devstat_end_transaction_buf(&cdp->stats, bp);
devstat_end_transaction_buf(cdp->stats, bp);
biodone(bp);
acd_start(cdp);
}