3 files changed, 14 insertions(+), 9 deletions(-)

M pc/devi82365.c
M pc/ether509.c
M pc/ether589.c

@@ 898,6 898,11 @@ pcmio(int slotno, ISAConf *isa)
 	Slot *pp;
 	Conftab *ct;
 	PCMmap *m;
+	int irq;
+
+	irq = isa->irq;
+	if(irq == 2)
+		irq = 9;
 
 	if(slotno > nslot)
 		return -1;


@@ 908,23 913,22 @@ pcmio(int slotno, ISAConf *isa)
 
 	/* find a configuration with the right port */
 	for(ct = pp->ctab; ct < &pp->ctab[pp->nctab]; ct++){
-		if(ct->nioregs && ct->port == isa->port)
+		if(ct->nioregs && ct->port == isa->port && ((1<<irq) & ct->irqs))
 			break;
 	}
 
 	/* if non found, settle for one with the some ioregs */
 	if(ct == &pp->ctab[pp->nctab])
 		for(ct = pp->ctab; ct < &pp->ctab[pp->nctab]; ct++)
-			if(ct->nioregs)
+			if(ct->nioregs && ((1<<irq) & ct->irqs))
 				break;
 
 	if(ct == &pp->ctab[pp->nctab])
 		return -1;
 
 	/* route interrupts */
-	if(isa->irq == 2)
-		isa->irq = 9;
-	wrreg(pp, Rigc, isa->irq | Fnotreset | Fiocard);
+	isa->irq = irq;
+	wrreg(pp, Rigc, irq | Fnotreset | Fiocard);
 	
 	/* set power and enable device */
 	x = vcode(ct->vpp1);


@@ 957,7 961,7 @@ pcmio(int slotno, ISAConf *isa)
 		x = ct->index;
 		if((ct->irqtype & 0x20) && ((ct->irqtype & 0x40)==0 || isa->irq>7))
 			x |= Clevel;
-		*p = x|ct->index;
+		*p = x;
 		delay(5);
 
 		pcmunmap(slotno, m);


@@ 1218,6 1222,7 @@ irq(Slot *pp, Conftab *ct)
 		ct->irqs = getlong(pp, 2);
 	else
 		ct->irqs = 1<<(c&0xf);
+	ct->irqs &= 0xDEB8;		/* levels available to card */
 }
 
 static void

@@ 581,7 581,7 @@ ether509reset(Ether *ether)
 		}
 	}
 	if(strcmp(ether->type, "3C589") == 0)
-		port = ether->port;
+		port = ether->card.port;
 	if(port == 0)
 		port = tcm579(ether);
 	if(port == 0)

@@ 38,7 38,7 @@ reset(Ether *ether)
 	if(ether->irq == 0)
 		ether->irq = 10;
 	if(ether->port == 0)
-		ether->port = 0x3F0;
+		ether->port = 0x240;
 	port = ether->port;
 
 	slot = pcmspecial("3C589", ether);


@@ 55,7 55,7 @@ reset(Ether *ether)
 
 	/* IRQ must be 3 on 3C589 */
 	x = ins(port + ResourceConfig);
-	outs(port + ResourceConfig, 0x3000 | (x&0xfff));
+	outs(port + ResourceConfig, 0x3f00 | (x&0xfff));
 
 	/* move product ID to register */
 	while(ins(port+EEPROMcmd) & 0x8000)