From 7a58673a4eb00f386dcea252d3015b32847fbc17 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Mon, 24 Jul 2017 07:10:19 +0200 Subject: added print_name method to all drivers removed superfluos empty methods in abstract drivers moved printing of info to method in rtl8139 driver --- src/drivers/net/rtl8139.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'src/drivers/net/rtl8139.c') diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c index 297f89d..0f561b2 100644 --- a/src/drivers/net/rtl8139.c +++ b/src/drivers/net/rtl8139.c @@ -19,6 +19,7 @@ static rtl8139_vtable_t const rtl8139_vtable = { rtl8139_activate, rtl8139_deactivate, rtl8139_deinit, + rtl8139_print_name, rtl8139_print_info } }; @@ -70,6 +71,8 @@ void rtl8139_init( rtl8139_t *rtl8139, pci_device_descriptor_t *descriptor, inte network_init( (network_t *)rtl8139, interrupt, context ); + rtl8139->pci_descriptor = *descriptor; + puts( "Initializing driver for Realtek 8139 network card.." ); for( int i = 0; i < NOF_MAC_REGISTERS; i++ ) { @@ -93,8 +96,8 @@ void rtl8139_init( rtl8139_t *rtl8139, pci_device_descriptor_t *descriptor, inte port8_write( &rtl8139->CMD_port, CMD_RECEIVER_ENABLE | CMD_TRANSMITTER_ENABLE ); // get model - uint32_t model_id = port32_read( &rtl8139->TCR_port ) & ( TCR_MODEL_VERSION_AM | TCR_MODEL_VERSION_BM ); - switch( model_id ) { + rtl8139->model_id = port32_read( &rtl8139->TCR_port ) & ( TCR_MODEL_VERSION_AM | TCR_MODEL_VERSION_BM ); + switch( rtl8139->model_id ) { case TCR_MODEL_VERSION_RTL8139: rtl8139->model = "RTL8139"; @@ -152,15 +155,7 @@ void rtl8139_init( rtl8139_t *rtl8139, pci_device_descriptor_t *descriptor, inte */ -#ifdef DEBUG - char buf[20]; - char buf2[30]; - snprintf( buf2, 30, "unknown submodel 0x%X", model_id ); - network_mac_to_string( rtl8139->base.mac_address, buf, 20 ); - printf( "rtl8139 NIC type %s\n at I/O base 0x%X, interrupt 0x%X, MAC: %s\n", - ( rtl8139->model != NULL ) ? rtl8139->model : buf2, - descriptor->port_base, descriptor->interrupt, buf ); -#endif + rtl8139_print_info( rtl8139 ); interrupt_handler_init( &rtl8139->interrupt_handler, IRQ_BASE + descriptor->interrupt, interrupt, rtl8139_handle_interrupt, rtl8139 ); interrupts_register_interrupt_handler( rtl8139->interrupt_handler ); @@ -198,7 +193,20 @@ uint32_t rtl8139_handle_interrupt( interrupt_handler_t *handler, uint32_t esp ) return esp; } -void rtl8139_print_info( void *obj ) +void rtl8139_print_name( void *obj ) { puts( "Realtek 8139 network card driver" ); } + +void rtl8139_print_info( void *obj ) +{ + rtl8139_t *rtl8139 = (rtl8139_t *)obj; + + char buf[20]; + char buf2[30]; + snprintf( buf2, 30, "unknown submodel 0x%X", rtl8139->model_id ); + network_mac_to_string( rtl8139->base.mac_address, buf, 20 ); + printf( "rtl8139 NIC type %s\n at I/O base 0x%X, interrupt 0x%X, MAC: %s\n", + ( rtl8139->model != NULL ) ? rtl8139->model : buf2, + rtl8139->pci_descriptor.port_base, rtl8139->pci_descriptor.interrupt, buf ); +} -- cgit v1.2.3-54-g00ecf