From 835f14793e8cc64c9a757b910c8194ff7cd7fac0 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Fri, 18 Feb 1994 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1994-02-18 --- pc/ether509.c | 3 ++- power/lock.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pc/ether509.c b/pc/ether509.c index ccc1b6708fca156a34d2ab1744c220773f9e9f4c..d6bf0456ac517d82ac6e53b0592b1d374eb092c3 100644 --- a/pc/ether509.c +++ b/pc/ether509.c @@ -481,8 +481,9 @@ tcm509(Ether *ether) continue; } outb(IDport, 0xC0); + delay(2); if(activate(1) != port) - print("activate %d\n"); + print("tcm509: activate\n"); if(ether->port == 0 || ether->port == port) return port; diff --git a/power/lock.c b/power/lock.c index 691b5964cbae3de0e3d95eadaa16640795dce1e3..67e3b596736d12118eb8551f0834388e753f687d 100644 --- a/power/lock.c +++ b/power/lock.c @@ -53,6 +53,7 @@ lkpage(Segment *s, ulong va) int i; Page *pg; uchar *p, *top; + ulong pa; USED(s); lock(&semalloc.lock); @@ -70,7 +71,9 @@ lkpage(Segment *s, ulong va) *p = 1; i = p-semalloc.bmap; pg = &lkpgheader[i]; - pg->pa = (ulong)((i*WD2PG) + SBSEM) & ~UNCACHED; + pa = (ulong)(SBSEM+(i*WD2PG)); + memset((void*)pa, 0, BY2PG); + pg->pa = pa & ~UNCACHED; pg->va = va; pg->ref = 1;