voron

experimental ARM OS
git clone git://git.2f30.org/voron
Log | Files | Refs | README | LICENSE

commit 08b060601c2460d88aef8e70a1a03e8a556bf2ca
parent 1fbede960642ab3f693347e76d98350994654dcc
Author: sin <sin@2f30.org>
Date:   Thu, 18 Jul 2013 16:35:16 +0100

Fix vertical spacing

Diffstat:
Minclude/mmu.h | 1-
Minclude/sched.h | 1-
Minclude/stddef.h | 1-
Mkernel/dmtimer.c | 4----
Mkernel/interrupts.S | 8--------
Mkernel/syscalls.c | 1-
6 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/include/mmu.h b/include/mmu.h @@ -21,7 +21,6 @@ #define PT_AP1 (1 << 5) #define PT_AP2 (1 << 9) - /* MMU access permissions * MMU_AP_X_Y * X = access permissions for PL1 or higher diff --git a/include/sched.h b/include/sched.h @@ -21,7 +21,6 @@ typedef enum { SLEEPR_SUSPEND } sleep_reason_t; - struct task_struct { pid_t pid; task_state_t state; diff --git a/include/stddef.h b/include/stddef.h @@ -10,7 +10,6 @@ enum { true = 1 }; - #define offsetof(type, member) ((uintptr_t)&((type*)0)->member) #endif /* __STDDEF_H */ diff --git a/kernel/dmtimer.c b/kernel/dmtimer.c @@ -35,7 +35,6 @@ struct dm_gpt_1ms { u32 towr; }; - #define DMT_TIOCP_SOFTRESET (1<<0) #define DMT_TIOCP_SMARTIDLE (2<<2) @@ -63,7 +62,6 @@ struct dm_gpt { u32 tcar2; }; - #define DMT_1MS (1<<0) #define CM2_CLKSEL (1<<24) @@ -94,8 +92,6 @@ struct dmtimer { { 0, NULL, { .mem = (u32*)0x48088000 }, (u32*)0x4a009430 } /* GPTIMER11 */ }; - - static void dmtimer_irq_callback(u32 irq_num, struct regs *regs) { diff --git a/kernel/interrupts.S b/kernel/interrupts.S @@ -12,7 +12,6 @@ vector_table_init: bx lr - .balign 32 @ the 5 least-significant bits of VBAR are reserved (i.e. 32 bytes alignment) vector_table: ldr pc, =reset @@ -25,7 +24,6 @@ vector_table: ldr pc, =fiq_ex .ltorg - @@ save all the registers .macro SAVE_ALL_EX sub sp, sp, #4 @ make space for cpsr variable (cpsr of the previous mode) @@ -68,7 +66,6 @@ vector_table: add sp, sp, #4 @ release the space we had for cpsr variable .endm - reset: b . @@ -76,7 +73,6 @@ reset: undefined_insn: movs pc, lr - /* system call number is the swi number * if system call takes less than 7 arguments * we use r0 until r5 from userland to pass them @@ -101,7 +97,6 @@ swi_ex: msr spsr, r6 ldmfd sp!, { r6 - r12, pc }^ - prefetch_abort: @@ save registers SAVE_ALL_EX @@ -116,7 +111,6 @@ prefetch_abort: b . @ freeze @subs pc, lr, #4 - data_abort: @@ save registers SAVE_ALL_EX @@ -131,7 +125,6 @@ data_abort: b . @ freeze @subs pc, lr, #8 - irq_ex: @@ save registers SAVE_ALL_EX @@ -143,7 +136,6 @@ irq_ex: @@ exit exception subs pc, lr, #4 - fiq_ex: sub lr, lr, #4 str lr, [sp, #-4]! diff --git a/kernel/syscalls.c b/kernel/syscalls.c @@ -7,7 +7,6 @@ sys_test_6_args(u32 a1, u32 a2, u32 a3, u32 a4, u32 a5, u32 a6) return 0; } - struct __test_7_args { u32 a1; u32 a2;