diff options
| author | sos <sos@FreeBSD.org> | 2001-03-21 11:49:07 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 2001-03-21 11:49:07 +0000 |
| commit | cbf67f9c44d11cef56adb2ae4c7586d92bfe83e7 (patch) | |
| tree | b7086bcee53553862355905e8e37f46418331768 /sys/dev/ata/atapi-cd.c | |
| parent | 988827577e34a2577a31ddbe6da7d7bfdb177b46 (diff) | |
| download | FreeBSD-src-cbf67f9c44d11cef56adb2ae4c7586d92bfe83e7.zip FreeBSD-src-cbf67f9c44d11cef56adb2ae4c7586d92bfe83e7.tar.gz | |
Set the device names as early as possible.
Diffstat (limited to 'sys/dev/ata/atapi-cd.c')
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 114e0fa..d85630d 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -119,6 +119,9 @@ acdattach(struct atapi_softc *atp) return -1; } + sprintf(name, "acd%d", cdp->lun); + ata_set_name(atp->controller, atp->unit, name); + /* get drive capabilities, some drives needs this repeated */ for (count = 0 ; count < 5 ; count++) { if (!(error = acd_mode_sense(cdp, ATAPI_CDROM_CAP_PAGE, @@ -182,6 +185,8 @@ acdattach(struct atapi_softc *atp) } sprintf(name, "acd%d-%d", cdp->lun, cdp->lun + cdp->changer_info->slots - 1); + ata_free_name(atp->controller, atp->unit); + ata_set_name(atp->controller, atp->unit, name); devstat_add_entry(cdp->stats, name, tmpcdp->lun, DEV_BSIZE, DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_IDE, @@ -194,8 +199,6 @@ acdattach(struct atapi_softc *atp) DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_IDE, DEVSTAT_PRIORITY_CD); - sprintf(name, "acd%d", cdp->lun); - ata_set_name(atp->controller, atp->unit, name); } cdp->atp->driver = cdp; acd_describe(cdp); @@ -318,7 +321,7 @@ acd_describe(struct acd_softc *cdp) device_get_unit(cdp->atp->controller->dev), (cdp->atp->unit == ATA_MASTER) ? "master" : "slave"); - ata_printf(cdp->atp->controller, cdp->atp->unit, ""); + ata_printf(cdp->atp->controller, cdp->atp->unit, "%s", ""); if (cdp->cap.cur_read_speed) { printf("read %dKB/s", cdp->cap.cur_read_speed * 1000 / 1024); if (cdp->cap.max_read_speed) |
