Changeset ea28272 in mainline for kernel/arch/arm32/src/mach/testarm/testarm.c

Timestamp:

2010-12-30T13:43:27Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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/arm32/src/mach/testarm/testarm.c (modified) (3 diffs)

kernel/arch/arm32/src/mach/testarm/testarm.c

@@ -65 +65 @@
         gxemul_output_init,
         gxemul_input_init,
-        gxemul_get_irq_count
+        gxemul_get_irq_count,
+        gxemul_get_platform_name
 };
 
@@ -123 +124 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.virtual", NULL, (unative_t) gxemul_kbd);
+        sysinfo_set_item_val("kbd.address.virtual", NULL, (sysarg_t) gxemul_kbd);
 #endif
 }
@@ -130 +131 @@
 {
         return GXEMUL_IRQ_COUNT;
+}
+
+const char *gxemul_get_platform_name(void)
+{
+        return "gxemul";
 }