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

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

File:

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

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

@@ -56 +56 @@
 static icp_hw_map_t icp_hw_map;
 static irq_t icp_timer_irq;
-struct arm_machine_ops machine_ops = {
+struct arm_machine_ops icp_machine_ops = {
         icp_init,
         icp_timer_irq_start,
         icp_cpu_halt,
-        icp_get_memory_size,
+        icp_get_memory_extents,
         icp_irq_exception,
         icp_frame_init,
         icp_output_init,
-        icp_input_init
+        icp_input_init,
+        icp_get_irq_count
 };
 
@@ -214 +215 @@
 }
 
-/** 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;
+        }
 }
 
@@ -242 +246 @@
  * @param istate Saved processor state.
  */
-void icp_irq_exception(int exc_no, istate_t *istate)
+void icp_irq_exception(unsigned int exc_no, istate_t *istate)
 {
         uint32_t sources = icp_irqc_get_sources();
-        int i;
+        unsigned int i;
         
         for (i = 0; i < ICP_IRQC_MAX_IRQ; i++) {
@@ -333 +337 @@
 }
 
+size_t icp_get_irq_count(void)
+{
+        return ICP_IRQ_COUNT;
+}
 
 /** @}