Changeset 8fb1bf82 in mainline for kernel/arch/ia32/src/drivers

Timestamp:

2010-11-25T13:42:50Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/arch/ia32/src/drivers

Files:

• i8254.c (modified) (1 diff)
• i8259.c (modified) (1 diff)
• vesa.c (modified) (1 diff)

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

@@ -54 +54 @@
 #include <ddi/device.h>
 
-#define CLK_PORT1  ((ioport8_t *) 0x40)
-#define CLK_PORT4  ((ioport8_t *) 0x43)
+#define CLK_PORT1  ((ioport8_t *) 0x40U)
+#define CLK_PORT4  ((ioport8_t *) 0x43U)
 
 #define CLK_CONST     1193180

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

@@ -121 +121 @@
 void pic_eoi(void)
 {
-        pio_write_8((ioport8_t *)0x20, 0x20);
-        pio_write_8((ioport8_t *)0xa0, 0x20);
+        pio_write_8((ioport8_t *) 0x20, 0x20);
+        pio_write_8((ioport8_t *) 0xa0, 0x20);
 }
 

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

@@ -70 +70 @@
 bool vesa_init(void)
 {
-        if ((vesa_width == 0xffff) || (vesa_height == 0xffff))
+        if ((vesa_width == 0xffffU) || (vesa_height == 0xffffU))
                 return false;