From d5a9dcbf23b73de991127af79f2f81e688fb7a40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Schmidt?= <sos@FreeBSD.org>
Date: Thu, 5 Aug 2004 21:11:33 +0000
Subject: [PATCH] Add firmware revision to probe printf.

---
 sys/dev/ata/ata-disk.c   | 5 +++--
 sys/dev/ata/atapi-cd.c   | 3 ++-
 sys/dev/ata/atapi-fd.c   | 4 ++--
 sys/dev/ata/atapi-tape.c | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 46c0f626f01..9007d3b78ff 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -392,10 +392,11 @@ ad_print(struct ad_softc *adp)
 		   ata_mode2str(adp->device->mode));
     }
     else {
-	ata_prtdev(adp->device,"%lluMB <%.40s> [%lld/%d/%d] at ata%d-%s %s",
+	ata_prtdev(adp->device,
+		   "%lluMB <%.40s/%.8s> [%lld/%d/%d] at ata%d-%s %s",
 		   (unsigned long long)(adp->total_secs /
 					((1024L * 1024L) / DEV_BSIZE)),
-		   adp->device->param->model,
+		   adp->device->param->model, adp->device->param->revision,
 		   (unsigned long long)(adp->total_secs /
 					(adp->heads * adp->sectors)),
 		   adp->heads, adp->sectors,
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 76597c9ce55..7722a1b91ea 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -454,7 +454,8 @@ acd_describe(struct acd_softc *cdp)
 		       (cdp->cap.media & MST_READ_DVDROM) ? "DVDROM" : "CDROM");
 	if (cdp->changer_info)
 	    printf("with %d CD changer ", cdp->changer_info->slots);
-	printf("<%.40s> at ata%d-%s %s\n", cdp->device->param->model,
+	printf("<%.40s/%.8s> at ata%d-%s %s\n",
+	       cdp->device->param->model, cdp->device->param->revision,
 	       device_get_unit(cdp->device->channel->dev),
 	       (cdp->device->unit == ATA_MASTER) ? "master" : "slave",
 	       ata_mode2str(cdp->device->mode) );
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index eaf30662d69..9fda1406aa5 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -211,8 +211,8 @@ afd_describe(struct afd_softc *fdp)
 	}
     }
     else {
-	ata_prtdev(fdp->device, "REMOVABLE <%.40s> at ata%d-%s %s\n",
-		   fdp->device->param->model,
+	ata_prtdev(fdp->device, "REMOVABLE <%.40s/%.8s> at ata%d-%s %s\n",
+		   fdp->device->param->model, fdp->device->param->revision,
 		   device_get_unit(fdp->device->channel->dev),
 		   (fdp->device->unit == ATA_MASTER) ? "master" : "slave",
 		   ata_mode2str(fdp->device->mode));
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index e6f794c92b2..654925fb3d8 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -256,8 +256,8 @@ ast_describe(struct ast_softc *stp)
 	printf("\n");
     }
     else {
-	ata_prtdev(stp->device, "TAPE <%.40s> at ata%d-%s %s\n",
-		   stp->device->param->model,
+	ata_prtdev(stp->device, "TAPE <%.40s/%.8s> at ata%d-%s %s\n",
+		   stp->device->param->model, stp->device->param->revision,
 		   device_get_unit(stp->device->channel->dev),
 		   (stp->device->unit == ATA_MASTER) ? "master" : "slave",
 		   ata_mode2str(stp->device->mode));