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

Timestamp:

2011-01-08T18:51:31Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

15be932

Parents:

8f748215 (diff), a523af4 (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 from main branch

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.
  *