xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pc/pc64: get rid of timerset(0) case, was used with "i8253set off" ctl

Browse source
This commit is contained in:
cinap_lenrek 2017-01-22 21:12:38 +01:00
parent 885d41dd7b
commit 9278b94623
3 changed files with 14 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sys/src/9/pc/apic.c
View file

@ -396,15 +396,12 @@ lapictimerset(uvlong next)
Apictimer *a;
a = &lapictimer[m->machno];
period = a->max;
if(next != 0){
period = next - fastticks(nil);
period /= a->div;
if(period < a->min)
period = a->min;
else if(period > a->max - a->min)
period = a->max;
}
period = next - fastticks(nil);
period /= a->div;
if(period < a->min)
period = a->min;
else if(period > a->max - a->min)
period = a->max;
lapicw(LapicTICR, period);
}

17
sys/src/9/pc/devarch.c
View file

@ -69,8 +69,6 @@ int narchdir = Qbase;
int (*_pcmspecial)(char*, ISAConf*);
void (*_pcmspecialclose)(int);
static int doi8253set = 1;
/*
* Add a file to the #P listing. Once added, you can't delete it.
* You can't add a file with the same name as one already there,
@ -923,7 +921,6 @@ archctlread(Chan*, void *a, long nn, vlong offset)
p = seprint(p, ep, "cmpswap486\n");
else
p = seprint(p, ep, "0x%p\n", cmpswap);
p = seprint(p, ep, "i8253set %s\n", doi8253set ? "on" : "off");
p = seprint(p, ep, "arch %s\n", arch->id);
n = p - buf;
n += mtrrprint(p, ep - p);
@ -938,7 +935,6 @@ enum
{
CMpge,
CMcoherence,
CMi8253set,
CMcache,
};
@ -946,7 +942,6 @@ static Cmdtab archctlmsg[] =
{
CMpge, "pge", 2,
CMcoherence, "coherence", 2,
CMi8253set, "i8253set", 2,
CMcache, "cache", 4,
};
@ -994,15 +989,6 @@ archctlwrite(Chan*, void *a, long n, vlong)
}else
cmderror(cb, "invalid coherence ctl");
break;
case CMi8253set:
if(strcmp(cb->f[1], "on") == 0)
doi8253set = 1;
else if(strcmp(cb->f[1], "off") == 0){
doi8253set = 0;
(*arch->timerset)(0);
}else
cmderror(cb, "invalid i2853set ctl");
break;
case CMcache:
base = strtoull(cb->f[1], &ep, 0);
if(*ep)
@ -1144,8 +1130,7 @@ ulong
void
timerset(Tval x)
{
if(doi8253set)
(*arch->timerset)(x);
(*arch->timerset)(x);
}
/*

17
sys/src/9/pc/i8253.c
View file

@ -199,17 +199,14 @@ i8253timerset(uvlong next)
ulong want;
ulong now;
period = MaxPeriod;
if(next != 0){
want = next>>Tickshift;
now = i8253.ticks; /* assuming whomever called us just did fastticks() */
want = next>>Tickshift;
now = i8253.ticks; /* assuming whomever called us just did fastticks() */
period = want - now;
if(period < MinPeriod)
period = MinPeriod;
else if(period > MaxPeriod)
period = MaxPeriod;
}
period = want - now;
if(period < MinPeriod)
period = MinPeriod;
else if(period > MaxPeriod)
period = MaxPeriod;
/* hysteresis */
if(i8253.period != period){