devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Remove tabs

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24547 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2010-02-07 17:50:24 +00:00
parent cc572378fc
commit dfe46436b1
7 changed files with 232 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/midi/midiutil.h
View file

@ -41,7 +41,7 @@
#define MAX_VOICES 24 /* Note: 24 midi channels is the minimum general midi spec implementation */
#endif /* CPU_PP */
#else /* Simulator requires 44100Hz, and we can afford to use more voices */
#else /* Simulator requires 44100Hz, and we can afford to use more voices */
#define SAMPLE_RATE SAMPR_44
#define MAX_VOICES 48

2
bootloader/pb_vibe500.c
View file

@ -78,6 +78,6 @@ void main(void)
{
/* Power off bit */
if ((button_read_device()&BUTTON_POWER)!=0)
GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL,0x80);
GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL,0x80);
}
}

204
firmware/target/arm/memcpy-arm.S
View file

@ -44,133 +44,133 @@
.type memcpy,%function
memcpy:
stmfd sp!, {r0, r4, lr}
stmfd sp!, {r0, r4, lr}
subs r2, r2, #4
blt 8f
ands ip, r0, #3
bne 9f
ands ip, r1, #3
bne 10f
subs r2, r2, #4
blt 8f
ands ip, r0, #3
bne 9f
ands ip, r1, #3
bne 10f
1: subs r2, r2, #(28)
stmfd sp!, {r5 - r8}
blt 5f
1: subs r2, r2, #(28)
stmfd sp!, {r5 - r8}
blt 5f
2:
3:
4: ldmia r1!, {r3, r4, r5, r6, r7, r8, ip, lr}
subs r2, r2, #32
stmia r0!, {r3, r4, r5, r6, r7, r8, ip, lr}
bge 3b
4: ldmia r1!, {r3, r4, r5, r6, r7, r8, ip, lr}
subs r2, r2, #32
stmia r0!, {r3, r4, r5, r6, r7, r8, ip, lr}
bge 3b
5: ands ip, r2, #28
rsb ip, ip, #32
addne pc, pc, ip @ C is always clear here
b 7f
6: nop
ldr r3, [r1], #4
ldr r4, [r1], #4
ldr r5, [r1], #4
ldr r6, [r1], #4
ldr r7, [r1], #4
ldr r8, [r1], #4
ldr lr, [r1], #4
5: ands ip, r2, #28
rsb ip, ip, #32
addne pc, pc, ip @ C is always clear here
b 7f
6: nop
ldr r3, [r1], #4
ldr r4, [r1], #4
ldr r5, [r1], #4
ldr r6, [r1], #4
ldr r7, [r1], #4
ldr r8, [r1], #4
ldr lr, [r1], #4
add pc, pc, ip
nop
nop
str r3, [r0], #4
str r4, [r0], #4
str r5, [r0], #4
str r6, [r0], #4
str r7, [r0], #4
str r8, [r0], #4
str lr, [r0], #4
add pc, pc, ip
nop
nop
str r3, [r0], #4
str r4, [r0], #4
str r5, [r0], #4
str r6, [r0], #4
str r7, [r0], #4
str r8, [r0], #4
str lr, [r0], #4
7: ldmfd sp!, {r5 - r8}
7: ldmfd sp!, {r5 - r8}
8: movs r2, r2, lsl #31
ldrneb r3, [r1], #1
ldrcsb r4, [r1], #1
ldrcsb ip, [r1]
strneb r3, [r0], #1
strcsb r4, [r0], #1
strcsb ip, [r0]
8: movs r2, r2, lsl #31
ldrneb r3, [r1], #1
ldrcsb r4, [r1], #1
ldrcsb ip, [r1]
strneb r3, [r0], #1
strcsb r4, [r0], #1
strcsb ip, [r0]
ldmfd sp!, {r0, r4, pc}
ldmfd sp!, {r0, r4, pc}
9: rsb ip, ip, #4
cmp ip, #2
ldrgtb r3, [r1], #1
ldrgeb r4, [r1], #1
ldrb lr, [r1], #1
strgtb r3, [r0], #1
strgeb r4, [r0], #1
subs r2, r2, ip
strb lr, [r0], #1
blt 8b
ands ip, r1, #3
beq 1b
9: rsb ip, ip, #4
cmp ip, #2
ldrgtb r3, [r1], #1
ldrgeb r4, [r1], #1
ldrb lr, [r1], #1
strgtb r3, [r0], #1
strgeb r4, [r0], #1
subs r2, r2, ip
strb lr, [r0], #1
blt 8b
ands ip, r1, #3
beq 1b
10: bic r1, r1, #3
cmp ip, #2
ldr lr, [r1], #4
beq 17f
bgt 18f
10: bic r1, r1, #3
cmp ip, #2
ldr lr, [r1], #4
beq 17f
bgt 18f
.macro forward_copy_shift pull push
.macro forward_copy_shift pull push
subs r2, r2, #28
blt 14f
subs r2, r2, #28
blt 14f
11: stmfd sp!, {r5 - r9}
11: stmfd sp!, {r5 - r9}
12:
13: ldmia r1!, {r4, r5, r6, r7}
mov r3, lr, pull #\pull
subs r2, r2, #32
ldmia r1!, {r8, r9, ip, lr}
orr r3, r3, r4, push #\push
mov r4, r4, pull #\pull
orr r4, r4, r5, push #\push
mov r5, r5, pull #\pull
orr r5, r5, r6, push #\push
mov r6, r6, pull #\pull
orr r6, r6, r7, push #\push
mov r7, r7, pull #\pull
orr r7, r7, r8, push #\push
mov r8, r8, pull #\pull
orr r8, r8, r9, push #\push
mov r9, r9, pull #\pull
orr r9, r9, ip, push #\push
mov ip, ip, pull #\pull
orr ip, ip, lr, push #\push
stmia r0!, {r3, r4, r5, r6, r7, r8, r9, ip}
bge 12b
13: ldmia r1!, {r4, r5, r6, r7}
mov r3, lr, pull #\pull
subs r2, r2, #32
ldmia r1!, {r8, r9, ip, lr}
orr r3, r3, r4, push #\push
mov r4, r4, pull #\pull
orr r4, r4, r5, push #\push
mov r5, r5, pull #\pull
orr r5, r5, r6, push #\push
mov r6, r6, pull #\pull
orr r6, r6, r7, push #\push
mov r7, r7, pull #\pull
orr r7, r7, r8, push #\push
mov r8, r8, pull #\pull
orr r8, r8, r9, push #\push
mov r9, r9, pull #\pull
orr r9, r9, ip, push #\push
mov ip, ip, pull #\pull
orr ip, ip, lr, push #\push
stmia r0!, {r3, r4, r5, r6, r7, r8, r9, ip}
bge 12b
ldmfd sp!, {r5 - r9}
ldmfd sp!, {r5 - r9}
14: ands ip, r2, #28
beq 16f
14: ands ip, r2, #28
beq 16f
15: mov r3, lr, pull #\pull
ldr lr, [r1], #4
subs ip, ip, #4
orr r3, r3, lr, push #\push
str r3, [r0], #4
bgt 15b
15: mov r3, lr, pull #\pull
ldr lr, [r1], #4
subs ip, ip, #4
orr r3, r3, lr, push #\push
str r3, [r0], #4
bgt 15b
16: sub r1, r1, #(\push / 8)
b 8b
16: sub r1, r1, #(\push / 8)
b 8b
.endm
.endm
forward_copy_shift pull=8 push=24
forward_copy_shift pull=8 push=24
17: forward_copy_shift pull=16 push=16
17: forward_copy_shift pull=16 push=16
18: forward_copy_shift pull=24 push=8
18: forward_copy_shift pull=24 push=8

214
firmware/target/arm/memmove-arm.S
View file

@ -35,7 +35,7 @@
#define push lsr
#endif
.text
.text
/*
* Prototype: void *memmove(void *dest, const void *src, size_t n);
@ -54,137 +54,137 @@
memmove:
subs ip, r0, r1
cmphi r2, ip
bls memcpy
subs ip, r0, r1
cmphi r2, ip
bls memcpy
stmfd sp!, {r0, r4, lr}
add r1, r1, r2
add r0, r0, r2
subs r2, r2, #4
blt 8f
ands ip, r0, #3
bne 9f
ands ip, r1, #3
bne 10f
stmfd sp!, {r0, r4, lr}
add r1, r1, r2
add r0, r0, r2
subs r2, r2, #4
blt 8f
ands ip, r0, #3
bne 9f
ands ip, r1, #3
bne 10f
1: subs r2, r2, #(28)
stmfd sp!, {r5 - r8}
blt 5f
1: subs r2, r2, #(28)
stmfd sp!, {r5 - r8}
blt 5f
2:
3:
4: ldmdb r1!, {r3, r4, r5, r6, r7, r8, ip, lr}
subs r2, r2, #32
stmdb r0!, {r3, r4, r5, r6, r7, r8, ip, lr}
bge 3b
4: ldmdb r1!, {r3, r4, r5, r6, r7, r8, ip, lr}
subs r2, r2, #32
stmdb r0!, {r3, r4, r5, r6, r7, r8, ip, lr}
bge 3b
5: ands ip, r2, #28
rsb ip, ip, #32
addne pc, pc, ip @ C is always clear here
b 7f
6: nop
ldr r3, [r1, #-4]!
ldr r4, [r1, #-4]!
ldr r5, [r1, #-4]!
ldr r6, [r1, #-4]!
ldr r7, [r1, #-4]!
ldr r8, [r1, #-4]!
ldr lr, [r1, #-4]!
5: ands ip, r2, #28
rsb ip, ip, #32
addne pc, pc, ip @ C is always clear here
b 7f
6: nop
ldr r3, [r1, #-4]!
ldr r4, [r1, #-4]!
ldr r5, [r1, #-4]!
ldr r6, [r1, #-4]!
ldr r7, [r1, #-4]!
ldr r8, [r1, #-4]!
ldr lr, [r1, #-4]!
add pc, pc, ip
nop
nop
str r3, [r0, #-4]!
str r4, [r0, #-4]!
str r5, [r0, #-4]!
str r6, [r0, #-4]!
str r7, [r0, #-4]!
str r8, [r0, #-4]!
str lr, [r0, #-4]!
add pc, pc, ip
nop
nop
str r3, [r0, #-4]!
str r4, [r0, #-4]!
str r5, [r0, #-4]!
str r6, [r0, #-4]!
str r7, [r0, #-4]!
str r8, [r0, #-4]!
str lr, [r0, #-4]!
7: ldmfd sp!, {r5 - r8}
7: ldmfd sp!, {r5 - r8}
8: movs r2, r2, lsl #31
ldrneb r3, [r1, #-1]!
ldrcsb r4, [r1, #-1]!
ldrcsb ip, [r1, #-1]
strneb r3, [r0, #-1]!
strcsb r4, [r0, #-1]!
strcsb ip, [r0, #-1]
ldmfd sp!, {r0, r4, pc}
8: movs r2, r2, lsl #31
ldrneb r3, [r1, #-1]!
ldrcsb r4, [r1, #-1]!
ldrcsb ip, [r1, #-1]
strneb r3, [r0, #-1]!
strcsb r4, [r0, #-1]!
strcsb ip, [r0, #-1]
ldmfd sp!, {r0, r4, pc}
9: cmp ip, #2
ldrgtb r3, [r1, #-1]!
ldrgeb r4, [r1, #-1]!
ldrb lr, [r1, #-1]!
strgtb r3, [r0, #-1]!
strgeb r4, [r0, #-1]!
subs r2, r2, ip
strb lr, [r0, #-1]!
blt 8b
ands ip, r1, #3
beq 1b
9: cmp ip, #2
ldrgtb r3, [r1, #-1]!
ldrgeb r4, [r1, #-1]!
ldrb lr, [r1, #-1]!
strgtb r3, [r0, #-1]!
strgeb r4, [r0, #-1]!
subs r2, r2, ip
strb lr, [r0, #-1]!
blt 8b
ands ip, r1, #3
beq 1b
10: bic r1, r1, #3
cmp ip, #2
ldr r3, [r1, #0]
beq 17f
blt 18f
10: bic r1, r1, #3
cmp ip, #2
ldr r3, [r1, #0]
beq 17f
blt 18f
.macro backward_copy_shift push pull
.macro backward_copy_shift push pull
subs r2, r2, #28
blt 14f
subs r2, r2, #28
blt 14f
11: stmfd sp!, {r5 - r9}
11: stmfd sp!, {r5 - r9}
12:
13: ldmdb r1!, {r7, r8, r9, ip}
mov lr, r3, push #\push
subs r2, r2, #32
ldmdb r1!, {r3, r4, r5, r6}
orr lr, lr, ip, pull #\pull
mov ip, ip, push #\push
orr ip, ip, r9, pull #\pull
mov r9, r9, push #\push
orr r9, r9, r8, pull #\pull
mov r8, r8, push #\push
orr r8, r8, r7, pull #\pull
mov r7, r7, push #\push
orr r7, r7, r6, pull #\pull
mov r6, r6, push #\push
orr r6, r6, r5, pull #\pull
mov r5, r5, push #\push
orr r5, r5, r4, pull #\pull
mov r4, r4, push #\push
orr r4, r4, r3, pull #\pull
stmdb r0!, {r4 - r9, ip, lr}
bge 12b
13: ldmdb r1!, {r7, r8, r9, ip}
mov lr, r3, push #\push
subs r2, r2, #32
ldmdb r1!, {r3, r4, r5, r6}
orr lr, lr, ip, pull #\pull
mov ip, ip, push #\push
orr ip, ip, r9, pull #\pull
mov r9, r9, push #\push
orr r9, r9, r8, pull #\pull
mov r8, r8, push #\push
orr r8, r8, r7, pull #\pull
mov r7, r7, push #\push
orr r7, r7, r6, pull #\pull
mov r6, r6, push #\push
orr r6, r6, r5, pull #\pull
mov r5, r5, push #\push
orr r5, r5, r4, pull #\pull
mov r4, r4, push #\push
orr r4, r4, r3, pull #\pull
stmdb r0!, {r4 - r9, ip, lr}
bge 12b
ldmfd sp!, {r5 - r9}
ldmfd sp!, {r5 - r9}
14: ands ip, r2, #28
beq 16f
14: ands ip, r2, #28
beq 16f
15: mov lr, r3, push #\push
ldr r3, [r1, #-4]!
subs ip, ip, #4
orr lr, lr, r3, pull #\pull
str lr, [r0, #-4]!
bgt 15b
15: mov lr, r3, push #\push
ldr r3, [r1, #-4]!
subs ip, ip, #4
orr lr, lr, r3, pull #\pull
str lr, [r0, #-4]!
bgt 15b
16: add r1, r1, #(\pull / 8)
b 8b
16: add r1, r1, #(\pull / 8)
b 8b
.endm
.endm
backward_copy_shift push=8 pull=24
backward_copy_shift push=8 pull=24
17: backward_copy_shift push=16 pull=16
17: backward_copy_shift push=16 pull=16
18: backward_copy_shift push=24 pull=8
18: backward_copy_shift push=24 pull=8

22
firmware/target/arm/pbell/vibe500/button-vibe500.c
View file

@ -63,12 +63,12 @@ void button_int(void)
val = ((data[1] >> 4) << 8) | data[2]; /* position */
if (val > 0)
{
int scr_pos = val >> 8; /* split the scrollstrip into 16 regions */
if ((old_pos<scr_pos)&&(old_pos!=-1)) int_btn = BUTTON_DOWN;
if ((old_pos>scr_pos)&&(old_pos!=-1)) int_btn = BUTTON_UP;
old_pos = scr_pos;
}
{
int scr_pos = val >> 8; /* split the scrollstrip into 16 regions */
if ((old_pos<scr_pos)&&(old_pos!=-1)) int_btn = BUTTON_DOWN;
if ((old_pos>scr_pos)&&(old_pos!=-1)) int_btn = BUTTON_UP;
old_pos = scr_pos;
}
else old_pos=-1;
}
}
@ -94,13 +94,13 @@ int button_read_device(void)
if (!hold_button)
{
/* Read Record, OK, C */
state = GPIOA_INPUT_VAL;
if ((state & 0x01)==0) buttons|=BUTTON_REC;
if ((state & 0x40)==0) buttons|=BUTTON_OK;
if ((state & 0x08)==0) buttons|=BUTTON_CANCEL;
state = GPIOA_INPUT_VAL;
if ((state & 0x01)==0) buttons|=BUTTON_REC;
if ((state & 0x40)==0) buttons|=BUTTON_OK;
if ((state & 0x08)==0) buttons|=BUTTON_CANCEL;
/* Read POWER button */
if ((GPIOD_INPUT_VAL & 0x40)==0) buttons|=BUTTON_POWER;
if ((GPIOD_INPUT_VAL & 0x40)==0) buttons|=BUTTON_POWER;
}
else return BUTTON_NONE;
return buttons;

4
firmware/target/arm/tcc77x/crt0.S
View file

@ -48,8 +48,8 @@ start:
The following two values are filled in by mktccboot.
*/
of_entrypoint: .word 0 /* Saved entrypoint of original firmware*/
bl_entrypoint: .word 0 /* Location in RAM of the start of our bootloader */
of_entrypoint: .word 0 /* Saved entrypoint of original firmware*/
bl_entrypoint: .word 0 /* Location in RAM of the start of our bootloader */
#else
// ldr pc, =start_loc /* jump to the main entry point */

14
firmware/target/arm/tms320dm320/crt0.S
View file

@ -120,13 +120,13 @@ start_loc:
/* Exception handlers. Will be copied to address 0 after memory remapping */
.section .vectors,"aw"
b start
b undef_instr_handler
b software_int_handler
b prefetch_abort_handler
b data_abort_handler
b reserved_handler
b irq_handler
b start
b undef_instr_handler
b software_int_handler
b prefetch_abort_handler
b data_abort_handler
b reserved_handler
b irq_handler
b fiq_handler
.text