| /branches/arm/kernel/arch/arm32/include/interrupt.h |
|---|
| 27,7 → 27,6 |
| */ |
| /** @addtogroup arm32interrupt |
| * @ingroup interrupt |
| * @{ |
| */ |
| /** @file |
| /branches/arm/kernel/arch/arm32/include/machine.h |
|---|
| 48,6 → 48,7 |
| extern void machine_debug_putc(char ch); |
| extern void machine_cpu_halt(void); |
| extern void machine_irq_exception(int exc_no, istate_t *istate); |
| extern uintptr_t machine_get_fb_address(void); |
| #endif |
| /branches/arm/kernel/arch/arm32/include/atomic.h |
|---|
| 26,7 → 26,7 |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup libcarm32 |
| /** @addtogroup arm32 |
| * @{ |
| */ |
| /** @file |
| /branches/arm/kernel/arch/arm32/Makefile.inc |
|---|
| 36,14 → 36,14 |
| TARGET = arm-linux-gnu |
| TOOLCHAIN_DIR = /usr/local/arm |
| KERNEL_LOAD_ADDRESS = 0x80200000 |
| KERNEL_LOAD_ADDRESS = 0x80150000 |
| CFLAGS += -fno-zero-initialized-in-bss |
| DEFS += -D__32_BITS__ -DKERNEL_LOAD_ADDRESS=$(KERNEL_LOAD_ADDRESS) |
| CONFIG_FB = y |
| DEFS += -DCONFIG_FB |
| #CONFIG_FB = y |
| #DEFS += -DCONFIG_FB |
| ## Compile with hierarchical page tables support. |
| # |
| /branches/arm/kernel/arch/arm32/src/exception.c |
|---|
| 259,8 → 259,10 |
| */ |
| static void swi_exception(int exc_no, istate_t *istate) |
| { |
| /* |
| dprintf("SYSCALL: r0-r4: %x, %x, %x, %x, %x; pc: %x\n", istate->r0, |
| istate->r1, istate->r2, istate->r3, istate->r4, istate->pc); |
| */ |
| istate->r0 = syscall_handler( |
| istate->r0, |
| /branches/arm/kernel/arch/arm32/src/arm32.c |
|---|
| 87,6 → 87,10 |
| interrupt_init(); |
| console_init(device_assign_devno()); |
| //#ifdef CONFIG_FB |
| // fb_init(machine_get_fb_address(), 640, 480, 1920, VISUAL_RGB_8_8_8); |
| //#endif |
| } |
| /branches/arm/kernel/arch/arm32/src/mm/page_fault.c |
|---|
| 132,7 → 132,7 |
| * \param badvaddr Virtual address the instruction tries to access |
| * |
| * \return Type of access into memmory |
| * \note Returns #PF_ACESS_EXEC if no memory access is requested |
| * \note Returns #PF_ACCESS_EXEC if no memory access is requested |
| */ |
| static pf_access_t get_memory_access_type(uint32_t instr_addr, uintptr_t badvaddr) |
| { |
| /branches/arm/kernel/arch/arm32/src/interrupt.c |
|---|
| 73,6 → 73,11 |
| */ |
| void interrupts_restore(ipl_t ipl) |
| { |
| /* |
| current_status_reg_control_write( (current_status_reg_read() & |
| ~STATUS_REG_IRQ_DISABLED_BIT) | (ipl & STATUS_REG_IRQ_DISABLED_BIT) ); |
| */ |
| current_status_reg_control_write(current_status_reg_read() | |
| (ipl & STATUS_REG_IRQ_DISABLED_BIT)); |
| } |