kernel: cleanup the software mouse cursor mess

[plan9front.git] / sys / src / 9 / pc / ether8003.c

diff --git a/sys/src/9/pc/ether8003.c b/sys/src/9/pc/ether8003.c
index 871c26cadfd3b2647e54c0f3413d4e49ae779ac4..13ee44893e7f60caf7ccfc07ed6f80f9863e9a96 100644 (file)
--- a/sys/src/9/pc/ether8003.c
+++ b/sys/src/9/pc/ether8003.c
@@ -88,7 +88,7 @@ reset8003(Ether* ether, uchar ea[Eaddrlen], uchar ic[8])
         */
        if(memcmp(&ea[1], &ic[1], 5) == 0){
                memset(ic, 0, sizeof(ic));
-               ic[Msr] = (((ulong)ether->mem)>>13) & 0x3F;
+               ic[Msr] = (ether->mem>>13) & 0x3F;
        }
        else{
                /*
@@ -100,7 +100,7 @@ reset8003(Ether* ether, uchar ea[Eaddrlen], uchar ic[8])
                inb(port+Msr);                          /* wiggle bus */
                if(inb(port+Gp2) != 0xAA){
                        memset(ic, 0, sizeof(ic));
-                       ic[Msr] = (((ulong)ether->mem)>>13) & 0x3F;
+                       ic[Msr] = (ether->mem>>13) & 0x3F;
                }
                else
                        ether->irq = irq8003[((ic[Irr]>>5) & 0x3)|(ic[Icr] & 0x4)];
@@ -122,7 +122,7 @@ reset8003(Ether* ether, uchar ea[Eaddrlen], uchar ic[8])
                        ctlr->width = 1;
        }
 
-       ether->mem = (ulong)KADDR((ic[Msr] & 0x3F)<<13);
+       ether->mem = (ic[Msr] & 0x3F)<<13;
        if(ctlr->width == 2)
                ether->mem |= (ic[Laar] & 0x1F)<<19;
        else
@@ -163,7 +163,7 @@ reset8216(Ether* ether, uchar[8])
        irq = inb(port+0x0D);
        outb(port+Hcr, hcr);
 
-       ether->mem = (ulong)KADDR(0xC0000+((((addr>>2) & 0x30)|(addr & 0x0F))<<13));
+       ether->mem = 0xC0000+((((addr>>2) & 0x30)|(addr & 0x0F))<<13);
        ether->size = 8192*(1<<((addr>>4) & 0x03));
        ether->irq = irq8216[((irq>>4) & 0x04)|((irq>>2) & 0x03)];
 
@@ -262,9 +262,8 @@ reset(Ether* ether)
        }
        dp8390setea(ether);
 
-       if(umbrwmalloc(PADDR(ether->mem), ether->size, 0) == 0)
-               print("ether8003: warning - 0x%luX unavailable\n",
-                       PADDR(ether->mem));
+       if(umballoc(ether->mem, ether->size, 0) == -1)
+               print("ether8003: warning - 0x%luX unavailable\n", ether->mem);
 
        return 0;
 }