Changeset d7ef14b in mainline for kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

Timestamp:

2010-06-25T20:58:06Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

12b0d51

Parents:

1590e23

Message:

Link kernel to the proper base address for gta02. Change machine_get_memory_size() to machine_get_memory_extents() and trivially implement for gta02.

File:

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

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

@@ -60 +60 @@
         icp_timer_irq_start,
         icp_cpu_halt,
-        icp_get_memory_size,
+        icp_get_memory_extents,
         icp_irq_exception,
         icp_frame_init,
@@ -214 +214 @@
 }
 
-/** Returns the size of emulated memory.
- *
- * @return Size in bytes.
- */
-size_t icp_get_memory_size(void) 
-{
+/** Get extents of available memory.
+ *
+ * @param start         Place to store memory start address.
+ * @param size          Place to store memory size.
+ */
+void icp_get_memory_extents(uintptr_t *start, uintptr_t *size)
+{
+        *start = 0;
+
         if (hw_map_init_called) {
-                return (sdram[((*(uint32_t *)icp_hw_map.sdramcr & ICP_SDRAM_MASK) >> 2)]);
+                *size = (sdram[((*(uint32_t *)icp_hw_map.sdramcr &
+                    ICP_SDRAM_MASK) >> 2)]);
         } else {
-                return SDRAM_SIZE;
-        }
-        
+                *size = SDRAM_SIZE;
+        }
 }