Changeset 12b0d51 in mainline


Ignore:
Timestamp:
2010-06-25T21:06:55Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6250c37
Parents:
d7ef14b
Message:

Fix ommisions in testarm and integratorcp.

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/arm32/src/putchar.c

    rd7ef14b r12b0d51  
    104104#endif
    105105#ifdef MACHINE_integratorcp
    106         scons_senbd_integratorcp(byte);
     106        scons_sendb_icp(byte);
    107107#endif
    108108}

  • kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

    rd7ef14b r12b0d51  
    103103extern void icp_cpu_halt(void);
    104104extern void icp_irq_exception(unsigned int, istate_t *);
    105 extern uintptr_t icp_get_memory_size(void);
     105extern void icp_get_memory_extents(uintptr_t *, uintptr_t *);
    106106extern void icp_frame_init(void);
    107107

  • kernel/arch/arm32/include/mach/testarm/testarm.h

    rd7ef14b r12b0d51  
    7373extern void gxemul_cpu_halt(void);
    7474extern void gxemul_irq_exception(unsigned int, istate_t *);
    75 extern uintptr_t gxemul_get_memory_size(void);
     75extern void gxemul_get_memory_extents(uintptr_t *, uintptr_t *);
    7676extern void gxemul_frame_init(void);
    7777

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

    rd7ef14b r12b0d51  
    190190 * @param size          Place to store memory size.
    191191 */
    192 void gxemul_get_memory_size(uintptr_t *start, uintptr_t *size)
    193 {
    194         start = 0;
    195         size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
     192void gxemul_get_memory_extents(uintptr_t *start, uintptr_t *size)
     193{
     194        *start = 0;
     195        *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
    196196}
    197197
Note: See TracChangeset for help on using the changeset viewer.