Changeset b5e68c8 in mainline for kernel/arch/ia32/src/bios/bios.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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.

File:

• kernel/arch/ia32/src/bios/bios.c (modified) (2 diffs)

kernel/arch/ia32/src/bios/bios.c

@@ -36 +36 @@
 #include <typedefs.h>
 
-#define BIOS_EBDA_PTR  0x40e
+#define BIOS_EBDA_PTR  0x40eU
 
 uintptr_t ebda = 0;
@@ -43 +43 @@
 {
         /* Copy the EBDA address out from BIOS Data Area */
-        ebda = *((uint16_t *) BIOS_EBDA_PTR) * 0x10;
+        ebda = *((uint16_t *) BIOS_EBDA_PTR) * 0x10U;
 }