summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-02-07 17:50:24 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-02-07 17:50:24 +0000
commitdfe46436b11c388c2423c3aae9f9e41f30df45f5 (patch)
tree074cbc29c053f89808f0a3053ef0edfa70335a98
parentcc572378fc76cb9d78160c2ffeafb1e7b867c88a (diff)
downloadrockbox-dfe46436b11c388c2423c3aae9f9e41f30df45f5.tar.gz
rockbox-dfe46436b11c388c2423c3aae9f9e41f30df45f5.zip
Remove tabs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24547 a1c6a512-1295-4272-9138-f99709370657
Diffstat
-rw-r--r--apps/plugins/midi/midiutil.h2
-rw-r--r--bootloader/pb_vibe500.c2
-rw-r--r--firmware/target/arm/memcpy-arm.S244
-rw-r--r--firmware/target/arm/memmove-arm.S252
-rw-r--r--firmware/target/arm/pbell/vibe500/button-vibe500.c22
-rw-r--r--firmware/target/arm/tcc77x/crt0.S6
-rw-r--r--firmware/target/arm/tms320dm320/crt0.S14
7 files changed, 271 insertions, 271 deletions
diff --git a/apps/plugins/midi/midiutil.h b/apps/plugins/midi/midiutil.h
index ba64a00e28..f984e71aff 100644
--- a/apps/plugins/midi/midiutil.h
+++ b/apps/plugins/midi/midiutil.h
@@ -41,7 +41,7 @@
41#define MAX_VOICES 24 /* Note: 24 midi channels is the minimum general midi spec implementation */ 41#define MAX_VOICES 24 /* Note: 24 midi channels is the minimum general midi spec implementation */
42#endif /* CPU_PP */ 42#endif /* CPU_PP */
43 43
44#else /* Simulator requires 44100Hz, and we can afford to use more voices */ 44#else /* Simulator requires 44100Hz, and we can afford to use more voices */
45 45
46#define SAMPLE_RATE SAMPR_44 46#define SAMPLE_RATE SAMPR_44
47#define MAX_VOICES 48 47#define MAX_VOICES 48
diff --git a/bootloader/pb_vibe500.c b/bootloader/pb_vibe500.c
index 70da0d32cc..d9259d43cc 100644
--- a/bootloader/pb_vibe500.c
+++ b/bootloader/pb_vibe500.c
@@ -78,6 +78,6 @@ void main(void)
78 { 78 {
79 /* Power off bit */ 79 /* Power off bit */
80 if ((button_read_device()&BUTTON_POWER)!=0) 80 if ((button_read_device()&BUTTON_POWER)!=0)
81 GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL,0x80); 81 GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL,0x80);
82 } 82 }
83} 83}
diff --git a/firmware/target/arm/memcpy-arm.S b/firmware/target/arm/memcpy-arm.S
index 38e0076703..d17d659a28 100644
--- a/firmware/target/arm/memcpy-arm.S
+++ b/firmware/target/arm/memcpy-arm.S
@@ -44,133 +44,133 @@
44 .type memcpy,%function 44 .type memcpy,%function
45 45
46memcpy: 46memcpy:
47 stmfd sp!, {r0, r4, lr} 47 stmfd sp!, {r0, r4, lr}
48 48
49 subs r2, r2, #4 49 subs r2, r2, #4
50 blt 8f 50 blt 8f
51 ands ip, r0, #3 51 ands ip, r0, #3
52 bne 9f 52 bne 9f
53 ands ip, r1, #3 53 ands ip, r1, #3
54 bne 10f 54 bne 10f
55 55
561: subs r2, r2, #(28) 561: subs r2, r2, #(28)
57 stmfd sp!, {r5 - r8} 57 stmfd sp!, {r5 - r8}
58 blt 5f 58 blt 5f
59 59
602: 602:
613: 613:
624: ldmia r1!, {r3, r4, r5, r6, r7, r8, ip, lr} 624: ldmia r1!, {r3, r4, r5, r6, r7, r8, ip, lr}
63 subs r2, r2, #32 63 subs r2, r2, #32
64 stmia r0!, {r3, r4, r5, r6, r7, r8, ip, lr} 64 stmia r0!, {r3, r4, r5, r6, r7, r8, ip, lr}
65 bge 3b 65 bge 3b
66 66
675: ands ip, r2, #28 675: ands ip, r2, #28
68 rsb ip, ip, #32 68 rsb ip, ip, #32
69 addne pc, pc, ip @ C is always clear here 69 addne pc, pc, ip @ C is always clear here
70 b 7f 70 b 7f
716: nop 716: nop
72 ldr r3, [r1], #4 72 ldr r3, [r1], #4
73 ldr r4, [r1], #4 73 ldr r4, [r1], #4
74 ldr r5, [r1], #4 74 ldr r5, [r1], #4
75 ldr r6, [r1], #4 75 ldr r6, [r1], #4
76 ldr r7, [r1], #4 76 ldr r7, [r1], #4
77 ldr r8, [r1], #4 77 ldr r8, [r1], #4
78 ldr lr, [r1], #4 78 ldr lr, [r1], #4
79 79
80 add pc, pc, ip 80 add pc, pc, ip
81 nop 81 nop
82 nop 82 nop
83 str r3, [r0], #4 83 str r3, [r0], #4
84 str r4, [r0], #4 84 str r4, [r0], #4
85 str r5, [r0], #4 85 str r5, [r0], #4
86 str r6, [r0], #4 86 str r6, [r0], #4
87 str r7, [r0], #4 87 str r7, [r0], #4
88 str r8, [r0], #4 88 str r8, [r0], #4
89 str lr, [r0], #4 89 str lr, [r0], #4
90 90
917: ldmfd sp!, {r5 - r8} 917: ldmfd sp!, {r5 - r8}
92 92
938: movs r2, r2, lsl #31 938: movs r2, r2, lsl #31
94 ldrneb r3, [r1], #1 94 ldrneb r3, [r1], #1
95 ldrcsb r4, [r1], #1 95 ldrcsb r4, [r1], #1
96 ldrcsb ip, [r1] 96 ldrcsb ip, [r1]
97 strneb r3, [r0], #1 97 strneb r3, [r0], #1
98 strcsb r4, [r0], #1 98 strcsb r4, [r0], #1
99 strcsb ip, [r0] 99 strcsb ip, [r0]
100 100
101 ldmfd sp!, {r0, r4, pc} 101 ldmfd sp!, {r0, r4, pc}
102 102
1039: rsb ip, ip, #4 1039: rsb ip, ip, #4
104 cmp ip, #2 104 cmp ip, #2
105 ldrgtb r3, [r1], #1 105 ldrgtb r3, [r1], #1
106 ldrgeb r4, [r1], #1 106 ldrgeb r4, [r1], #1
107 ldrb lr, [r1], #1 107 ldrb lr, [r1], #1
108 strgtb r3, [r0], #1 108 strgtb r3, [r0], #1
109 strgeb r4, [r0], #1 109 strgeb r4, [r0], #1
110 subs r2, r2, ip 110 subs r2, r2, ip
111 strb lr, [r0], #1 111 strb lr, [r0], #1
112 blt 8b 112 blt 8b
113 ands ip, r1, #3 113 ands ip, r1, #3
114 beq 1b 114 beq 1b
115 115
11610: bic r1, r1, #3 11610: bic r1, r1, #3
117 cmp ip, #2 117 cmp ip, #2
118 ldr lr, [r1], #4 118 ldr lr, [r1], #4
119 beq 17f 119 beq 17f
120 bgt 18f 120 bgt 18f
121 121
122 122
123 .macro forward_copy_shift pull push 123 .macro forward_copy_shift pull push
124 124
125 subs r2, r2, #28 125 subs r2, r2, #28
126 blt 14f 126 blt 14f
127 127
12811: stmfd sp!, {r5 - r9} 12811: stmfd sp!, {r5 - r9}
129 129
13012: 13012:
13113: ldmia r1!, {r4, r5, r6, r7} 13113: ldmia r1!, {r4, r5, r6, r7}
132 mov r3, lr, pull #\pull 132 mov r3, lr, pull #\pull
133 subs r2, r2, #32 133 subs r2, r2, #32
134 ldmia r1!, {r8, r9, ip, lr} 134 ldmia r1!, {r8, r9, ip, lr}
135 orr r3, r3, r4, push #\push 135 orr r3, r3, r4, push #\push
136 mov r4, r4, pull #\pull 136 mov r4, r4, pull #\pull
137 orr r4, r4, r5, push #\push 137 orr r4, r4, r5, push #\push
138 mov r5, r5, pull #\pull 138 mov r5, r5, pull #\pull
139 orr r5, r5, r6, push #\push 139 orr r5, r5, r6, push #\push
140 mov r6, r6, pull #\pull 140 mov r6, r6, pull #\pull
141 orr r6, r6, r7, push #\push 141 orr r6, r6, r7, push #\push
142 mov r7, r7, pull #\pull 142 mov r7, r7, pull #\pull
143 orr r7, r7, r8, push #\push 143 orr r7, r7, r8, push #\push
144 mov r8, r8, pull #\pull 144 mov r8, r8, pull #\pull
145 orr r8, r8, r9, push #\push 145 orr r8, r8, r9, push #\push
146 mov r9, r9, pull #\pull 146 mov r9, r9, pull #\pull
147 orr r9, r9, ip, push #\push 147 orr r9, r9, ip, push #\push
148 mov ip, ip, pull #\pull 148 mov ip, ip, pull #\pull
149 orr ip, ip, lr, push #\push 149 orr ip, ip, lr, push #\push
150 stmia r0!, {r3, r4, r5, r6, r7, r8, r9, ip} 150 stmia r0!, {r3, r4, r5, r6, r7, r8, r9, ip}
151 bge 12b 151 bge 12b
152 152
153 ldmfd sp!, {r5 - r9} 153 ldmfd sp!, {r5 - r9}
154 154
15514: ands ip, r2, #28 15514: ands ip, r2, #28
156 beq 16f 156 beq 16f
157 157
15815: mov r3, lr, pull #\pull 15815: mov r3, lr, pull #\pull
159 ldr lr, [r1], #4 159 ldr lr, [r1], #4
160 subs ip, ip, #4 160 subs ip, ip, #4
161 orr r3, r3, lr, push #\push 161 orr r3, r3, lr, push #\push
162 str r3, [r0], #4 162 str r3, [r0], #4
163 bgt 15b 163 bgt 15b
164 164
16516: sub r1, r1, #(\push / 8) 16516: sub r1, r1, #(\push / 8)
166 b 8b 166 b 8b
167 167
168 .endm 168 .endm
169 169
170 170
171 forward_copy_shift pull=8 push=24 171 forward_copy_shift pull=8 push=24
172 172
17317: forward_copy_shift pull=16 push=16 17317: forward_copy_shift pull=16 push=16
174 174
17518: forward_copy_shift pull=24 push=8 17518: forward_copy_shift pull=24 push=8
176 176
diff --git a/firmware/target/arm/memmove-arm.S b/firmware/target/arm/memmove-arm.S
index d00854439b..ce056d956b 100644
--- a/firmware/target/arm/memmove-arm.S
+++ b/firmware/target/arm/memmove-arm.S
@@ -35,7 +35,7 @@
35#define push lsr 35#define push lsr
36#endif 36#endif
37 37
38 .text 38 .text
39 39
40/* 40/*
41 * Prototype: void *memmove(void *dest, const void *src, size_t n); 41 * Prototype: void *memmove(void *dest, const void *src, size_t n);
@@ -54,137 +54,137 @@
54 54
55memmove: 55memmove:
56 56
57 subs ip, r0, r1 57 subs ip, r0, r1
58 cmphi r2, ip 58 cmphi r2, ip
59 bls memcpy 59 bls memcpy
60 60
61 stmfd sp!, {r0, r4, lr} 61 stmfd sp!, {r0, r4, lr}
62 add r1, r1, r2 62 add r1, r1, r2
63 add r0, r0, r2 63 add r0, r0, r2
64 subs r2, r2, #4 64 subs r2, r2, #4
65 blt 8f 65 blt 8f
66 ands ip, r0, #3 66 ands ip, r0, #3
67 bne 9f 67 bne 9f
68 ands ip, r1, #3 68 ands ip, r1, #3
69 bne 10f 69 bne 10f
70 70
711: subs r2, r2, #(28) 711: subs r2, r2, #(28)
72 stmfd sp!, {r5 - r8} 72 stmfd sp!, {r5 - r8}
73 blt 5f 73 blt 5f
74 74
752: 752:
763: 763:
774: ldmdb r1!, {r3, r4, r5, r6, r7, r8, ip, lr} 774: ldmdb r1!, {r3, r4, r5, r6, r7, r8, ip, lr}
78 subs r2, r2, #32 78 subs r2, r2, #32
79 stmdb r0!, {r3, r4, r5, r6, r7, r8, ip, lr} 79 stmdb r0!, {r3, r4, r5, r6, r7, r8, ip, lr}
80 bge 3b 80 bge 3b
81 81
825: ands ip, r2, #28 825: ands ip, r2, #28
83 rsb ip, ip, #32 83 rsb ip, ip, #32
84 addne pc, pc, ip @ C is always clear here 84 addne pc, pc, ip @ C is always clear here
85 b 7f 85 b 7f
866: nop 866: nop
87 ldr r3, [r1, #-4]! 87 ldr r3, [r1, #-4]!
88 ldr r4, [r1, #-4]! 88 ldr r4, [r1, #-4]!
89 ldr r5, [r1, #-4]! 89 ldr r5, [r1, #-4]!
90 ldr r6, [r1, #-4]! 90 ldr r6, [r1, #-4]!
91 ldr r7, [r1, #-4]! 91 ldr r7, [r1, #-4]!
92 ldr r8, [r1, #-4]! 92 ldr r8, [r1, #-4]!
93 ldr lr, [r1, #-4]! 93 ldr lr, [r1, #-4]!
94 94
95 add pc, pc, ip 95 add pc, pc, ip
96 nop 96 nop
97 nop 97 nop
98 str r3, [r0, #-4]! 98 str r3, [r0, #-4]!
99 str r4, [r0, #-4]! 99 str r4, [r0, #-4]!
100 str r5, [r0, #-4]! 100 str r5, [r0, #-4]!
101 str r6, [r0, #-4]! 101 str r6, [r0, #-4]!
102 str r7, [r0, #-4]! 102 str r7, [r0, #-4]!
103 str r8, [r0, #-4]! 103 str r8, [r0, #-4]!
104 str lr, [r0, #-4]! 104 str lr, [r0, #-4]!
105 105
1067: ldmfd sp!, {r5 - r8} 1067: ldmfd sp!, {r5 - r8}
107 107
1088: movs r2, r2, lsl #31 1088: movs r2, r2, lsl #31
109 ldrneb r3, [r1, #-1]! 109 ldrneb r3, [r1, #-1]!
110 ldrcsb r4, [r1, #-1]! 110 ldrcsb r4, [r1, #-1]!
111 ldrcsb ip, [r1, #-1] 111 ldrcsb ip, [r1, #-1]
112 strneb r3, [r0, #-1]! 112 strneb r3, [r0, #-1]!
113 strcsb r4, [r0, #-1]! 113 strcsb r4, [r0, #-1]!
114 strcsb ip, [r0, #-1] 114 strcsb ip, [r0, #-1]
115 ldmfd sp!, {r0, r4, pc} 115 ldmfd sp!, {r0, r4, pc}
116 116
1179: cmp ip, #2 1179: cmp ip, #2
118 ldrgtb r3, [r1, #-1]! 118 ldrgtb r3, [r1, #-1]!
119 ldrgeb r4, [r1, #-1]! 119 ldrgeb r4, [r1, #-1]!
120 ldrb lr, [r1, #-1]! 120 ldrb lr, [r1, #-1]!
121 strgtb r3, [r0, #-1]! 121 strgtb r3, [r0, #-1]!
122 strgeb r4, [r0, #-1]! 122 strgeb r4, [r0, #-1]!
123 subs r2, r2, ip 123 subs r2, r2, ip
124 strb lr, [r0, #-1]! 124 strb lr, [r0, #-1]!
125 blt 8b 125 blt 8b
126 ands ip, r1, #3 126 ands ip, r1, #3
127 beq 1b 127 beq 1b
128 128
12910: bic r1, r1, #3 12910: bic r1, r1, #3
130 cmp ip, #2 130 cmp ip, #2
131 ldr r3, [r1, #0] 131 ldr r3, [r1, #0]
132 beq 17f 132 beq 17f
133 blt 18f 133 blt 18f
134 134
135 135
136 .macro backward_copy_shift push pull 136 .macro backward_copy_shift push pull
137 137
138 subs r2, r2, #28 138 subs r2, r2, #28
139 blt 14f 139 blt 14f
140 140
14111: stmfd sp!, {r5 - r9} 14111: stmfd sp!, {r5 - r9}
142 142
14312: 14312:
14413: ldmdb r1!, {r7, r8, r9, ip} 14413: ldmdb r1!, {r7, r8, r9, ip}
145 mov lr, r3, push #\push 145 mov lr, r3, push #\push
146 subs r2, r2, #32 146 subs r2, r2, #32
147 ldmdb r1!, {r3, r4, r5, r6} 147 ldmdb r1!, {r3, r4, r5, r6}
148 orr lr, lr, ip, pull #\pull 148 orr lr, lr, ip, pull #\pull
149 mov ip, ip, push #\push 149 mov ip, ip, push #\push
150 orr ip, ip, r9, pull #\pull 150 orr ip, ip, r9, pull #\pull
151 mov r9, r9, push #\push 151 mov r9, r9, push #\push
152 orr r9, r9, r8, pull #\pull 152 orr r9, r9, r8, pull #\pull
153 mov r8, r8, push #\push 153 mov r8, r8, push #\push
154 orr r8, r8, r7, pull #\pull 154 orr r8, r8, r7, pull #\pull
155 mov r7, r7, push #\push 155 mov r7, r7, push #\push
156 orr r7, r7, r6, pull #\pull 156 orr r7, r7, r6, pull #\pull
157 mov r6, r6, push #\push 157 mov r6, r6, push #\push
158 orr r6, r6, r5, pull #\pull 158 orr r6, r6, r5, pull #\pull
159 mov r5, r5, push #\push 159 mov r5, r5, push #\push
160 orr r5, r5, r4, pull #\pull 160 orr r5, r5, r4, pull #\pull
161 mov r4, r4, push #\push 161 mov r4, r4, push #\push
162 orr r4, r4, r3, pull #\pull 162 orr r4, r4, r3, pull #\pull
163 stmdb r0!, {r4 - r9, ip, lr} 163 stmdb r0!, {r4 - r9, ip, lr}
164 bge 12b 164 bge 12b
165 165
166 ldmfd sp!, {r5 - r9} 166 ldmfd sp!, {r5 - r9}
167 167
16814: ands ip, r2, #28 16814: ands ip, r2, #28
169 beq 16f 169 beq 16f
170 170
17115: mov lr, r3, push #\push 17115: mov lr, r3, push #\push
172 ldr r3, [r1, #-4]! 172 ldr r3, [r1, #-4]!
173 subs ip, ip, #4 173 subs ip, ip, #4
174 orr lr, lr, r3, pull #\pull 174 orr lr, lr, r3, pull #\pull
175 str lr, [r0, #-4]! 175 str lr, [r0, #-4]!
176 bgt 15b 176 bgt 15b
177 177
17816: add r1, r1, #(\pull / 8) 17816: add r1, r1, #(\pull / 8)
179 b 8b 179 b 8b
180 180
181 .endm 181 .endm
182 182
183 183
184 backward_copy_shift push=8 pull=24 184 backward_copy_shift push=8 pull=24
185 185
18617: backward_copy_shift push=16 pull=16 18617: backward_copy_shift push=16 pull=16
187 187
18818: backward_copy_shift push=24 pull=8 18818: backward_copy_shift push=24 pull=8
189 189
190 190
diff --git a/firmware/target/arm/pbell/vibe500/button-vibe500.c b/firmware/target/arm/pbell/vibe500/button-vibe500.c
index c95e996ef8..7beaeeba81 100644
--- a/firmware/target/arm/pbell/vibe500/button-vibe500.c
+++ b/firmware/target/arm/pbell/vibe500/button-vibe500.c
@@ -63,12 +63,12 @@ void button_int(void)
63 val = ((data[1] >> 4) << 8) | data[2]; /* position */ 63 val = ((data[1] >> 4) << 8) | data[2]; /* position */
64 64
65 if (val > 0) 65 if (val > 0)
66 { 66 {
67 int scr_pos = val >> 8; /* split the scrollstrip into 16 regions */ 67 int scr_pos = val >> 8; /* split the scrollstrip into 16 regions */
68 if ((old_pos<scr_pos)&&(old_pos!=-1)) int_btn = BUTTON_DOWN; 68 if ((old_pos<scr_pos)&&(old_pos!=-1)) int_btn = BUTTON_DOWN;
69 if ((old_pos>scr_pos)&&(old_pos!=-1)) int_btn = BUTTON_UP; 69 if ((old_pos>scr_pos)&&(old_pos!=-1)) int_btn = BUTTON_UP;
70 old_pos = scr_pos; 70 old_pos = scr_pos;
71 } 71 }
72 else old_pos=-1; 72 else old_pos=-1;
73 } 73 }
74} 74}
@@ -94,13 +94,13 @@ int button_read_device(void)
94 if (!hold_button) 94 if (!hold_button)
95 { 95 {
96 /* Read Record, OK, C */ 96 /* Read Record, OK, C */
97 state = GPIOA_INPUT_VAL; 97 state = GPIOA_INPUT_VAL;
98 if ((state & 0x01)==0) buttons|=BUTTON_REC; 98 if ((state & 0x01)==0) buttons|=BUTTON_REC;
99 if ((state & 0x40)==0) buttons|=BUTTON_OK; 99 if ((state & 0x40)==0) buttons|=BUTTON_OK;
100 if ((state & 0x08)==0) buttons|=BUTTON_CANCEL; 100 if ((state & 0x08)==0) buttons|=BUTTON_CANCEL;
101 101
102 /* Read POWER button */ 102 /* Read POWER button */
103 if ((GPIOD_INPUT_VAL & 0x40)==0) buttons|=BUTTON_POWER; 103 if ((GPIOD_INPUT_VAL & 0x40)==0) buttons|=BUTTON_POWER;
104 } 104 }
105 else return BUTTON_NONE; 105 else return BUTTON_NONE;
106 return buttons; 106 return buttons;
diff --git a/firmware/target/arm/tcc77x/crt0.S b/firmware/target/arm/tcc77x/crt0.S
index 16b80920f4..7c900212db 100644
--- a/firmware/target/arm/tcc77x/crt0.S
+++ b/firmware/target/arm/tcc77x/crt0.S
@@ -48,9 +48,9 @@ start:
48 48
49 The following two values are filled in by mktccboot. 49 The following two values are filled in by mktccboot.
50 */ 50 */
51of_entrypoint: .word 0 /* Saved entrypoint of original firmware*/ 51of_entrypoint: .word 0 /* Saved entrypoint of original firmware*/
52bl_entrypoint: .word 0 /* Location in RAM of the start of our bootloader */ 52bl_entrypoint: .word 0 /* Location in RAM of the start of our bootloader */
53 53
54#else 54#else
55// ldr pc, =start_loc /* jump to the main entry point */ 55// ldr pc, =start_loc /* jump to the main entry point */
56 b start_loc 56 b start_loc
diff --git a/firmware/target/arm/tms320dm320/crt0.S b/firmware/target/arm/tms320dm320/crt0.S
index e774152336..440897d67f 100644
--- a/firmware/target/arm/tms320dm320/crt0.S
+++ b/firmware/target/arm/tms320dm320/crt0.S
@@ -120,13 +120,13 @@ start_loc:
120 120
121/* Exception handlers. Will be copied to address 0 after memory remapping */ 121/* Exception handlers. Will be copied to address 0 after memory remapping */
122 .section .vectors,"aw" 122 .section .vectors,"aw"
123 b start 123 b start
124 b undef_instr_handler 124 b undef_instr_handler
125 b software_int_handler 125 b software_int_handler
126 b prefetch_abort_handler 126 b prefetch_abort_handler
127 b data_abort_handler 127 b data_abort_handler
128 b reserved_handler 128 b reserved_handler
129 b irq_handler 129 b irq_handler
130 b fiq_handler 130 b fiq_handler
131 131
132 .text 132 .text
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-05 22:18:27 +0000