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

Timestamp:

2010-07-27T21:42:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

69a60c4

Parents:

5a9f4d7 (diff), 1720cf9 (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 lp:~jsvoboda/helenos/gta02.

File:

• kernel/arch/arm32/src/mach/testarm/testarm.c (modified) (2 diffs)

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

@@ -64 +64 @@
         gxemul_frame_init,
         gxemul_output_init,
-        gxemul_input_init
+        gxemul_input_init,
+        gxemul_get_irq_count
 };
 
@@ -126 +127 @@
 }
 
+size_t gxemul_get_irq_count(void)
+{
+        return GXEMUL_IRQ_COUNT;
+}
+
 /** Starts gxemul Real Time Clock device, which asserts regular interrupts.
  *