[src/trunk]: src/sys/dev/pci/ixgbe On X540, print PHY FW Revision with %u.%x....

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a207dafb7142
branches:  trunk
changeset: 828036:a207dafb7142
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Nov 24 08:36:22 2017 +0000

description:
On X540, print PHY FW Revision with %u.%x. 0x4030 will be printed
as "Revision 4.3 ID 0x0"

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r d30e82fd6275 -r a207dafb7142 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Fri Nov 24 03:38:32 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Fri Nov 24 08:36:22 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.113 2017/11/22 15:15:09 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.114 2017/11/24 08:36:22 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -1003,8 +1003,13 @@
                high = (nvmreg >> 12) & 0x0f;
                low = (nvmreg >> 4) & 0xff;
                id = nvmreg & 0x000f;
-               aprint_normal(" PHY FW Revision %u.%02x ID 0x%x,", high, low,
-                   id);
+               aprint_normal(" PHY FW Revision %u.", high);
+               if (hw->mac.type == ixgbe_mac_X540)
+                       str = "%x";
+               else
+                       str = "%02x";
+               aprint_normal(str, low);
+               aprint_normal(" ID 0x%x,", id);
                break;
        default:
                break;