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

Timestamp:

2010-07-16T14:23:41Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e2650d3

Parents:

aa0d227 (diff), 24697c3 (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. This adds support for the GTA02 platform. Fixes ticket #134.

File:

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

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

@@ -60 +60 @@
         gxemul_timer_irq_start,
         gxemul_cpu_halt,
-        gxemul_get_memory_size,
+        gxemul_get_memory_extents,
         gxemul_irq_exception,
         gxemul_frame_init,
@@ -185 +185 @@
 }
 
-/** Returns the size of emulated memory.
- *
- * @return Size in bytes.
- */
-uintptr_t gxemul_get_memory_size(void)
-{
-        return  *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
-}
-
+/** Get extents of available memory.
+ *
+ * @param start         Place to store memory start address.
+ * @param size          Place to store memory size.
+ */
+void gxemul_get_memory_extents(uintptr_t *start, uintptr_t *size)
+{
+        *start = 0;
+        *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
+}
 
 /** Returns the mask of active interrupts. */
@@ -210 +211 @@
         unsigned int i;
 
-        for (i = 0; i < GXEMUL_IRQC_MAX_IRQ; i++) {
+        for (i = 0; i < GXEMUL_IRQ_COUNT; i++) {
                 if (sources & (1 << i)) {
                         irq_t *irq = irq_dispatch_and_lock(i);