From: Kees van Reeuwijk <reeuwijk@few.vu.nl>
Date: Wed, 13 Jan 2010 14:44:19 +0000 (+0000)
Subject: Fixed a bug in apic.c that broke lapic_stop_timer().
X-Git-Tag: v3.1.6~89
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=ad4c0ff6989486084359e4878c9d9b9056c598b0;p=minix.git

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.
---

diff --git a/drivers/audio/framework/liveupdate.c b/drivers/audio/framework/liveupdate.c
index dc8546745..62ee35236 100644
--- a/drivers/audio/framework/liveupdate.c
+++ b/drivers/audio/framework/liveupdate.c
@@ -23,10 +23,10 @@ PRIVATE void load_state_info(void)
       if(sub_dev[i].RevivePending) {
           dma_mode = sub_dev[i].DmaMode;
 
-          if(dma_mode = DEV_READ_S) {
+          if(dma_mode == DEV_READ_S) {
               is_read_pending = TRUE;
           }
-          else if (dma_mode = DEV_WRITE_S){
+          else if (dma_mode == DEV_WRITE_S){
               is_write_pending = TRUE;
           }
       }
diff --git a/kernel/arch/i386/apic.c b/kernel/arch/i386/apic.c
index 018c91ba7..7143aa6e3 100644
--- a/kernel/arch/i386/apic.c
+++ b/kernel/arch/i386/apic.c
@@ -278,7 +278,7 @@ PUBLIC void lapic_set_timer_periodic(unsigned freq)
 PUBLIC void lapic_stop_timer(void)
 {
 	u32_t lvtt;
-	lapic_read(LAPIC_LVTTR);
+	lvtt = lapic_read(LAPIC_LVTTR);
 	lapic_write(LAPIC_LVTTR, lvtt | APIC_LVTT_MASK);
 }
 
diff --git a/servers/rs/service.c b/servers/rs/service.c
index cc4884420..cb7074998 100644
--- a/servers/rs/service.c
+++ b/servers/rs/service.c
@@ -1050,8 +1050,8 @@ PRIVATE void do_config(char *label, char *filename)
 	}
 	if (cp == NULL)
 	{
-		fprintf(stderr, "service: service '%s' not found in config\n",
-			label);
+		fprintf(stderr, "service: service '%s' not found in '%s'\n",
+			label, filename);
 		exit(1);
 	}