diff options
Diffstat (limited to 'os')
| -rw-r--r-- | os/README | 4 | ||||
| -rw-r--r-- | os/ip/loopbackmedium.c | 2 | ||||
| -rw-r--r-- | os/ip/rudp.c | 2 | ||||
| -rw-r--r-- | os/ipaq1110/NOTICE | 2 | ||||
| -rw-r--r-- | os/port/devprof.c | 4 | ||||
| -rw-r--r-- | os/port/error.h | 3 | ||||
| -rw-r--r-- | os/port/exportfs.c | 7 | ||||
| -rw-r--r-- | os/port/inferno.c | 3 | ||||
| -rw-r--r-- | os/port/portmkfile | 3 |
9 files changed, 16 insertions, 14 deletions
@@ -5,10 +5,10 @@ ipaq1110 arm Strongarm SA1110 native kernel for Compaq iPAQ 36xx sa1110 arm SA1110 code common to most/all SA1110 platforms (eg, ipaq, cerf) cerf250 arm Intrinsyc Cerfboard250 (PXA250) -gum arm Gumstix PXA255 +gum arm Gumstix PXA255 not yet ready for distribution pxa arm general PXA support -js sparc original port to Javastation-1, not recently tested +js sparc original port to Javastation-1, included as sparc example but will not build ks32 arm ARM Evaluator 7t demo diff --git a/os/ip/loopbackmedium.c b/os/ip/loopbackmedium.c index 69d87449..d2509d95 100644 --- a/os/ip/loopbackmedium.c +++ b/os/ip/loopbackmedium.c @@ -34,7 +34,7 @@ loopbackbind(Ipifc *ifc, int, char**) ifc->arg = lb; ifc->mbps = 1000; - kproc("loopbackread", loopbackread, ifc); + kproc("loopbackread", loopbackread, ifc, 0); } diff --git a/os/ip/rudp.c b/os/ip/rudp.c index ce431333..a1a70e9b 100644 --- a/os/ip/rudp.c +++ b/os/ip/rudp.c @@ -205,7 +205,7 @@ rudpstartackproc(Proto *rudp) qlock(&rpriv->apl); if(rpriv->ackprocstarted == 0){ sprint(kpname, "#I%drudpack", rudp->f->dev); - kproc(kpname, relackproc, rudp); + kproc(kpname, relackproc, rudp, 0); rpriv->ackprocstarted = 1; } qunlock(&rpriv->apl); diff --git a/os/ipaq1110/NOTICE b/os/ipaq1110/NOTICE index 11f5df58..c0c5d4c1 100644 --- a/os/ipaq1110/NOTICE +++ b/os/ipaq1110/NOTICE @@ -1,6 +1,6 @@ Inferno® Copyright © 1996-1999 Lucent Technologies Inc. All rights reserved. iPAQ 36xx Inferno port Copyright © 2000-2003 Vita Nuova Holdings Limited. All rights reserved. -This software is subject to the Vita Nuova Liberal Source Licence, except for the following: +This software is subject to the terms of ../NOTICE, except for the following: devaudio.c came from Plan 9 and is covered by the Lucent Public License 1.02 The etherwavelan.c driver was contributed to Plan 9 by nemo@gsyc.escet.urjc.es diff --git a/os/port/devprof.c b/os/port/devprof.c index f0ee3ba8..d9603b6e 100644 --- a/os/port/devprof.c +++ b/os/port/devprof.c @@ -640,7 +640,7 @@ memprof(int c, Heap *h, ulong n) i = p-r->base; k = (r->id<<24) | i; if(c == 0){ - h->pad = k; + h->hprof = k; k = sizeof(Heap); } else{ @@ -657,7 +657,7 @@ memprof(int c, Heap *h, ulong n) if(c == 3) k = *(ulong*)h; else - k = h->pad; + k = h->hprof; if((r = getrec(k>>24)) == nil){ unlock(&profile.l); return; diff --git a/os/port/error.h b/os/port/error.h index 5d5c2f66..88492770 100644 --- a/os/port/error.h +++ b/os/port/error.h @@ -30,9 +30,6 @@ extern char Ehungup[]; /* i/o on hungup channel */ extern char Ebadctl[]; /* bad process or channel control request */ extern char Enodev[]; /* no free devices */ extern char Enoenv[]; /* no free environment resources */ -extern char Emuxshutdown[]; /* mux server shut down */ -extern char Emuxbusy[]; /* all mux channels busy */ -extern char Emuxmsg[]; /* bad mux message format or mismatch */ extern char Ethread[]; /* thread exited */ extern char Estopped[]; /* thread must be stopped */ extern char Enochild[]; /* no living children */ diff --git a/os/port/exportfs.c b/os/port/exportfs.c index 354574ef..c8755fa8 100644 --- a/os/port/exportfs.c +++ b/os/port/exportfs.c @@ -511,6 +511,7 @@ exslave(void*) Export *fs; Exq *q, *t, *fq, **last; char *err; + int nstat; for(;;){ qlock(&exq.qwait); @@ -569,7 +570,11 @@ exslave(void*) break; case Tstat: q->out.stat = q->buf + MSGHDRSZ + BIT16SZ; /* leaves it just where we want it */ - q->out.nstat = q->bsize-(MSGHDRSZ+BIT16SZ); + nstat = q->bsize; + if(nstat > STATMAX) + nstat = STATMAX; + nstat -= MSGHDRSZ+BIT16SZ; + q->out.nstat = nstat; break; } err = (*fcalls[q->in.type])(fs, &q->in, &q->out); diff --git a/os/port/inferno.c b/os/port/inferno.c index de9ea600..82de83d6 100644 --- a/os/port/inferno.c +++ b/os/port/inferno.c @@ -586,6 +586,7 @@ Sys_dial(void *fp) return; f->ret->t1.dfd = mkfd(f->ret->t0); + f->ret->t0 = 0; f->ret->t1.cfd = mkfd(cfd); retstr(dir, &f->ret->t1.dir); } @@ -609,6 +610,7 @@ Sys_announce(void *fp) return; f->ret->t1.cfd = mkfd(f->ret->t0); + f->ret->t0 = 0; retstr(dir, &f->ret->t1.dir); } @@ -632,6 +634,7 @@ Sys_listen(void *fp) return; f->ret->t1.cfd = mkfd(f->ret->t0); + f->ret->t0 = 0; retstr(dir, &f->ret->t1.dir); } diff --git a/os/port/portmkfile b/os/port/portmkfile index 9ee9a7f7..111cc81f 100644 --- a/os/port/portmkfile +++ b/os/port/portmkfile @@ -20,9 +20,6 @@ CLEANEXTRA= %.$O: ../ip/%.c $CC $CFLAGS -I. ../ip/$stem.c -%.$O: ../kfs/%.c - $CC $CFLAGS -I. ../kfs/$stem.c - &.$O: $HFILES $PORTHFILES $INSTALLDIR/%: % |