Changeset 7f043c0 in mainline for kernel/arch/ia32/src/smp/apic.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/apic.c (modified) (12 diffs)

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

@@ -126 +126 @@
  * @param istate Interrupted state.
  */
-static void apic_spurious(int n, istate_t *istate)
+static void apic_spurious(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
 {
 #ifdef CONFIG_DEBUG
-        printf("cpu%d: APIC spurious interrupt\n", CPU->id);
+        printf("cpu%u: APIC spurious interrupt\n", CPU->id);
 #endif
 }
@@ -138 +138 @@
 }
 
-static void l_apic_timer_irq_handler(irq_t *irq, void *arg, ...)
+static void l_apic_timer_irq_handler(irq_t *irq, void *arg __attribute__((unused)), ...)
 {
         /*
@@ -154 +154 @@
 {
         io_apic_id_t idreg;
-        unsigned int i;
-
+        
         exc_register(VECTOR_APIC_SPUR, "apic_spurious", (iroutine) apic_spurious);
 
@@ -177 +176 @@
         irq_register(&l_apic_timer_irq);
         
+        uint8_t i;
         for (i = 0; i < IRQ_COUNT; i++) {
                 int pin;
         
                 if ((pin = smp_irq_to_pin(i)) != -1)
-                        io_apic_change_ioredtbl(pin, DEST_ALL, IVT_IRQBASE + i, LOPRI);
+                        io_apic_change_ioredtbl((uint8_t) pin, DEST_ALL, (uint8_t) (IVT_IRQBASE + i), LOPRI);
         }
         
@@ -329 +329 @@
                 for (i = 0; i<2; i++) {
                         icr.lo = l_apic[ICRlo];
-                        icr.vector = ((uintptr_t) ap_boot) / 4096; /* calculate the reset vector */
+                        icr.vector = (uint8_t) (((uintptr_t) ap_boot) >> 12); /* calculate the reset vector */
                         icr.delmod = DELMOD_STARTUP;
                         icr.destmod = DESTMOD_PHYS;
@@ -426 +426 @@
         
         /* Program Logical Destination Register. */
+        ASSERT(CPU->id < 8)
         ldr.value = l_apic[LDR];
-        if (CPU->id < sizeof(CPU->id)*8)        /* size in bits */
-                ldr.id = (1<<CPU->id);
+        ldr.id = (uint8_t) (1 << CPU->id);
         l_apic[LDR] = ldr.value;
         
@@ -514 +514 @@
  * @param flags Flags.
  */
-void io_apic_change_ioredtbl(int pin, int dest, uint8_t v, int flags)
+void io_apic_change_ioredtbl(uint8_t pin, uint8_t dest, uint8_t v, int flags)
 {
         io_redirection_reg_t reg;
@@ -522 +522 @@
                 dlvr = DELMOD_LOWPRI;
 
-        reg.lo = io_apic_read(IOREDTBL + pin*2);
-        reg.hi = io_apic_read(IOREDTBL + pin*2 + 1);
+        reg.lo = io_apic_read((uint8_t) (IOREDTBL + pin * 2));
+        reg.hi = io_apic_read((uint8_t) (IOREDTBL + pin * 2 + 1));
         
         reg.dest = dest;
@@ -532 +532 @@
         reg.intvec = v;
 
-        io_apic_write(IOREDTBL + pin*2, reg.lo);
-        io_apic_write(IOREDTBL + pin*2 + 1, reg.hi);
+        io_apic_write((uint8_t) (IOREDTBL + pin * 2), reg.lo);
+        io_apic_write((uint8_t) (IOREDTBL + pin * 2 + 1), reg.hi);
 }
 
@@ -554 +554 @@
                         pin = smp_irq_to_pin(i);
                         if (pin != -1) {
-                                reg.lo = io_apic_read(IOREDTBL + pin * 2);
+                                reg.lo = io_apic_read((uint8_t) (IOREDTBL + pin * 2));
                                 reg.masked = true;
-                                io_apic_write(IOREDTBL + pin * 2, reg.lo);
+                                io_apic_write((uint8_t) (IOREDTBL + pin * 2), reg.lo);
                         }
                         
@@ -573 +573 @@
         io_redirection_reg_t reg;       
         
-        for (i = 0;i < 16; i++) {
+        for (i = 0; i < 16; i++) {
                 if (irqmask & (1 << i)) {
                         /*
@@ -581 +581 @@
                         pin = smp_irq_to_pin(i);
                         if (pin != -1) {
-                                reg.lo = io_apic_read(IOREDTBL + pin * 2);
+                                reg.lo = io_apic_read((uint8_t) (IOREDTBL + pin * 2));
                                 reg.masked = false;
-                                io_apic_write(IOREDTBL + pin * 2, reg.lo);
+                                io_apic_write((uint8_t) (IOREDTBL + pin * 2), reg.lo);
                         }