Changeset e8a0b90 in mainline for kernel/arch/ia32/src/drivers

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/drivers

Files:

• ega.c (modified) (3 diffs)
• i8254.c (modified) (2 diffs)
• i8259.c (modified) (3 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
 }