From 5f958afb430a6ad018b6740c44abd9141b552329 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Fri, 20 Dec 1991 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1991-12-20 --- pc/main.c | 2 +- port/dev.c | 4 +++- port/devcons.c | 2 +- port/devscsi.c | 1 + port/devwren.c | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pc/main.c b/pc/main.c index abb812b23f6030ad5967d8275dfc570ceabc6cb6..c02f77009eedaf4cdc0858a4b8a3fb280550227f 100644 --- a/pc/main.c +++ b/pc/main.c @@ -276,7 +276,7 @@ matherror(Ureg *ur) msg = mathmsg[i]; break; } - sprint(note, "math: %s, status 0x%ux, pc 0x%lux", msg, status, ur->pc); + sprint(note, "sys: fp: %s, status 0x%ux, pc 0x%lux", msg, status, ur->pc); postnote(u->p, 1, note, NDebug); } diff --git a/port/dev.c b/port/dev.c index b7d731ae7f1a7de1977d12bb82222b6b298c35df..bc2ef4b089b4d686f5cd68483d3cdb8244d8ec55 100644 --- a/port/dev.c +++ b/port/dev.c @@ -9,6 +9,8 @@ #include "fcall.h" +extern ulong kerndate; + int devno(int c, int user) { @@ -35,7 +37,7 @@ devdir(Chan *c, Qid qid, char *n, long length, char *user, long perm, Dir *db) else db->mode = perm; db->atime = seconds(); - db->mtime = db->atime; + db->mtime = kerndate; db->hlength = 0; db->length = length; strncpy(db->uid, user, NAMELEN); diff --git a/port/devcons.c b/port/devcons.c index 6f192674840816e30441333071157e0a5b45fff9..b90832aea48ed544ec0fb840fb60d348c88b0aa8 100644 --- a/port/devcons.c +++ b/port/devcons.c @@ -779,7 +779,7 @@ conswrite(Chan *c, void *va, long n, ulong offset) u->p->user[n] = '\0'; }else error(Eperm); - if(!conf.cntrlp && strcmp(u->p->user, "none") != 0) + if(!conf.cntrlp && strcmp(eve, "bootes") == 0) memmove(eve, u->p->user, NAMELEN); break; diff --git a/port/devscsi.c b/port/devscsi.c index 7a418f74d77f79cf8fa37bddd8b0735300a2894e..1e5e31daed59954febd63c7ead357ff3cf6b070b 100644 --- a/port/devscsi.c +++ b/port/devscsi.c @@ -78,6 +78,7 @@ static int ownid = 0x08|7; /* enable advanced features */ int scsiexec(Scsi*, int); int scsiintr(void); +void scsireset(void); static int scsigen1(Chan *c, long qid, Dir *dp) diff --git a/port/devwren.c b/port/devwren.c index 7353c6a544bc33e47e0967f8a4afcd51db82cfca..ae7f3ab1d6743015c004c77dd1963313da5c2ec8 100644 --- a/port/devwren.c +++ b/port/devwren.c @@ -262,7 +262,8 @@ wrenpart(int dev) scsiready(dev); scsisense(dev, buf); - scsicap(dev, buf); + if (scsicap(dev, buf)) + error(Eio); dp = &wren[dev]; dp->drive = dev;