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

Timestamp:

2010-12-25T15:13:07Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a465a56, e84d65a

Parents:

ab49a0d (diff), 6eb794a (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

Conflicts: no problem resolving.

File:

• kernel/arch/arm32/src/mach/testarm/testarm.c (modified) (2 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
 };
 
@@ -132 +133 @@
 }
 
+const char *gxemul_get_platform_name(void)
+{
+        return "gxemul";
+}
+
 /** Starts gxemul Real Time Clock device, which asserts regular interrupts.
  *