diff options
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 32 | ||||
| -rw-r--r-- | sys/dev/ata/atapi-tape.c | 12 |
2 files changed, 22 insertions, 22 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 773d7b4..4ae6b4a 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -402,14 +402,14 @@ acd_describe(struct acd_softc *cdp) } printf("\n"); if (cdp->cap.audio_play) { - ata_printf(cdp->atp->controller, cdp->atp->unit, "Audio:"); + ata_printf(cdp->atp->controller, cdp->atp->unit, "Audio: "); if (cdp->cap.audio_play) printf("play"); if (cdp->cap.max_vol_levels) printf(", %d volume levels", cdp->cap.max_vol_levels); + printf("\n"); } - printf("\n"); - ata_printf(cdp->atp->controller, cdp->atp->unit, "Mechanism:"); + ata_printf(cdp->atp->controller, cdp->atp->unit, "Mechanism: "); switch (cdp->cap.mech) { case MST_MECH_CADDY: mechanism = "caddy"; break; @@ -430,7 +430,7 @@ acd_describe(struct acd_softc *cdp) printf("ejectable"); if (cdp->cap.mech != MST_MECH_CHANGER) { - ata_printf(cdp->atp->controller, cdp->atp->unit, "Medium:"); + ata_printf(cdp->atp->controller, cdp->atp->unit, "Medium: "); switch (cdp->cap.medium_type & MST_TYPE_MASK_HIGH) { case MST_CDROM: printf("CD-ROM "); break; @@ -441,39 +441,39 @@ acd_describe(struct acd_softc *cdp) case MST_DOOR_OPEN: printf("door open"); break; case MST_NO_DISC: - printf("no/blank disc inside"); break; + printf("no/blank disc"); break; case MST_FMT_ERROR: printf("medium format error"); break; } if ((cdp->cap.medium_type & MST_TYPE_MASK_HIGH)<MST_TYPE_MASK_HIGH){ switch (cdp->cap.medium_type & MST_TYPE_MASK_LOW) { case MST_DATA_120: - printf("120mm data disc loaded"); break; + printf("120mm data disc"); break; case MST_AUDIO_120: - printf("120mm audio disc loaded"); break; + printf("120mm audio disc"); break; case MST_COMB_120: - printf("120mm data/audio disc loaded"); break; + printf("120mm data/audio disc"); break; case MST_PHOTO_120: - printf("120mm photo disc loaded"); break; + printf("120mm photo disc"); break; case MST_DATA_80: - printf("80mm data disc loaded"); break; + printf("80mm data disc"); break; case MST_AUDIO_80: - printf("80mm audio disc loaded"); break; + printf("80mm audio disc"); break; case MST_COMB_80: - printf("80mm data/audio disc loaded"); break; + printf("80mm data/audio disc"); break; case MST_PHOTO_80: - printf("80mm photo disc loaded"); break; + printf("80mm photo disc"); break; case MST_FMT_NONE: switch (cdp->cap.medium_type & MST_TYPE_MASK_HIGH) { case MST_CDROM: - printf("unknown medium"); break; + printf("unknown"); break; case MST_CDR: case MST_CDRW: - printf("blank medium"); break; + printf("blank"); break; } break; default: - printf("unknown type=0x%x", cdp->cap.medium_type); break; + printf("unknown (0x%x)", cdp->cap.medium_type); break; } } } diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c index d9a2843..c1e8ea4 100644 --- a/sys/dev/ata/atapi-tape.c +++ b/sys/dev/ata/atapi-tape.c @@ -213,18 +213,18 @@ ast_describe(struct ast_softc *stp) printf("%dKB buffer, ", (stp->cap.buffer_size * DEV_BSIZE) / 1024); printf("%s\n", ata_mode2str(stp->atp->controller->mode[ ATA_DEV(stp->atp->unit)])); - ata_printf(stp->atp->controller, stp->atp->unit, ""); + ata_printf(stp->atp->controller, stp->atp->unit, "Medium: "); switch (stp->cap.medium_type) { case 0x00: - printf("Drive empty"); break; + printf("none"); break; case 0x17: - printf("Travan 1 (400 Mbyte) media"); break; + printf("Travan 1 (400 Mbyte)"); break; case 0xb6: - printf("Travan 4 (4 Gbyte) media"); break; + printf("Travan 4 (4 Gbyte)"); break; case 0xda: - printf("OnStream ADR (15Gyte) media"); break; + printf("OnStream ADR (15Gyte)"); break; default: - printf("Unknown media (0x%x)", stp->cap.medium_type); + printf("unknown (0x%x)", stp->cap.medium_type); } if (stp->cap.readonly) printf(", readonly"); if (stp->cap.reverse) printf(", reverse"); |
