diff --git a/src/sys/isa/ne2k.c b/src/sys/isa/ne2k.c index 0414468..097bfed 100644 --- a/src/sys/isa/ne2k.c +++ b/src/sys/isa/ne2k.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.7 2004/05/04 23:38:24 reddawg + make clean all install + Revision 1.6 2004/05/04 23:31:01 reddawg Ok Mark Cleaned Up Boot This @@ -93,12 +96,12 @@ ************************************************************************/ int ne2kInit(uInt32 ioAddr) { struct device *dev = (struct device *)kmalloc(sizeof(struct device),sysID); - dev->ioAddr = 0x300; - dev->irq = 10; + dev->ioAddr = 0x240; + dev->irq = 3; - setVector(&ne2kISR, mVec+10, dPresent + dInt + dDpl3); + setVector(&ne2kISR, mVec+3, dPresent + dInt + dDpl3); outportByte(mPic, eoi); - irqEnable(10); + irqEnable(3); outportByte(mPic, eoi); // kprintf("ne0 - irq: %i, ioAddr: 0x%X MAC: %X:%X:%X:%X:%X:%X\n",dev->irq,dev->ioAddr,dev->net->mac[0] & 0xFF,dev->net->mac[1] & 0xFF,dev->net->mac[2] & 0xFF,dev->net->mac[3] & 0xFF,dev->net->mac[4] & 0xFF,dev->net->mac[5] & 0xFF); @@ -221,12 +224,12 @@ uInt16 isr = 0x0; uInt16 status = 0x0; struct device *dev = (struct device *)kmalloc(sizeof(struct device),sysID); - dev->ioAddr = 0x300; - dev->irq = 10; + dev->ioAddr = 0x240; + dev->irq = 4; isr = inportByte(dev->ioAddr + NE_ISR); if ((isr & 0x02) == 0x02) { outportByte(dev->ioAddr + NE_ISR, 0x0A); - status = inportByte(0x300 + NE_TPSR); + status = inportByte(0x240 + NE_TPSR); //kprintf("Pack Transmitted, Status: [0x%X]\n",status); } if ((isr & 0x01) == 0x01) { diff --git a/src/sys/net/netif/ethernetif.c b/src/sys/net/netif/ethernetif.c index 6b85a75..2c3178d 100644 --- a/src/sys/net/netif/ethernetif.c +++ b/src/sys/net/netif/ethernetif.c @@ -82,7 +82,7 @@ ethernetif = netif->state; dev = (struct device *)kmalloc(sizeof(struct device),sysID); - dev->ioAddr = 0x300; + dev->ioAddr = 0x240; dev->irq = 10; /* Obtain MAC address from network interface. */ @@ -114,7 +114,7 @@ char buf[1500]; char *bufptr = 0x0; - dev->ioAddr = 0x300; + dev->ioAddr = 0x240; dev->irq = 10; bufptr = &buf[0];