M gnot/devlbp.c => gnot/devlbp.c +3 -1
@@ 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)) {
M pc/main.c => pc/main.c +7 -7
@@ 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[] =
M port/devcons.c => port/devcons.c +3 -0
@@ 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;
M port/stil.c => port/stil.c +1 -1
@@ 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[] =