From 2a5a4383346278833d9a43b9d0459802710bc40d Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Wed, 17 Sep 1997 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1997-09-17 --- ip/il.c | 2 +- pc/devastar.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ip/il.c b/ip/il.c index d8315e7fd08d5222ffedbc772248f0748f976c8b..b5ec1fa34b45e40625ca6427f3692efedf2c2a3c 100644 --- a/ip/il.c +++ b/ip/il.c @@ -1114,7 +1114,7 @@ iltimers(Ilcb *ic) if(ic->fasttime > Fasttime) ic->fasttime = Fasttime; ic->slowtime = (Slowtime/Seconds)*pt; - if(ic->slowtime > Slowtime) + if(ic->slowtime < Slowtime) ic->slowtime = Slowtime; } diff --git a/pc/devastar.c b/pc/devastar.c index 23eb56905cbff5f75451404739b9c4ddaf974f2c..dd7c6d257d49a7e0788a6ef0245da0dd18c65843 100644 --- a/pc/devastar.c +++ b/pc/devastar.c @@ -403,7 +403,9 @@ astarreset(void) /* check all possible names */ if(strcmp(a->type, "a100i") == 0 || strcmp(a->type,"A100I") == 0) a->ramsize = 16*1024; - else if(strcmp(a->type, "a200i") == 0 || strcmp(a->type,"A200I") == 0) + else if(strcmp(a->type, "a200i") == 0 || + strcmp(a->type,"A200I") == 0 || + strcmp(a->type, "a16i") == 0) a->ramsize = 256*1024; else { xfree(a); @@ -1373,7 +1375,7 @@ astarintr(Ureg *ur, void *arg) { Astar *a = arg; Astarchan *ac; - ulong vec, invec, outvec, errvec, mvec, cmdvec; + ulong globvec, vec, invec, outvec, errvec, mvec, cmdvec; int c; USED(ur); @@ -1385,13 +1387,14 @@ astarintr(Ureg *ur, void *arg) setpage(a, 0); /* get causes */ + globvec = LEUS(xchgw(&a->gcb->serv, 0)); + USED(globvec); invec = LEUS(xchgw(&a->gcb->inserv, 0)); outvec = LEUS(xchgw(&a->gcb->outserv, 0)); errvec = LEUS(xchgw(&a->gcb->errserv, 0)); mvec = LEUS(xchgw(&a->gcb->modemserv, 0)); cmdvec = LEUS(xchgw(&a->gcb->cmdserv, 0)); USED(mvec); - USED(cmdvec); /* reenable interrupts */ a->gcb->cmd2 = LEUS(Gintack);