diff options
author | Jens Arnold <amiconn@rockbox.org> | 2008-01-13 13:58:18 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2008-01-13 13:58:18 +0000 |
commit | 28cd26c4718817ef040c84a9b1db6a302990c4f6 (patch) | |
tree | f2918c2cae4689863aae719806b467dc7defb8e5 /firmware | |
parent | 62f7f9e5504149d644a1d8db8b22a41621604c66 (diff) | |
download | rockbox-28cd26c4718817ef040c84a9b1db6a302990c4f6.tar.gz rockbox-28cd26c4718817ef040c84a9b1db6a302990c4f6.zip |
Some cleanup for readability. No code change.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16076 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/target/arm/ipod/lcd-as-gray.S | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/firmware/target/arm/ipod/lcd-as-gray.S b/firmware/target/arm/ipod/lcd-as-gray.S index d16d09b8e2..6a39f98e24 100644 --- a/firmware/target/arm/ipod/lcd-as-gray.S +++ b/firmware/target/arm/ipod/lcd-as-gray.S | |||
@@ -44,20 +44,20 @@ lcd_write_data: | |||
44 | orr r3, r3, #0x760000 | 44 | orr r3, r3, #0x760000 |
45 | 1: | 45 | 1: |
46 | ldr r4, [r2] | 46 | ldr r4, [r2] |
47 | tst r4, #0x8000 | 47 | tst r4, #LCD1_BUSY_MASK |
48 | bne 1b | 48 | bne 1b |
49 | str r3, [r2, #0x08] | 49 | str r3, [r2, #0x08] |
50 | #else | 50 | #else |
51 | 1: | 51 | 1: |
52 | ldr r4, [r2] | 52 | ldr r4, [r2] |
53 | tst r4, #0x8000 | 53 | tst r4, #LCD1_BUSY_MASK |
54 | bne 1b | 54 | bne 1b |
55 | str r3, [r2, #0x10] | 55 | str r3, [r2, #0x10] |
56 | 56 | ||
57 | ldrb r3, [r0], #1 | 57 | ldrb r3, [r0], #1 |
58 | 1: | 58 | 1: |
59 | ldr r4, [r2] | 59 | ldr r4, [r2] |
60 | tst r4, #0x8000 | 60 | tst r4, #LCD1_BUSY_MASK |
61 | bne 1b | 61 | bne 1b |
62 | str r3, [r2, #0x10] | 62 | str r3, [r2, #0x10] |
63 | #endif | 63 | #endif |
@@ -66,9 +66,7 @@ lcd_write_data: | |||
66 | bne .loop | 66 | bne .loop |
67 | 67 | ||
68 | ldmfd sp!, {r4, pc} | 68 | ldmfd sp!, {r4, pc} |
69 | 69 | .size lcd_write_data,.-lcd_write_data | |
70 | .wd_end: | ||
71 | .size lcd_write_data,.wd_end-lcd_write_data | ||
72 | 70 | ||
73 | 71 | ||
74 | #ifdef IPOD_MINI2G | 72 | #ifdef IPOD_MINI2G |
@@ -91,7 +89,7 @@ lcd_write_data_shifted: | |||
91 | orr r5, r6, r5, lsr #16 | 89 | orr r5, r6, r5, lsr #16 |
92 | 1: | 90 | 1: |
93 | ldr r4, [r2] | 91 | ldr r4, [r2] |
94 | tst r4, #0x8000 | 92 | tst r4, #LCD1_BUSY_MASK |
95 | bne 1b | 93 | bne 1b |
96 | str r5, [r2, #0x08] | 94 | str r5, [r2, #0x08] |
97 | 95 | ||
@@ -99,9 +97,7 @@ lcd_write_data_shifted: | |||
99 | bne .sloop | 97 | bne .sloop |
100 | 98 | ||
101 | ldmfd sp!, {r4-r6, pc} | 99 | ldmfd sp!, {r4-r6, pc} |
102 | 100 | .size lcd_write_data_shifted,.-lcd_write_data_shifted | |
103 | .wds_end: | ||
104 | .size lcd_write_data_shifted,.wds_end-lcd_write_data_shifted | ||
105 | 101 | ||
106 | #elif defined IPOD_MINI | 102 | #elif defined IPOD_MINI |
107 | 103 | ||
@@ -119,7 +115,7 @@ lcd_write_data_shifted: | |||
119 | mov r5, r3, lsr #4 | 115 | mov r5, r3, lsr #4 |
120 | 1: | 116 | 1: |
121 | ldr r4, [r2] | 117 | ldr r4, [r2] |
122 | tst r4, #0x8000 | 118 | tst r4, #LCD1_BUSY_MASK |
123 | bne 1b | 119 | bne 1b |
124 | str r5, [r2, #0x10] | 120 | str r5, [r2, #0x10] |
125 | 121 | ||
@@ -128,7 +124,7 @@ lcd_write_data_shifted: | |||
128 | mov r5, r3, lsr #4 | 124 | mov r5, r3, lsr #4 |
129 | 1: | 125 | 1: |
130 | ldr r4, [r2] | 126 | ldr r4, [r2] |
131 | tst r4, #0x8000 | 127 | tst r4, #LCD1_BUSY_MASK |
132 | bne 1b | 128 | bne 1b |
133 | str r5, [r2, #0x10] | 129 | str r5, [r2, #0x10] |
134 | 130 | ||
@@ -136,9 +132,8 @@ lcd_write_data_shifted: | |||
136 | bne .sloop | 132 | bne .sloop |
137 | 133 | ||
138 | ldmfd sp!, {r4, r5, pc} | 134 | ldmfd sp!, {r4, r5, pc} |
139 | .wds_end: | 135 | .size lcd_write_data_shifted,.-lcd_write_data_shifted |
140 | .size lcd_write_data_shifted,.wds_end-lcd_write_data_shifted | 136 | |
141 | |||
142 | #endif | 137 | #endif |
143 | 138 | ||
144 | .global lcd_mono_data | 139 | .global lcd_mono_data |
@@ -161,13 +156,13 @@ lcd_mono_data: | |||
161 | orr r5, r5, #0x760000 | 156 | orr r5, r5, #0x760000 |
162 | 1: | 157 | 1: |
163 | ldr r4, [r2] | 158 | ldr r4, [r2] |
164 | tst r4, #0x8000 | 159 | tst r4, #LCD1_BUSY_MASK |
165 | bne 1b | 160 | bne 1b |
166 | str r5, [r2, #0x08] | 161 | str r5, [r2, #0x08] |
167 | #else | 162 | #else |
168 | 1: | 163 | 1: |
169 | ldr r4, [r2] | 164 | ldr r4, [r2] |
170 | tst r4, #0x8000 | 165 | tst r4, #LCD1_BUSY_MASK |
171 | bne 1b | 166 | bne 1b |
172 | str r5, [r2, #0x10] | 167 | str r5, [r2, #0x10] |
173 | 168 | ||
@@ -175,7 +170,7 @@ lcd_mono_data: | |||
175 | ldrb r5, [r6, r4] | 170 | ldrb r5, [r6, r4] |
176 | 1: | 171 | 1: |
177 | ldr r4, [r2] | 172 | ldr r4, [r2] |
178 | tst r4, #0x8000 | 173 | tst r4, #LCD1_BUSY_MASK |
179 | bne 1b | 174 | bne 1b |
180 | str r5, [r2, #0x10] | 175 | str r5, [r2, #0x10] |
181 | #endif | 176 | #endif |
@@ -189,9 +184,8 @@ lcd_mono_data: | |||
189 | .byte 0x00, 0x03, 0x0C, 0x0F, 0x30, 0x33, 0x3C, 0x3F | 184 | .byte 0x00, 0x03, 0x0C, 0x0F, 0x30, 0x33, 0x3C, 0x3F |
190 | .byte 0xC0, 0xC3, 0xCC, 0xCF, 0xF0, 0xF3, 0xFC, 0xFF | 185 | .byte 0xC0, 0xC3, 0xCC, 0xCF, 0xF0, 0xF3, 0xFC, 0xFF |
191 | 186 | ||
192 | .md_end: | 187 | .size lcd_mono_data,.-lcd_mono_data |
193 | .size lcd_mono_data,.md_end-lcd_mono_data | 188 | |
194 | |||
195 | 189 | ||
196 | .global lcd_grey_data | 190 | .global lcd_grey_data |
197 | .type lcd_grey_data,%function | 191 | .type lcd_grey_data,%function |
@@ -250,7 +244,7 @@ lcd_grey_data: | |||
250 | 244 | ||
251 | 1: | 245 | 1: |
252 | ldr r5, [r9] | 246 | ldr r5, [r9] |
253 | tst r5, #0x8000 | 247 | tst r5, #LCD1_BUSY_MASK |
254 | bne 1b | 248 | bne 1b |
255 | 249 | ||
256 | str r7, [r9, #0x10] | 250 | str r7, [r9, #0x10] |
@@ -272,7 +266,7 @@ lcd_grey_data: | |||
272 | 266 | ||
273 | 1: | 267 | 1: |
274 | ldr r5, [r9] | 268 | ldr r5, [r9] |
275 | tst r5, #0x8000 | 269 | tst r5, #LCD1_BUSY_MASK |
276 | bne 1b | 270 | bne 1b |
277 | #ifdef IPOD_MINI2G | 271 | #ifdef IPOD_MINI2G |
278 | str r7, [r9, #0x08] | 272 | str r7, [r9, #0x08] |
@@ -284,7 +278,5 @@ lcd_grey_data: | |||
284 | bne .greyloop | 278 | bne .greyloop |
285 | 279 | ||
286 | ldmfd sp!, {r4-r9, pc} | 280 | ldmfd sp!, {r4-r9, pc} |
287 | 281 | .size lcd_grey_data,.-lcd_grey_data | |
288 | .gd_end: | ||
289 | .size lcd_grey_data,.gd_end-lcd_grey_data | ||
290 | 282 | ||