Changeset 7f043c0 in mainline for kernel/arch/ia32/src/smp/mps.c

Timestamp:

2007-05-31T21:39:13Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7bb0c32

Parents:

d8431986

Message:

fix ICC compilation

File:

• kernel/arch/ia32/src/smp/mps.c (modified) (11 diffs)

kernel/arch/ia32/src/smp/mps.c

@@ -55 +55 @@
 #define CT_SIGNATURE    0x504d4350
 
-int mps_fs_check(uint8_t *base);
-int mps_ct_check(void);
-
-int configure_via_ct(void);
-int configure_via_default(uint8_t n);
-
-int ct_processor_entry(struct __processor_entry *pr);
-void ct_bus_entry(struct __bus_entry *bus);
-void ct_io_apic_entry(struct __io_apic_entry *ioa);
-void ct_io_intr_entry(struct __io_intr_entry *iointr);
-void ct_l_intr_entry(struct __l_intr_entry *lintr);
-
-void ct_extended_entries(void);
+static int mps_fs_check(uint8_t *base);
+static int mps_ct_check(void);
+
+static int configure_via_ct(void);
+static int configure_via_default(uint8_t n);
+
+static int ct_processor_entry(struct __processor_entry *pr);
+static void ct_bus_entry(struct __bus_entry *bus);
+static void ct_io_apic_entry(struct __io_apic_entry *ioa);
+static void ct_io_intr_entry(struct __io_intr_entry *iointr);
+static void ct_l_intr_entry(struct __l_intr_entry *lintr);
+
+static void ct_extended_entries(void);
 
 static struct mps_fs *fs;
@@ -109 +109 @@
 {
         ASSERT(i < processor_entry_cnt);
-        return processor_entries[i].cpu_flags & 0x1;
+        return (bool) ((processor_entries[i].cpu_flags & 0x01) == 0x01);
 }
 
@@ -115 +115 @@
 {
         ASSERT(i < processor_entry_cnt);
-        return processor_entries[i].cpu_flags & 0x2;
+        return (bool) ((processor_entries[i].cpu_flags & 0x02) == 0x02);
 }
 
@@ -134 +134 @@
         
         for (i = 0, sum = 0; i < 16; i++)
-                sum += base[i];
+                sum = (uint8_t) (sum + base[i]);
         
         return !sum;
@@ -151 +151 @@
         /* count the checksum for the base table */
         for (i=0,sum=0; i < ct->base_table_length; i++)
-                sum += base[i];
+                sum = (uint8_t) (sum + base[i]);
                 
         if (sum)
@@ -158 +158 @@
         /* count the checksum for the extended table */
         for (i=0,sum=0; i < ct->ext_table_length; i++)
-                sum += ext[i];
+                sum = (uint8_t) (sum + ext[i]);
                 
         return sum == ct->ext_table_checksum;
@@ -287 +287 @@
 }
 
-int configure_via_default(uint8_t n)
+int configure_via_default(uint8_t n __attribute__((unused)))
 {
         /*
@@ -297 +297 @@
 
 
-int ct_processor_entry(struct __processor_entry *pr)
+int ct_processor_entry(struct __processor_entry *pr __attribute__((unused)))
 {
         /*
@@ -309 +309 @@
 }
 
-void ct_bus_entry(struct __bus_entry *bus)
+void ct_bus_entry(struct __bus_entry *bus __attribute__((unused)))
 {
 #ifdef MPSCT_VERBOSE
@@ -338 +338 @@
 
 //#define MPSCT_VERBOSE
-void ct_io_intr_entry(struct __io_intr_entry *iointr)
+void ct_io_intr_entry(struct __io_intr_entry *iointr __attribute__((unused)))
 {
 #ifdef MPSCT_VERBOSE
@@ -369 +369 @@
 }
 
-void ct_l_intr_entry(struct __l_intr_entry *lintr)
+void ct_l_intr_entry(struct __l_intr_entry *lintr __attribute__((unused)))
 {
 #ifdef MPSCT_VERBOSE