Fixed a bug in apic.c that broke lapic_stop_timer().
Fixed bugs in liveupdate.c that rendered load_state_info() meaningless. More informative error message in do_config() in service.c.
This commit is contained in:
parent
6a5660a431
commit
ad4c0ff698
3 changed files with 5 additions and 5 deletions
|
@ -23,10 +23,10 @@ PRIVATE void load_state_info(void)
|
||||||
if(sub_dev[i].RevivePending) {
|
if(sub_dev[i].RevivePending) {
|
||||||
dma_mode = sub_dev[i].DmaMode;
|
dma_mode = sub_dev[i].DmaMode;
|
||||||
|
|
||||||
if(dma_mode = DEV_READ_S) {
|
if(dma_mode == DEV_READ_S) {
|
||||||
is_read_pending = TRUE;
|
is_read_pending = TRUE;
|
||||||
}
|
}
|
||||||
else if (dma_mode = DEV_WRITE_S){
|
else if (dma_mode == DEV_WRITE_S){
|
||||||
is_write_pending = TRUE;
|
is_write_pending = TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -278,7 +278,7 @@ PUBLIC void lapic_set_timer_periodic(unsigned freq)
|
||||||
PUBLIC void lapic_stop_timer(void)
|
PUBLIC void lapic_stop_timer(void)
|
||||||
{
|
{
|
||||||
u32_t lvtt;
|
u32_t lvtt;
|
||||||
lapic_read(LAPIC_LVTTR);
|
lvtt = lapic_read(LAPIC_LVTTR);
|
||||||
lapic_write(LAPIC_LVTTR, lvtt | APIC_LVTT_MASK);
|
lapic_write(LAPIC_LVTTR, lvtt | APIC_LVTT_MASK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1050,8 +1050,8 @@ PRIVATE void do_config(char *label, char *filename)
|
||||||
}
|
}
|
||||||
if (cp == NULL)
|
if (cp == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "service: service '%s' not found in config\n",
|
fprintf(stderr, "service: service '%s' not found in '%s'\n",
|
||||||
label);
|
label, filename);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue