diff options
| author | Michael Brown <mcb30@ipxe.org> | 2015-05-15 11:52:56 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2015-05-15 15:19:10 +0100 |
| commit | 28ce9b6cc02800239e77c49355e85a29d6ef346c (patch) | |
| tree | 8e38636ebcbb843cfdf0f921a928a716cca13bb3 | |
| parent | 5ecd16af04b29555a25074300ec9a0b995dfe407 (diff) | |
| download | ipxe-28ce9b6cc02800239e77c49355e85a29d6ef346c.tar.gz | |
[intel] Expose intel_diag() for use by other Intel NIC drivers
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/drivers/net/intel.c | 26 | ||||
| -rw-r--r-- | src/drivers/net/intel.h | 19 |
2 files changed, 19 insertions, 26 deletions
diff --git a/src/drivers/net/intel.c b/src/drivers/net/intel.c index d08bc920..4b0e4c0e 100644 --- a/src/drivers/net/intel.c +++ b/src/drivers/net/intel.c @@ -252,32 +252,6 @@ static int intel_fetch_mac ( struct intel_nic *intel, uint8_t *hw_addr ) { /****************************************************************************** * - * 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 c868167b..621ee2e7 100644 --- 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, |