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 dc854674570634a56a74cb26068c8283192b939e..62ee35236cfbe44cae70b60682d3c81c8c352a26 100644 (file)
--- 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 018c91ba7228b4fc729ef9b8c97b1e349f09fbdf..7143aa6e30ce9d33c2a25e0c14531034825b09e8 100644 (file)
--- 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 cc4884420803957df24fd5fa64f98d87ee395ed3..cb70749987b46b4ab2828368cadbfa88a72b4b0d 100644 (file)
--- 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);
        }