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

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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  0x40eU
+
 uintptr_t ebda = 0;
 
@@ -41 +43 @@
 {
         /* Copy the EBDA address out from BIOS Data Area */
-        ebda = *((uint16_t *) BIOS_EBDA_PTR) * 0x10;
+        ebda = *((uint16_t *) BIOS_EBDA_PTR) * 0x10U;
 }