| /branches/dynload/kernel/arch/arm32/src/arm32.c |
|---|
| 34,7 → 34,6 |
| */ |
| #include <arch.h> |
| #include <arch/boot.h> |
| #include <config.h> |
| #include <arch/console.h> |
| #include <ddi/device.h> |
| 48,22 → 47,19 |
| #include <arch/regutils.h> |
| #include <arch/machine.h> |
| #include <userspace.h> |
| #include <macros.h> |
| /** Information about loaded tasks. */ |
| bootinfo_t bootinfo; |
| /** Performs arm32 specific initialization before main_bsp() is called. */ |
| void arch_pre_main(void) |
| void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo) |
| { |
| unsigned int i; |
| init.cnt = bootinfo.cnt; |
| for (i = 0; i < bootinfo.cnt; ++i) { |
| init.tasks[i].addr = bootinfo.tasks[i].addr; |
| init.tasks[i].size = bootinfo.tasks[i].size; |
| init.cnt = bootinfo->cnt; |
| for (i = 0; i < min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); ++i) { |
| init.tasks[i].addr = bootinfo->tasks[i].addr; |
| init.tasks[i].size = bootinfo->tasks[i].size; |
| } |
| } |
| /** Performs arm32 specific initialization before mm is initialized. */ |
| /branches/dynload/kernel/arch/arm32/src/mm/frame.c |
|---|
| 41,6 → 41,7 |
| /** Address of the last frame in the memory. */ |
| uintptr_t last_frame = 0; |
| uintptr_t end_frame = 0; |
| /** Creates memory zones. */ |
| void frame_arch_init(void) |
| 49,7 → 50,8 |
| zone_create(0, ADDR2PFN(machine_get_memory_size()), |
| BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0); |
| last_frame = machine_get_memory_size(); |
| end_frame = last_frame; |
| /* blacklist boot page table */ |
| frame_mark_unavailable(BOOT_PAGE_TABLE_START_FRAME, |
| BOOT_PAGE_TABLE_SIZE_IN_FRAMES); |
| /branches/dynload/kernel/arch/arm32/src/mm/page.c |
|---|
| 106,5 → 106,11 |
| return virtaddr; |
| } |
| void hw_area(uintptr_t *physaddr, pfn_t *frames) |
| { |
| *physaddr = end_frame; |
| *frames = ADDR2PFN(0xffffffff - end_frame); |
| } |
| /** @} |
| */ |
| /branches/dynload/kernel/arch/arm32/src/drivers/gxemul.c |
|---|
| 184,9 → 184,8 |
| /** Process keyboard interrupt. |
| * |
| * @param irq IRQ information. |
| * @param arg Not used. |
| */ |
| static void gxemul_irq_handler(irq_t *irq, void *arg, ...) |
| static void gxemul_irq_handler(irq_t *irq) |
| { |
| if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox)) { |
| ipc_irq_send_notif(irq); |
| 204,7 → 203,7 |
| } |
| } |
| static irq_ownership_t gxemul_claim(void) |
| static irq_ownership_t gxemul_claim(void *instance) |
| { |
| return IRQ_ACCEPT; |
| } |
| 266,7 → 265,7 |
| *((uint32_t*) gxemul_hw_map.rtc_freq) = frequency; |
| } |
| static irq_ownership_t gxemul_timer_claim(void) |
| static irq_ownership_t gxemul_timer_claim(void *instance) |
| { |
| return IRQ_ACCEPT; |
| } |
| 276,7 → 275,7 |
| * @param irq Interrupt information. |
| * @param arg Not used. |
| */ |
| static void gxemul_timer_irq_handler(irq_t *irq, void *arg, ...) |
| static void gxemul_timer_irq_handler(irq_t *irq) |
| { |
| /* |
| * We are holding a lock which prevents preemption. |
| 370,7 → 369,7 |
| irq_t *irq = irq_dispatch_and_lock(i); |
| if (irq) { |
| /* The IRQ handler was found. */ |
| irq->handler(irq, irq->arg); |
| irq->handler(irq); |
| spinlock_unlock(&irq->lock); |
| } else { |
| /* Spurious interrupt.*/ |
| /branches/dynload/kernel/arch/arm32/src/start.S |
|---|
| 40,30 → 40,12 |
| mrs r3, cpsr |
| bic r3, r3, #0x1f |
| orr r3, r3, #0x13 |
| msr cpsr_c, r3 |
| msr cpsr_c, r3 |
| ldr sp, =temp_stack |
| cmp r2, #0 |
| beq bootinfo_end |
| ldr r3, =bootinfo |
| bootinfo_loop: |
| ldr r4, [r1] |
| str r4, [r3] |
| add r1, r1, #4 |
| add r3, r3, #4 |
| add r2, r2, #-4 |
| cmp r2, #0 |
| bne bootinfo_loop |
| bootinfo_end: |
| bl arch_pre_main |
| bl main_bsp |
| .space TEMP_STACK_SIZE |
| 74,4 → 56,3 |
| supervisor_sp: |
| .space 4 |