fix references to m->ticks in older devices. (it turns out that buda is still in use.) Reference: /n/atom/patch/applied2013/fsticks Date: Tue Aug 27 18:53:10 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/fs/pc/sdata.c Tue Aug 27 18:51:55 2013 +++ /sys/src/fs/pc/sdata.c Tue Aug 27 18:51:55 2013 @@ -424,7 +424,7 @@ } /* else we're in predawn with no u */ x = spllo(); - for (start = m->ticks; TK2MS(m->ticks - start) < msec && + for (start = Ticks; TK2MS(Ticks - start) < msec && !fn(v); ) continue; splx(x); --- /sys/src/fs/pc/scsincr53c8xx.c Tue Aug 27 18:51:55 2013 +++ /sys/src/fs/pc/scsincr53c8xx.c Tue Aug 27 18:51:55 2013 @@ -1403,14 +1403,14 @@ break; case A_SIR_NOTIFY_RESELECT: IPRINT(PRINTPREFIX "reselect: ssid %.2x sfbr %.2x at %ld\n", - n->ssid, n->sfbr, TK2MS(m->ticks)); + n->ssid, n->sfbr, TK2MS(Ticks)); cont = -2; break; case A_SIR_NOTIFY_ISSUE: IPRINT(PRINTPREFIX "%d/%d: issue:", dsa->target, dsa->lun); dsadump: IPRINT(" tgt=%d", dsa->target); - IPRINT(" time=%ld", TK2MS(m->ticks)); + IPRINT(" time=%ld", TK2MS(Ticks)); IPRINT("\n"); cont = -2; break; --- /sys/src/fs/pc/fns.h Tue Aug 27 18:51:55 2013 +++ /sys/src/fs/pc/fns.h Tue Aug 27 18:51:55 2013 @@ -74,14 +74,14 @@ #define Pciwaddrh(a) 0 /* old ata */ -//Off ataread(int, void*, long, Devsize); -//Off atawrite(int, void*, long, Devsize); +Off ataread(int, void*, long, Devsize); +Off atawrite(int, void*, long, Devsize); /* floppy */ -//int floppyinit(void); -//void floppyproc(void); -//Off floppyread(int, void*, long, Devsize); -//Off floppywrite(int, void*, long, Devsize); +int floppyinit(void); +void floppyproc(void); +Off floppyread(int, void*, long, Devsize); +Off floppywrite(int, void*, long, Devsize); /* scsi */ void scsiinit(void); --- /sys/src/fs/pc/archdat.h Tue Aug 27 18:51:55 2013 +++ /sys/src/fs/pc/archdat.h Tue Aug 27 18:51:55 2013 @@ -117,7 +117,5 @@ extern /*register*/ Mach* m; extern /*register*/ User* u; -//#define MACHP(n) ((Mach*)(MACHADDR+n*BY2PG)) -//#define Ticks MACHP(0)->ticks #define MACHP(n) sys->machptr[n] #define Ticks sys->ticks --- /sys/src/fs/ivey/mkfile Tue Aug 27 18:51:55 2013 +++ /sys/src/fs/ivey/mkfile Tue Aug 27 18:51:55 2013 @@ -144,10 +144,6 @@ install:V: /$objtype/$TARG -iso cd: bootflp - { echo bootflp ; echo $TARG ; echo plan9.ini } > $TARG'proto' - rm -f $TARG.iso && disk/mk9660 -b bootflp -p $TARG'proto' $TARG.iso - sizes: sizes.$O $LD -o $target sizes.$O -lc @@ -162,4 +158,4 @@ %.$O: $HFILES clean:V: - rm -f *.[$OS] [$OS].out bootflp *.iso timezone.h sizes $TARG^proto $TARG $ARCHCLEAN + rm -f *.[$OS] [$OS].out timezone.h sizes $TARG^proto $TARG $ARCHCLEAN --- /sys/src/fs/dev/apc.c Tue Aug 27 18:51:55 2013 +++ /sys/src/fs/dev/apc.c Tue Aug 27 18:51:55 2013 @@ -491,7 +491,7 @@ { Timet now, nextreport, remaining; - now = MACHP(0)->ticks; + now = Ticks; if (apc.status.change & OnBattery) { apc.lastrepticks = apc.battonticks = nextreport = now; apc.battpctthen = apc.battpct;