From 12d7ed8d94e760b1a0c561d036edd3764eb8f5aa Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Thu, 1 Apr 1993 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1993-04-01 --- gnot/devlbp.c | 4 +++- pc/main.c | 14 +++++++------- port/devcons.c | 3 +++ port/stil.c | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gnot/devlbp.c b/gnot/devlbp.c index 2488fe1b7a7a02cfd03b471fe414bbcbf1c77c18..922affbbb0b77db4570f1098b0543bd696d10ce2 100644 --- a/gnot/devlbp.c +++ b/gnot/devlbp.c @@ -781,8 +781,10 @@ lbpintr(void) return 1/*0*/; } if (!lbp.printing.p) { + csr = dev->csr; CSRCLR(HFINTEN|EFINTEN|GO); - print("spurious lbpintr: 0x%4.4ux\n", csr); + if(csr & BINT) + print("spurious lbpintr: 0x%4.4ux\n", csr); return 1; } if (!(csr & EFL)) { diff --git a/pc/main.c b/pc/main.c index 4c42eea849e37dc39c09f1b7a9a5d414d7eb61f3..671a8a047d182c6ff33000bd152361cb107ebd05 100644 --- a/pc/main.c +++ b/pc/main.c @@ -297,6 +297,13 @@ confinit(void) conf.base0 += ktop; conf.topofmem = i*MB; + conf.nproc = 30 + i*5; + conf.monitor = 1; + conf.nswap = conf.nproc*80; + conf.nimage = 50; + conf.copymode = 0; /* copy on write */ + conf.nfloppy = 2; + conf.nhard = 2; /* * parse configuration args from dos file p9rc @@ -319,13 +326,6 @@ confinit(void) nconf++; } - conf.monitor = 1; - conf.nproc = 30 + i*5; - conf.nswap = conf.nproc*80; - conf.nimage = 50; - conf.copymode = 0; /* copy on write */ - conf.nfloppy = 2; - conf.nhard = 2; } char *mathmsg[] = diff --git a/port/devcons.c b/port/devcons.c index 7c424dbf9911c2bcc6552eb921490c63d13ceb7e..766d5cbefcf6b32617406c1fe41024081e66eff6 100644 --- a/port/devcons.c +++ b/port/devcons.c @@ -187,7 +187,10 @@ pprint(char *fmt, ...) n = sprint(buf, "%s %d: ", u->p->text, u->p->pid); n = doprint(buf+n, buf+sizeof(buf), fmt, (&fmt+1)) - buf; + if(waserror()) + return 0; (*devtab[c->type].write)(c, buf, n, c->offset); + poperror(); lock(c); c->offset += n; diff --git a/port/stil.c b/port/stil.c index 2f145a105865cc32c819f2b36e50b8f7775f1700..c35bbeedcb3a9f10e3d6d627055b68172e65a8d6 100644 --- a/port/stil.c +++ b/port/stil.c @@ -13,7 +13,7 @@ #define DBG if(0)print int ilcksum = 1; -static int initseq = 25000; +static int initseq = 25001; static Rendez ilackr; char *ilstate[] =