[intel] Expose intel_diag() for use by other Intel NIC drivers

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/drivers/net/intel.c b/src/drivers/net/intel.c
index d08bc92022b4af9162120f7f22065eb174c89414..4b0e4c0e1f4016194409f67ddd6d953eeea838d6 100644 (file)
--- a/src/drivers/net/intel.c
+++ b/src/drivers/net/intel.c
@@ -250,32 +250,6 @@ static int intel_fetch_mac ( struct intel_nic *intel, uint8_t *hw_addr ) {
        return -ENOENT;
 }
 
-/******************************************************************************
- *
- * Diagnostics
- *
- ******************************************************************************
- */
-
-/**
- * Dump diagnostic information
- *
- * @v intel            Intel device
- */
-static void __attribute__ (( unused )) intel_diag ( struct intel_nic *intel ) {
-
-       DBGC ( intel, "INTEL %p TX %04x(%02x)/%04x(%02x) "
-              "RX %04x(%02x)/%04x(%02x)\n", intel,
-              ( intel->tx.cons & 0xffff ),
-              readl ( intel->regs + intel->tx.reg + INTEL_xDH ),
-              ( intel->tx.prod & 0xffff ),
-              readl ( intel->regs + intel->tx.reg + INTEL_xDT ),
-              ( intel->rx.cons & 0xffff ),
-              readl ( intel->regs + intel->rx.reg + INTEL_xDH ),
-              ( intel->rx.prod & 0xffff ),
-              readl ( intel->regs + intel->rx.reg + INTEL_xDT ) );
-}
-
 /******************************************************************************
  *
  * Device reset

diff --git a/src/drivers/net/intel.h b/src/drivers/net/intel.h
index c868167b10e1ccb01b4c1c527a38d46bac80a793..621ee2e778f62831c874b67ee736fa60d1f24792 100644 (file)
--- a/src/drivers/net/intel.h
+++ b/src/drivers/net/intel.h
@@ -259,6 +259,25 @@ enum intel_flags {
        INTEL_VMWARE = 0x0002,
 };
 
+/**
+ * Dump diagnostic information
+ *
+ * @v intel            Intel device
+ */
+static inline void intel_diag ( struct intel_nic *intel ) {
+
+       DBGC ( intel, "INTEL %p TX %04x(%02x)/%04x(%02x) "
+              "RX %04x(%02x)/%04x(%02x)\n", intel,
+              ( intel->tx.cons & 0xffff ),
+              readl ( intel->regs + intel->tx.reg + INTEL_xDH ),
+              ( intel->tx.prod & 0xffff ),
+              readl ( intel->regs + intel->tx.reg + INTEL_xDT ),
+              ( intel->rx.cons & 0xffff ),
+              readl ( intel->regs + intel->rx.reg + INTEL_xDH ),
+              ( intel->rx.prod & 0xffff ),
+              readl ( intel->regs + intel->rx.reg + INTEL_xDT ) );
+}
+
 extern int intel_create_ring ( struct intel_nic *intel,
                               struct intel_ring *ring );
 extern void intel_destroy_ring ( struct intel_nic *intel,