david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Revert mdc's warnings purge on natsemi.c, to allow for a clean rebase.

This commit is contained in:
Michael Brown 2007-07-07 22:33:45 +01:00 committed by Udayan Kumar
parent 7e3a8f5e10
commit 208ff0d42e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/drivers/net/natsemi.c
View File

@ -536,8 +536,7 @@ natsemi_init_rxd(struct nic *nic __unused)
rxd[i].bufptr = virt_to_bus(&rxb[i*RX_BUF_SIZE]);
if (natsemi_debug > 1)
printf("natsemi_init_rxd: rxd[%d]=%p link=%X cmdsts=%X bufptr=%4.4x\n",
i, &rxd[i], (unsigned int) rxd[i].link, (unsigned int) rxd[i].cmdsts,
(unsigned int) rxd[i].bufptr);
i, &rxd[i], rxd[i].link, rxd[i].cmdsts, rxd[i].bufptr);
}
/* load Receive Descriptor Register */
@ -649,11 +648,11 @@ natsemi_transmit(struct nic *nic,
/* wait */ ;
if (currticks() >= to) {
printf("natsemi_transmit: TX Timeout! Tx status %X.\n", (unsigned int) tx_status);
printf("natsemi_transmit: TX Timeout! Tx status %X.\n", tx_status);
}
if (!(tx_status & 0x08000000)) {
printf("natsemi_transmit: Transmit error, Tx status %X.\n", (unsigned int) tx_status);
printf("natsemi_transmit: Transmit error, Tx status %X.\n", tx_status);
}
}
@ -678,7 +677,7 @@ natsemi_poll(struct nic *nic, int retrieve)
int retstat = 0;
if (natsemi_debug > 2)
printf("natsemi_poll: cur_rx:%d, status:%X\n", cur_rx, (unsigned int) rx_status);
printf("natsemi_poll: cur_rx:%d, status:%X\n", cur_rx, rx_status);
if (!(rx_status & OWN))
return retstat;
@ -687,14 +686,14 @@ natsemi_poll(struct nic *nic, int retrieve)
if (natsemi_debug > 1)
printf("natsemi_poll: got a packet: cur_rx:%d, status:%X\n",
cur_rx, (unsigned int) rx_status);
cur_rx, rx_status);
nic->packetlen = (rx_status & DSIZE) - CRC_SIZE;
if ((rx_status & (DescMore|DescPktOK|RxTooLong)) != DescPktOK) {
/* corrupted packet received */
printf("natsemi_poll: Corrupted packet received, buffer status = %X\n",
(unsigned int) rx_status);
rx_status);
retstat = 0;
} else {
/* give packet to higher level routine */