PERFORCE change 167100 for review
Alexander Motin
mav at FreeBSD.org
Sat Aug 8 11:01:20 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=167100
Change 167100 by mav at mav_mavbook on 2009/08/08 11:00:24
Tune identify output.
Affected files ...
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#14 edit
Differences ...
==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#14 (text+ko) ====
@@ -1016,16 +1016,17 @@
printf("\n");
printf("Protocol ");
+ printf("ATA/ATAPI-%d", ata_version(parm->version_major));
if (parm->satacapabilities && parm->satacapabilities != 0xffff) {
if (parm->satacapabilities & ATA_SATA_GEN2)
- printf("SATA revision 2.x\n");
+ printf(" SATA 2.x\n");
else if (parm->satacapabilities & ATA_SATA_GEN1)
- printf("SATA revision 1.x\n");
+ printf(" SATA 1.x\n");
else
- printf("Unknown SATA revision\n");
+ printf(" SATA x.x\n");
}
else
- printf("ATA/ATAPI revision %d\n", ata_version(parm->version_major));
+ printf("\n");
printf("device model %.40s\n", parm->model);
printf("serial number %.20s\n", parm->serial);
printf("firmware revision %.8s\n", parm->revision);
@@ -1038,22 +1039,54 @@
(parm->support.command2 & ATA_SUPPORT_CFA))
printf("CFA supported\n");
- printf("lba%ssupported ",
+ printf("LBA%ssupported ",
parm->capabilities1 & ATA_SUPPORT_LBA ? " " : " not ");
if (lbasize)
printf("%d sectors\n", lbasize);
else
printf("\n");
- printf("lba48%ssupported ",
+ printf("LBA48%ssupported ",
parm->support.command2 & ATA_SUPPORT_ADDRESS48 ? " " : " not ");
if (lbasize48)
printf("%ju sectors\n", (uintmax_t)lbasize48);
else
printf("\n");
- printf("dma%ssupported\n",
+ printf("DMA%ssupported ",
parm->capabilities1 & ATA_SUPPORT_DMA ? " " : " not ");
+ if (parm->capabilities1 & ATA_SUPPORT_DMA) {
+ if (parm->mwdmamodes & 0xff) {
+ printf("WDMA");
+ if (parm->mwdmamodes & 0x04)
+ printf("2");
+ else if (parm->mwdmamodes & 0x02)
+ printf("1");
+ else if (parm->mwdmamodes & 0x01)
+ printf("0");
+ printf(" ");
+ }
+ if ((parm->atavalid & ATA_FLAG_88) &&
+ (parm->udmamodes & 0xff)) {
+ printf("UDMA");
+ if (parm->udmamodes & 0x40)
+ printf("6");
+ else if (parm->udmamodes & 0x20)
+ printf("5");
+ else if (parm->udmamodes & 0x10)
+ printf("4");
+ else if (parm->udmamodes & 0x08)
+ printf("3");
+ else if (parm->udmamodes & 0x04)
+ printf("2");
+ else if (parm->udmamodes & 0x02)
+ printf("1");
+ else if (parm->udmamodes & 0x01)
+ printf("0");
+ printf(" ");
+ }
+ }
+ printf("\n");
printf("overlap%ssupported\n",
parm->capabilities1 & ATA_SUPPORT_OVERLAP ? " " : " not ");
@@ -1070,10 +1103,10 @@
parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no");
if (parm->satacapabilities && parm->satacapabilities != 0xffff) {
- printf("Native Command Queuing (NCQ) %s %s"
+ printf("Native Command Queuing (NCQ) %s "
" %d/0x%02X\n",
parm->satacapabilities & ATA_SUPPORT_NCQ ?
- "yes" : "no", " -",
+ "yes" : "no",
(parm->satacapabilities & ATA_SUPPORT_NCQ) ?
ATA_QUEUE_LEN(parm->queue) : 0,
(parm->satacapabilities & ATA_SUPPORT_NCQ) ?
More information about the p4-projects
mailing list