From 99889c5dd9647de3adeac8f9846dfef51f2c3a58 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Wed, 28 Jul 1999 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1999-07-28 --- pc/devlm78.c | 3 +-- port/devcons.c | 13 +++++++++---- port/devsd.c | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pc/devlm78.c b/pc/devlm78.c index b13c8b6c92ac86b809aec4c5c1759f1607440811..0c9b3f477c249eadaa2096ac583155a97b888a8d 100644 --- a/pc/devlm78.c +++ b/pc/devlm78.c @@ -169,10 +169,9 @@ lm78enable(void) } else { // start the sampling config = lm78rdreg(Rconfig); -pprint("config before %2.2ux\n", config); config = (config | Bstart) & ~(Bintclr|Binit); lm78wrreg(Rconfig, config); -pprint("config after %2.2ux\n", lm78rdreg(Rconfig)); +pprint("Rvidfan %2.2ux\n", lm78rdreg(Rconfig), lm78rdreg(Rvidfan)); } lm78.probed = 1; } diff --git a/port/devcons.c b/port/devcons.c index 2d8b9ee7ada5e0b6144019c90184d5a6e305db01..100300981eafe577ff1c05b440308e0bff455172 100644 --- a/port/devcons.c +++ b/port/devcons.c @@ -366,6 +366,11 @@ enum{ Qzero, }; +enum +{ + VLNUMSIZE= 22, +}; + static Dirtab consdir[]={ "authenticate", {Qauth}, 0, 0666, "authcheck", {Qauthcheck}, 0, 0666, @@ -387,7 +392,7 @@ static Dirtab consdir[]={ "swap", {Qswap}, 0, 0664, "sysname", {Qsysname}, 0, 0664, "sysstat", {Qsysstat}, 0, 0666, - "time", {Qtime}, 7*NUMSIZE, 0664, + "time", {Qtime}, NUMSIZE+3*VLNUMSIZE, 0664, "user", {Quser}, NAMELEN, 0666, "zero", {Qzero}, 0, 0444, }; @@ -1088,9 +1093,9 @@ readtime(ulong off, char *buf, int n) sec = nsec/1000000000ULL; snprint(str, sizeof(str), "%*.0lud %*.0llud %*.0llud %*.0llud ", NUMSIZE-1, sec, - 2*NUMSIZE-1, nsec, - 2*NUMSIZE-1, ticks, - 2*NUMSIZE-1, fasthz); + VLNUMSIZE-1, nsec, + VLNUMSIZE-1, ticks, + VLNUMSIZE-1, fasthz); return readstr(off, buf, n, str); } diff --git a/port/devsd.c b/port/devsd.c index e43acdff85711e8933964f0f410dd7db1e5db47d..fa9e4881eda6ca8af1646dcdb807efc15140355d 100644 --- a/port/devsd.c +++ b/port/devsd.c @@ -71,6 +71,7 @@ static int types[] = static int sdgen(Chan *c, Dirtab*, int, int s, Dir *dirp) { + Qid qid; Disk *d; Part *p;