From e9ce2c4f08000bc62943229d312b41ed10b3dfd4 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Fri, 12 Oct 1990 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1990-10-12 --- gnot/clock.c | 4 ++-- gnot/mem.h | 4 ++-- port/devbit.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnot/clock.c b/gnot/clock.c index 70efe4995c04994a8fa9ec5507fcbe517ca1e2f8..9f79da37e5b8c97d7391bbc7caba2f0c3581a627 100644 --- a/gnot/clock.c +++ b/gnot/clock.c @@ -14,10 +14,10 @@ alarm(int ms, void (*f)(Alarm*), void *arg) { Alarm *a, *w, *pw; ulong s; - if(ms < 0) - ms = 0; a = newalarm(); a->dt = MS2TK(ms); + if(a->dt < 0) + a->dt = 0; a->f = f; a->arg = arg; s = splhi(); diff --git a/gnot/mem.h b/gnot/mem.h index 6311cf2c1751505c1f368e0fdc7466a829b06255..a8093fb9dd4400ca111e7c2ff5ddf774dd80996b 100644 --- a/gnot/mem.h +++ b/gnot/mem.h @@ -21,8 +21,8 @@ #define HZ (60) /* clock frequency */ #define MS2HZ (1000/HZ) /* millisec per clock tick */ #define TK2SEC(t) ((t)/HZ) /* ticks to seconds */ -#define TK2MS(t) (((t)*1000)/HZ) /* ticks to milliseconds */ -#define MS2TK(t) (((t)*HZ)/1000) /* milliseconds to ticks */ +#define TK2MS(t) ((((ulong)(t))*1000)/HZ) /* ticks to milliseconds */ +#define MS2TK(t) ((((ulong)(t))*HZ)/1000) /* milliseconds to ticks */ /* * SR bits diff --git a/port/devbit.c b/port/devbit.c index 65ec464248fe3cab1ab0836f5b430b0ef645807a..4a6bec3104fe955e192eeb0b425e0e7ad1373c46 100644 --- a/port/devbit.c +++ b/port/devbit.c @@ -893,7 +893,7 @@ bitwrite(Chan *c, void *va, long n) t.bits[y] = src->base[y]>>16; else for(y=0; y<16; y++){ - l = src->base[y%(16/th)] >> (32-tw); + l = src->base[y%th] >> (32-tw); for(i=16/tw, ws=l; i > 1; i--) ws = (ws<