Changeset e8a0b90 in mainline

Timestamp:

2007-05-31T21:21:02Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d8431986

Parents:

67f5fbd9

Message:

fix ICC compilation

Location:

kernel/arch/ia32/src

Files:

• drivers/ega.c (modified) (3 diffs)
• drivers/i8254.c (modified) (2 diffs)
• drivers/i8259.c (modified) (3 diffs)
• ia32.c (modified) (1 diff)
• interrupt.c (modified) (7 diffs)
• mm/tlb.c (modified) (2 diffs)

kernel/arch/ia32/src/drivers/ega.c

@@ -67 +67 @@
 };
 
-void ega_move_cursor(void);
+static void ega_move_cursor(void);
 
 void ega_init(void)
@@ -120 +120 @@
 }
 
-void ega_putchar(chardev_t *d, const char ch)
+void ega_putchar(chardev_t *d __attribute__((unused)), const char ch)
 {
         ipl_t ipl;
@@ -153 +153 @@
 {
         outb(0x3d4, 0xe);
-        outb(0x3d5, (ega_cursor >> 8) & 0xff);
+        outb(0x3d5, (uint8_t) ((ega_cursor >> 8) & 0xff));
         outb(0x3d4, 0xf);
-        outb(0x3d5, ega_cursor & 0xff); 
+        outb(0x3d5, (uint8_t) (ega_cursor & 0xff));     
 }
 

kernel/arch/ia32/src/drivers/i8254.c

@@ -67 +67 @@
 }
 
-static void i8254_irq_handler(irq_t *irq, void *arg, ...)
+static void i8254_irq_handler(irq_t *irq, void *arg __attribute__((unused)), ...)
 {
         /*
@@ -122 +122 @@
                 /* will read both status and count */
                 outb(CLK_PORT4, 0xc2);
-                not_ok = (inb(CLK_PORT1)>>6)&1;
+                not_ok = (uint8_t) ((inb(CLK_PORT1) >> 6) & 1);
                 t1 = inb(CLK_PORT1);
                 t1 |= inb(CLK_PORT1) << 8;

kernel/arch/ia32/src/drivers/i8259.c

@@ -96 +96 @@
         if (irqmask & 0xff) {
                 x = inb(PIC_PIC0PORT2);
-                outb(PIC_PIC0PORT2, x & (~(irqmask & 0xff)));
+                outb(PIC_PIC0PORT2, (uint8_t) (x & (~(irqmask & 0xff))));
         }
         if (irqmask >> 8) {
                 x = inb(PIC_PIC1PORT2);
-                outb(PIC_PIC1PORT2, x & (~(irqmask >> 8)));
+                outb(PIC_PIC1PORT2, (uint8_t) (x & (~(irqmask >> 8))));
         }
 }
@@ -110 +110 @@
         if (irqmask & 0xff) {
                 x = inb(PIC_PIC0PORT2);
-                outb(PIC_PIC0PORT2, x | (irqmask & 0xff));
+                outb(PIC_PIC0PORT2, (uint8_t) (x | (irqmask & 0xff)));
         }
         if (irqmask >> 8) {
                 x = inb(PIC_PIC1PORT2);
-                outb(PIC_PIC1PORT2, x | (irqmask >> 8));
+                outb(PIC_PIC1PORT2, (uint8_t) (x | (irqmask >> 8)));
         }
 }
@@ -124 +124 @@
 }
 
-void pic_spurious(int n, istate_t *istate)
+void pic_spurious(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
 {
 #ifdef CONFIG_DEBUG
-        printf("cpu%d: PIC spurious interrupt\n", CPU->id);
+        printf("cpu%u: PIC spurious interrupt\n", CPU->id);
 #endif
 }

kernel/arch/ia32/src/ia32.c

@@ -127 +127 @@
 void arch_post_smp_init(void)
 {
+        devno_t kbd = device_assign_devno();
+        devno_t mouse = device_assign_devno();
         /* keyboard controller */
-        i8042_init(device_assign_devno(), IRQ_KBD, device_assign_devno(), IRQ_MOUSE);
+        i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
 }
 

kernel/arch/ia32/src/interrupt.c

@@ -70 +70 @@
 
         if (CPU)
-                printf("----------------EXCEPTION OCCURED (cpu%d)----------------\n", CPU->id);
+                printf("----------------EXCEPTION OCCURED (cpu%u)----------------\n", CPU->id);
         else
                 printf("----------------EXCEPTION OCCURED----------------\n");
                 
-        printf("%%eip: %#x (%s)\n",istate->eip,symbol);
-        printf("ERROR_WORD=%#x\n", istate->error_word);
-        printf("%%cs=%#x,flags=%#x\n", istate->cs, istate->eflags);
-        printf("%%eax=%#x, %%ecx=%#x, %%edx=%#x, %%esp=%#x\n",  istate->eax,istate->ecx,istate->edx,&istate->stack[0]);
+        printf("%%eip: %#lx (%s)\n", istate->eip, symbol);
+        printf("ERROR_WORD=%#lx\n", istate->error_word);
+        printf("%%cs=%#lx,flags=%#lx\n", istate->cs, istate->eflags);
+        printf("%%eax=%#lx, %%ecx=%#lx, %%edx=%#lx, %%esp=%p\n", istate->eax, istate->ecx, istate->edx, &istate->stack[0]);
 #ifdef CONFIG_DEBUG_ALLREGS
-        printf("%%esi=%#x, %%edi=%#x, %%ebp=%#x, %%ebx=%#x\n",  istate->esi,istate->edi,istate->ebp,istate->ebx);
-#endif
-        printf("stack: %#x, %#x, %#x, %#x\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
-        printf("       %#x, %#x, %#x, %#x\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
+        printf("%%esi=%#lx, %%edi=%#lx, %%ebp=%#lx, %%ebx=%#lx\n", istate->esi, istate->edi, istate->ebp, istate->ebx);
+#endif
+        printf("stack: %#lx, %#lx, %#lx, %#lx\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
+        printf("       %#lx, %#lx, %#lx, %#lx\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
 }
 
@@ -103 +103 @@
 
 /** General Protection Fault. */
-static void gp_fault(int n, istate_t *istate)
+static void gp_fault(int n __attribute__((unused)), istate_t *istate)
 {
         if (TASK) {
@@ -130 +130 @@
 }
 
-static void ss_fault(int n, istate_t *istate)
+static void ss_fault(int n __attribute__((unused)), istate_t *istate)
 {
         fault_if_from_uspace(istate, "stack fault");
@@ -138 +138 @@
 }
 
-static void simd_fp_exception(int n, istate_t *istate)
+static void simd_fp_exception(int n __attribute__((unused)), istate_t *istate)
 {
         uint32_t mxcsr;
         asm (
                 "stmxcsr %0;\n"
-                :"=m"(mxcsr)
+                : "=m" (mxcsr)
         );
         fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zx",
-            (unative_t)mxcsr);
-
-        decode_istate(istate);
-        printf("MXCSR: %#zx\n",(unative_t)(mxcsr));
+            (unative_t) mxcsr);
+
+        decode_istate(istate);
+        printf("MXCSR: %#lx\n", mxcsr);
         panic("SIMD FP exception(19)\n");
 }
 
-static void nm_fault(int n, istate_t *istate)
+static void nm_fault(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
 {
 #ifdef CONFIG_FPU_LAZY     
@@ -164 +164 @@
 
 #ifdef CONFIG_SMP
-static void tlb_shootdown_ipi(int n, istate_t *istate)
+static void tlb_shootdown_ipi(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
 {
         trap_virtual_eoi();
@@ -172 +172 @@
 
 /** Handler of IRQ exceptions */
-static void irq_interrupt(int n, istate_t *istate)
+static void irq_interrupt(int n, istate_t *istate __attribute__((unused)))
 {
         ASSERT(n >= IVT_IRQBASE);
@@ -199 +199 @@
                  */
 #ifdef CONFIG_DEBUG
-                printf("cpu%d: spurious interrupt (inum=%d)\n", CPU->id, inum);
+                printf("cpu%u: spurious interrupt (inum=%d)\n", CPU->id, inum);
 #endif
         }

kernel/arch/ia32/src/mm/tlb.c

@@ -49 +49 @@
  * @param asid This parameter is ignored as the architecture doesn't support it.
  */
-void tlb_invalidate_asid(asid_t asid)
+void tlb_invalidate_asid(asid_t asid __attribute__((unused)))
 {
         tlb_invalidate_all();
@@ -60 +60 @@
  * @param cnt Number of entries to invalidate.
  */
-void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid __attribute__((unused)), uintptr_t page, count_t cnt)
 {
         unsigned int i;