Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/net/ns8382x.c: fix GCC 4.6 build warnings

Browse Source 
Fix:
ns8382x.c: In function 'ns8382x_check_duplex':
ns8382x.c:704:6: warning: variable 'hun' set but not used
[-Wunused-but-set-variable]

To fix this, we get rid of the NS8382X_DEBUG code and use standard
debug() instead.

This will now trigger a so far undetected warning:
ns8382x.c:780:2: warning: format '%X' expects argument of type
'unsigned int', but argument 2 has type 'long unsigned int' [-Wformat]

Fix that, too.

Signed-off-by: Wolfgang Denk <wd@denx.de>
master
Wolfgang Denk 14 years ago
parent a9f4fc3fe5
commit 675b46bbac
1 changed files with 37 additions and 48 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 85
      drivers/net/ns8382x.c

85
drivers/net/ns8382x.c
Unescape View File

@ -322,9 +322,7 @@ ns8382x_initialize(bd_t * bis)
pci_read_config_dword(devno, PCI_BASE_ADDRESS_1, &iobase); pci_read_config_dword(devno, PCI_BASE_ADDRESS_1, &iobase);
iobase &= ~0x3; /* 1: unused and 0:I/O Space Indicator */ iobase &= ~0x3; /* 1: unused and 0:I/O Space Indicator */
#ifdef NS8382X_DEBUG debug("ns8382x: NatSemi dp8382x @ 0x%x\n", iobase);
printf("ns8382x: NatSemi dp8382x @ 0x%x\n", iobase);
#endif
pci_write_config_dword(devno, PCI_COMMAND, pci_write_config_dword(devno, PCI_COMMAND,
PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
@ -382,11 +380,9 @@ ns8382x_initialize(bd_t * bis)
rev = mdio_read(dev, phyAddress, PHYIDR2); rev = mdio_read(dev, phyAddress, PHYIDR2);
if ((rev & ~(0x000f)) == 0x00005c50 || if ((rev & ~(0x000f)) == 0x00005c50 ||
(rev & ~(0x000f)) == 0x00005c60) { (rev & ~(0x000f)) == 0x00005c60) {
#ifdef NS8382X_DEBUG debug("phy rev is %x\n", rev);
printf("phy rev is %x\n", rev); debug("phy address is %x\n",
printf("phy address is %x\n",
phyAddress); phyAddress);
#endif
break; break;
} }
} }
@ -411,21 +407,21 @@ ns8382x_initialize(bd_t * bis)
OUTL(dev, (chip_config & ~(PhyDis)), ChipConfig); OUTL(dev, (chip_config & ~(PhyDis)), ChipConfig);
mdio_sync(dev, EECtrl); mdio_sync(dev, EECtrl);
#ifdef NS8382X_DEBUG
{ {
u32 chpcfg = u32 chpcfg =
INL(dev, ChipConfig) ^ SpeedStatus_Polarity; INL(dev, ChipConfig) ^ SpeedStatus_Polarity;
printf("%s: Transceiver 10%s %s duplex.\n", dev->name, debug("%s: Transceiver 10%s %s duplex.\n", dev->name,
(chpcfg & GigSpeed) ? "00" : (chpcfg & HundSpeed) (chpcfg & GigSpeed) ? "00" : (chpcfg & HundSpeed)
? "0" : "", ? "0" : "",
chpcfg & FullDuplex ? "full" : "half"); chpcfg & FullDuplex ? "full" : "half");
printf("%s: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, debug("%s: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name,
dev->enetaddr[0], dev->enetaddr[1], dev->enetaddr[0], dev->enetaddr[1],
dev->enetaddr[2], dev->enetaddr[3], dev->enetaddr[2], dev->enetaddr[3],
dev->enetaddr[4], dev->enetaddr[5]); dev->enetaddr[4], dev->enetaddr[5]);
} }
#endif
/* Disable PME: /* Disable PME:
* The PME bit is initialized from the EEPROM contents. * The PME bit is initialized from the EEPROM contents.
* PCI cards probably have PME disabled, but motherboard * PCI cards probably have PME disabled, but motherboard
@ -563,10 +559,10 @@ ns8382x_init(struct eth_device *dev, bd_t * bis)
tx_config = TxCarrierIgn | TxHeartIgn | TxAutoPad tx_config = TxCarrierIgn | TxHeartIgn | TxAutoPad
| TxCollRetry | TxMxdma_1024 | (0x1002); | TxCollRetry | TxMxdma_1024 | (0x1002);
rx_config = RxMxdma_1024 | 0x20; rx_config = RxMxdma_1024 | 0x20;
#ifdef NS8382X_DEBUG
printf("%s: Setting TxConfig Register %#08X\n", dev->name, tx_config); debug("%s: Setting TxConfig Register %#08X\n", dev->name, tx_config);
printf("%s: Setting RxConfig Register %#08X\n", dev->name, rx_config); debug("%s: Setting RxConfig Register %#08X\n", dev->name, rx_config);
#endif
OUTL(dev, tx_config, TxConfig); OUTL(dev, tx_config, TxConfig);
OUTL(dev, rx_config, RxConfig); OUTL(dev, rx_config, RxConfig);
@ -629,10 +625,9 @@ ns8382x_init_txd(struct eth_device *dev)
OUTL(dev, 0x0, TxRingPtrHi); OUTL(dev, 0x0, TxRingPtrHi);
OUTL(dev, phys_to_bus((u32)&txd), TxRingPtr); OUTL(dev, phys_to_bus((u32)&txd), TxRingPtr);
#ifdef NS8382X_DEBUG
printf("ns8382x_init_txd: TX descriptor register loaded with: %#08X (&txd: %p)\n", debug("ns8382x_init_txd: TX descriptor register loaded with: %#08X (&txd: %p)\n",
INL(dev, TxRingPtr), &txd); INL(dev, TxRingPtr), &txd);
#endif
} }
/* Function: ns8382x_init_rxd /* Function: ns8382x_init_rxd
@ -658,19 +653,16 @@ ns8382x_init_rxd(struct eth_device *dev)
rxd[i].extsts = cpu_to_le32((u32) 0x0); rxd[i].extsts = cpu_to_le32((u32) 0x0);
rxd[i].cmdsts = cpu_to_le32((u32) RX_BUF_SIZE); rxd[i].cmdsts = cpu_to_le32((u32) RX_BUF_SIZE);
rxd[i].bufptr = cpu_to_le32((u32) & rxb[i * RX_BUF_SIZE]); rxd[i].bufptr = cpu_to_le32((u32) & rxb[i * RX_BUF_SIZE]);
#ifdef NS8382X_DEBUG
printf debug
("ns8382x_init_rxd: rxd[%d]=%p link=%X cmdsts=%X bufptr=%X\n", ("ns8382x_init_rxd: rxd[%d]=%p link=%X cmdsts=%X bufptr=%X\n",
i, &rxd[i], le32_to_cpu(rxd[i].link), i, &rxd[i], le32_to_cpu(rxd[i].link),
le32_to_cpu(rxd[i].cmdsts), le32_to_cpu(rxd[i].bufptr)); le32_to_cpu(rxd[i].cmdsts), le32_to_cpu(rxd[i].bufptr));
#endif
} }
OUTL(dev, phys_to_bus((u32) & rxd), RxRingPtr); OUTL(dev, phys_to_bus((u32) & rxd), RxRingPtr);
#ifdef NS8382X_DEBUG debug("ns8382x_init_rxd: RX descriptor register loaded with: %X\n",
printf("ns8382x_init_rxd: RX descriptor register loaded with: %X\n",
INL(dev, RxRingPtr)); INL(dev, RxRingPtr));
#endif
} }
/* Function: ns8382x_set_rx_mode /* Function: ns8382x_set_rx_mode
@ -708,11 +700,11 @@ ns8382x_check_duplex(struct eth_device *dev)
duplex = (config & FullDuplex) ? 1 : 0; duplex = (config & FullDuplex) ? 1 : 0;
gig = (config & GigSpeed) ? 1 : 0; gig = (config & GigSpeed) ? 1 : 0;
hun = (config & HundSpeed) ? 1 : 0; hun = (config & HundSpeed) ? 1 : 0;
#ifdef NS8382X_DEBUG
printf("%s: Setting 10%s %s-duplex based on negotiated link" debug("%s: Setting 10%s %s-duplex based on negotiated link"
" capability.\n", dev->name, (gig) ? "00" : (hun) ? "0" : "", " capability.\n", dev->name, (gig) ? "00" : (hun) ? "0" : "",
duplex ? "full" : "half"); duplex ? "full" : "half");
#endif
if (duplex) { if (duplex) {
rx_config |= RxAcceptTx; rx_config |= RxAcceptTx;
tx_config |= (TxCarrierIgn | TxHeartIgn); tx_config |= (TxCarrierIgn | TxHeartIgn);
@ -720,10 +712,10 @@ ns8382x_check_duplex(struct eth_device *dev)
rx_config &= ~RxAcceptTx; rx_config &= ~RxAcceptTx;
tx_config &= ~(TxCarrierIgn | TxHeartIgn); tx_config &= ~(TxCarrierIgn | TxHeartIgn);
} }
#ifdef NS8382X_DEBUG
printf("%s: Resetting TxConfig Register %#08X\n", dev->name, tx_config); debug("%s: Resetting TxConfig Register %#08X\n", dev->name, tx_config);
printf("%s: Resetting RxConfig Register %#08X\n", dev->name, rx_config); debug("%s: Resetting RxConfig Register %#08X\n", dev->name, rx_config);
#endif
OUTL(dev, tx_config, TxConfig); OUTL(dev, tx_config, TxConfig);
OUTL(dev, rx_config, RxConfig); OUTL(dev, rx_config, RxConfig);
@ -735,9 +727,8 @@ ns8382x_check_duplex(struct eth_device *dev)
else else
config &= ~Mode1000; config &= ~Mode1000;
#ifdef NS8382X_DEBUG debug("%s: %setting Mode1000\n", dev->name, (gig) ? "S" : "Uns");
printf("%s: %setting Mode1000\n", dev->name, (gig) ? "S" : "Uns");
#endif
OUTL(dev, config, ChipConfig); OUTL(dev, config, ChipConfig);
} }
@ -752,9 +743,8 @@ ns8382x_send(struct eth_device *dev, volatile void *packet, int length)
/* Stop the transmitter */ /* Stop the transmitter */
OUTL(dev, TxOff, ChipCmd); OUTL(dev, TxOff, ChipCmd);
#ifdef NS8382X_DEBUG
printf("ns8382x_send: sending %d bytes\n", (int)length); debug("ns8382x_send: sending %d bytes\n", (int)length);
#endif
/* set the transmit buffer descriptor and enable Transmit State Machine */ /* set the transmit buffer descriptor and enable Transmit State Machine */
txd.link = cpu_to_le32(0x0); txd.link = cpu_to_le32(0x0);
@ -764,13 +754,13 @@ ns8382x_send(struct eth_device *dev, volatile void *packet, int length)
/* load Transmit Descriptor Register */ /* load Transmit Descriptor Register */
OUTL(dev, phys_to_bus((u32) & txd), TxRingPtr); OUTL(dev, phys_to_bus((u32) & txd), TxRingPtr);
#ifdef NS8382X_DEBUG
printf("ns8382x_send: TX descriptor register loaded with: %#08X\n", debug("ns8382x_send: TX descriptor register loaded with: %#08X\n",
INL(dev, TxRingPtr)); INL(dev, TxRingPtr));
printf("\ttxd.link:%X\tbufp:%X\texsts:%X\tcmdsts:%X\n", debug("\ttxd.link:%X\tbufp:%X\texsts:%X\tcmdsts:%X\n",
le32_to_cpu(txd.link), le32_to_cpu(txd.bufptr), le32_to_cpu(txd.link), le32_to_cpu(txd.bufptr),
le32_to_cpu(txd.extsts), le32_to_cpu(txd.cmdsts)); le32_to_cpu(txd.extsts), le32_to_cpu(txd.cmdsts));
#endif
/* restart the transmitter */ /* restart the transmitter */
OUTL(dev, TxOn, ChipCmd); OUTL(dev, TxOn, ChipCmd);
@ -786,12 +776,11 @@ ns8382x_send(struct eth_device *dev, volatile void *packet, int length)
printf("ns8382x_send: Transmit error, Tx status %lX.\n", tx_stat); printf("ns8382x_send: Transmit error, Tx status %lX.\n", tx_stat);
goto Done; goto Done;
} }
#ifdef NS8382X_DEBUG
printf("ns8382x_send: tx_stat: %#08X\n", tx_stat); debug("ns8382x_send: tx_stat: %#08lX\n", tx_stat);
#endif
status = 1; status = 1;
Done: Done:
return status; return status;
} }
@ -814,10 +803,10 @@ ns8382x_poll(struct eth_device *dev)
if (!(rx_status & (u32) DescOwn)) if (!(rx_status & (u32) DescOwn))
return retstat; return retstat;
#ifdef NS8382X_DEBUG
printf("ns8382x_poll: got a packet: cur_rx:%u, status:%lx\n", debug("ns8382x_poll: got a packet: cur_rx:%u, status:%lx\n",
cur_rx, rx_status); cur_rx, rx_status);
#endif
length = (rx_status & DSIZE) - CRC_SIZE; length = (rx_status & DSIZE) - CRC_SIZE;
if ((rx_status & (DescMore | DescPktOK | DescRxLong)) != DescPktOK) { if ((rx_status & (DescMore | DescPktOK | DescRxLong)) != DescPktOK) {

Write Preview
Loading…
Cancel
Save