summaryrefslogtreecommitdiffstats
path: root/src/drivers/net/prism2.c
diff options
context:
space:
mode:
authorMarty Connor2006-09-26 23:33:12 +0200
committerMarty Connor2006-09-26 23:33:12 +0200
commitcf8460527171e4d026ba8747e4e702346c810369 (patch)
tree6683b40f370a584c4767d6cc84a0310d2041cbb5 /src/drivers/net/prism2.c
parenteth_ntoa fixes (diff)
downloadipxe-cf8460527171e4d026ba8747e4e702346c810369.tar.gz
ipxe-cf8460527171e4d026ba8747e4e702346c810369.tar.xz
ipxe-cf8460527171e4d026ba8747e4e702346c810369.zip
eth_ntoa and compilation warnings fixes
Diffstat (limited to 'src/drivers/net/prism2.c')
-rw-r--r--src/drivers/net/prism2.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/drivers/net/prism2.c b/src/drivers/net/prism2.c
index 7ad390ff..52bc77b8 100644
--- a/src/drivers/net/prism2.c
+++ b/src/drivers/net/prism2.c
@@ -13,12 +13,10 @@ $Id$
* your option) any later version.
*/
-/* to get some global routines like printf */
#include "etherboot.h"
-/* to get the interface to the body of the program */
#include "nic.h"
-/* to get the PCI support functions, if this is a PCI NIC */
#include <gpxe/pci.h>
+#include <gpxe/ethernet.h>
/*
* Hard-coded SSID
@@ -770,9 +768,10 @@ static int prism2_probe ( struct nic *nic, hfa384x_t *hw ) {
hfa384x_setreg(hw, 0, HFA384x_INTEN); /* Disable interrupts */
hfa384x_setreg(hw, 0xffff, HFA384x_EVACK); /* Acknowledge any spurious events */
+ DBG ( "MAC address %s\n", eth_ntoa ( nic->node_addr ) );
+
/* Retrieve MAC address (and fill out nic->node_addr) */
hfa384x_drvr_getconfig ( hw, HFA384x_RID_CNFOWNMACADDR, nic->node_addr, HFA384x_RID_CNFOWNMACADDR_LEN );
- printf ( "MAC address %!\n", nic->node_addr );
/* Prepare card for autojoin */
/* This procedure is reverse-engineered from a register-level trace of the Linux driver's join process */
@@ -841,7 +840,9 @@ static int prism2_probe ( struct nic *nic, hfa384x_t *hw ) {
/* Retrieve BSSID and print Connected message */
result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CURRENTBSSID, hw->bssid, WLAN_BSSID_LEN);
- printf ( "Link connected (BSSID %! - MAC address %!)\n", hw->bssid, nic->node_addr );
+
+ DBG ( "Link connected (BSSID %s - ", eth_ntoa ( hw->bssid ) );
+ DBG ( " MAC address %s)\n", eth_ntoa (nic->node_addr ) );
/* point to NIC specific routines */
nic->nic_op = &prism2_operations;