sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-12 14:32:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added the generic block-splitting code to nvs.c

Browse Source
This commit is contained in:
Michael Brown
2006-12-04 19:06:07 +00:00
parent 1961ba44e1
commit 2d8d21fe74
4 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/drivers/net/rtl8139.c
View File

@@ -265,26 +265,6 @@ static struct bit_basher_operations rtl_basher_ops = {
rtl->eeprom.bus = &rtl->spibit.bus;
}
/**
* Read the MAC address
*
* @v rtl RTL8139 NIC
* @v mac_addr Buffer to contain MAC address (ETH_ALEN bytes)
*/
static void rtl_read_mac ( struct rtl8139_nic *rtl, uint8_t *mac_addr ) {
struct nvs_device *nvs = &rtl->eeprom.nvs;
int i;
DBG ( "MAC address is " );
for ( i = EE_MAC ; i < ( EE_MAC + ( ETH_ALEN / 2 ) ) ; i++ ) {
nvs_read ( nvs, i, mac_addr, 2 );
DBG ( "%02x%02x", mac_addr[0], mac_addr[1] );
mac_addr += 2;
}
DBG ( "\n" );
}
/**
* Reset NIC
*
@@ -531,7 +511,7 @@ static int rtl_probe ( struct pci_device *pci,
/* Reset the NIC, set up EEPROM access and read MAC address */
rtl_reset ( rtl );
rtl_init_eeprom ( rtl );
rtl_read_mac ( rtl, netdev->ll_addr );
nvs_read ( &rtl->eeprom.nvs, EE_MAC, netdev->ll_addr, ETH_ALEN );
/* Point to NIC specific routines */
// netdev->open = rtl_open;