diff options
Diffstat (limited to 'driver/e1000.c')
| -rw-r--r-- | driver/e1000.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/driver/e1000.c b/driver/e1000.c index 2f50df4..5d0cbe6 100644 --- a/driver/e1000.c +++ b/driver/e1000.c @@ -3,11 +3,12 @@ //https://github.com/torvalds/linux/blob/master/drivers/net/ethernet/intel/e1000/e1000_hw.c //https://github.com/qemu/qemu/blob/master/hw/net/e1000.c //registers etc. verified from pdf at https://pdos.csail.mit.edu/6.828/2006/readings/hardware/8254x_GBe_SDM.pdf +#include "e1000.h" +#include "interrupts.h" #include <stdint.h> #include "log.h" -#include "e1000.h" #include "kmalloc.h" #include "netdev.h" #include "arp.h" @@ -427,8 +428,8 @@ void e1000_handleReceive() old_cur = rx_cur; rx_cur = (rx_cur + 1) % E1000_NUM_RX_DESC; writeCommand(REG_RDT, old_cur ); - klog("RDT %d",readCommand(REG_RDT)); - klog("RDH %d",readCommand(REG_RDH)); +// klog("RDT %d",readCommand(REG_RDT)); +// klog("RDH %d",readCommand(REG_RDH)); } } @@ -443,8 +444,8 @@ int e1000_sendPacket(const void * p_data, uint16_t p_len) uint8_t old_cur = tx_cur; tx_cur = (tx_cur + 1) % E1000_NUM_TX_DESC; writeCommand(REG_TDT, tx_cur); - klog("TDT %d",readCommand(REG_TDT)); - klog("TDH %d",readCommand(REG_TDH)); +// klog("TDT %d",readCommand(REG_TDT)); +// klog("TDH %d",readCommand(REG_TDH)); while(!(tx_descs[old_cur]->status & 0xff)); // TODO: seriously wait here!?!?!? return 0; } @@ -512,6 +513,7 @@ struct netdev e1000_init(uint32_t base) for(int i = 0; i < 0x80; i++)writeCommand(REG_MTA + i*4, 0); //e1000_linkup(); + interrupt_register(INTERRUPT_E1000,&e1000_interrupt); enableInterrupt(); @@ -523,7 +525,7 @@ struct netdev e1000_init(uint32_t base) return dev; } -void e1000_irq (int irq) +uint32_t e1000_interrupt (uint32_t esp) { // if ( p_interruptContext->getInteruptNumber() == pciConfigHeader->getIntLine()+IRQ0) // { @@ -555,4 +557,5 @@ void e1000_irq (int irq) */ if(status & 0x80)e1000_handleReceive(); //... + return esp; } |