From c6621ef0ddd7a7ffd60f05744c85b277e530c072 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sun, 23 Jul 2017 15:40:57 +0200 Subject: reading and printing MAC address int RTL8139 driver --- src/drivers/net/rtl8139.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'src/drivers/net/rtl8139.c') diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c index f895ff8..ad9370a 100644 --- a/src/drivers/net/rtl8139.c +++ b/src/drivers/net/rtl8139.c @@ -23,8 +23,12 @@ static rtl8139_vtable_t const rtl8139_vtable = { } }; -#define REG_MAC0 0 -#define REG_MAC4 4 +// registers +#define REG_MAC0 0x00 +#define REG_CMD 0x37 + +// commands for REG_CMD register +#define CR_RESET 0x08 void rtl8139_init( rtl8139_t *rtl8139, pci_device_descriptor_t *descriptor, interrupt_t *interrupt, void *context ) { @@ -33,14 +37,28 @@ void rtl8139_init( rtl8139_t *rtl8139, pci_device_descriptor_t *descriptor, inte network_init( (network_t *)rtl8139, interrupt, context ); puts( "Initializing driver for Realtek 8139 network card.." ); + + for( int i = 0; i < NOF_MAC_REGISTERS; i++ ) { + port8_init( &rtl8139->MAC_port[i], descriptor->port_base + REG_MAC0 + i ); + } + port8_init( &rtl8139->CMD_port, descriptor->port_base + REG_CMD ); + + // software reset + port8_write( &rtl8139->CMD_port, CR_RESET ); + + // get MAC + for( int i = 0; i < NOF_MAC_REGISTERS; i++ ) { + rtl8139->base.mac_address.byte[i] = port8_read( &rtl8139->MAC_port[i] ); + } + #ifdef DEBUG - printf( "using I/O base 0x%X\n", descriptor->port_base ); - printf( "using interrupt %d\n", descriptor->interrupt ); + char buf[20]; + network_mac_to_string( rtl8139->base.mac_address, buf, 20 ); + printf( "rtl8139 NIC at I/O base 0x%X, interrupt 0x%X, MAC: %s\n", + descriptor->port_base, descriptor->interrupt, buf + ); #endif - port32_init( &rtl8139->MAC0_port, descriptor->port_base + REG_MAC0 ); - port16_init( &rtl8139->MAC4_port, descriptor->port_base + REG_MAC4 ); - interrupt_handler_init( &rtl8139->interrupt_handler, IRQ_BASE + descriptor->interrupt, interrupt, rtl8139_handle_interrupt, rtl8139 ); interrupts_register_interrupt_handler( rtl8139->interrupt_handler ); -- cgit v1.2.3-54-g00ecf