diff --git a/src/sys/isa/ne2k.c b/src/sys/isa/ne2k.c index 097bfed..f41958c 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.8 2004/05/04 23:46:39 reddawg + make clean all install + Revision 1.7 2004/05/04 23:38:24 reddawg make clean all install @@ -96,7 +99,7 @@ ************************************************************************/ int ne2kInit(uInt32 ioAddr) { struct device *dev = (struct device *)kmalloc(sizeof(struct device),sysID); - dev->ioAddr = 0x240; + dev->ioAddr = 0x280; dev->irq = 3; setVector(&ne2kISR, mVec+3, dPresent + dInt + dDpl3); @@ -224,12 +227,12 @@ uInt16 isr = 0x0; uInt16 status = 0x0; struct device *dev = (struct device *)kmalloc(sizeof(struct device),sysID); - dev->ioAddr = 0x240; + dev->ioAddr = 0x280; dev->irq = 4; isr = inportByte(dev->ioAddr + NE_ISR); if ((isr & 0x02) == 0x02) { outportByte(dev->ioAddr + NE_ISR, 0x0A); - status = inportByte(0x240 + NE_TPSR); + status = inportByte(0x280 + 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 2c3178d..d4223b4 100644 --- a/src/sys/net/netif/ethernetif.c +++ b/src/sys/net/netif/ethernetif.c @@ -82,16 +82,16 @@ ethernetif = netif->state; dev = (struct device *)kmalloc(sizeof(struct device),sysID); - dev->ioAddr = 0x240; - dev->irq = 10; + dev->ioAddr = 0x280; + dev->irq = 3; /* Obtain MAC address from network interface. */ - ethernetif->ethaddr->addr[0] = 0xfe; - ethernetif->ethaddr->addr[1] = 0xed; - ethernetif->ethaddr->addr[2] = 0xde; - ethernetif->ethaddr->addr[3] = 0xad; - ethernetif->ethaddr->addr[4] = 0xbe; - ethernetif->ethaddr->addr[5] = 0xef; + ethernetif->ethaddr->addr[0] = 0x00; + ethernetif->ethaddr->addr[1] = 0x00; + ethernetif->ethaddr->addr[2] = 0xC0; + ethernetif->ethaddr->addr[3] = 0x97; + ethernetif->ethaddr->addr[4] = 0xC6; + ethernetif->ethaddr->addr[5] = 0x93; /* Do whatever else is needed to initialize interface. */ @@ -114,7 +114,7 @@ char buf[1500]; char *bufptr = 0x0; - dev->ioAddr = 0x240; + dev->ioAddr = 0x280; dev->irq = 10; bufptr = &buf[0];