Index: emcore/trunk/target/ipodnano2g/lcd.c |
— | — | @@ -257,7 +257,6 @@ |
258 | 258 | __asm__ volatile(" mov r6, #0 \n"); |
259 | 259 | __asm__ volatile(" mov r7, r8 \n"); |
260 | 260 | __asm__ volatile("displaylcd_dither_x: \n"); |
261 | | - __asm__ volatile(" mov r2, #0 \n"); |
262 | 261 | __asm__ volatile(" ldrb r1, [r3], #1 \n"); |
263 | 262 | __asm__ volatile(" ldrsb r0, [r7] \n"); |
264 | 263 | __asm__ volatile(" add r1, r1, r4 \n"); |
— | — | @@ -266,7 +265,7 @@ |
267 | 266 | __asm__ volatile(" mvnhi r1, r1,asr#31 \n"); |
268 | 267 | __asm__ volatile(" andhi r1, r1, #0xff \n"); |
269 | 268 | __asm__ volatile(" mov r0, r1,lsr#3 \n"); |
270 | | - __asm__ volatile(" orr r2, r0,lsl#11 \n"); |
| 269 | + __asm__ volatile(" mov r2, r0,lsl#11 \n"); |
271 | 270 | __asm__ volatile(" sub r1, r1, r0,lsl#3 \n"); |
272 | 271 | __asm__ volatile(" sub r1, r1, r0,lsr#2 \n"); |
273 | 272 | __asm__ volatile(" mov r4, r4,lsr#1 \n"); |
— | — | @@ -281,7 +280,7 @@ |
282 | 281 | __asm__ volatile(" mvnhi r1, r1,asr#31 \n"); |
283 | 282 | __asm__ volatile(" andhi r1, r1, #0xff \n"); |
284 | 283 | __asm__ volatile(" mov r0, r1,lsr#2 \n"); |
285 | | - __asm__ volatile(" orr r2, r0,lsl#5 \n"); |
| 284 | + __asm__ volatile(" orr r2, r2, r0,lsl#5 \n"); |
286 | 285 | __asm__ volatile(" sub r1, r1, r0,lsl#2 \n"); |
287 | 286 | __asm__ volatile(" sub r1, r1, r0,lsr#4 \n"); |
288 | 287 | __asm__ volatile(" mov r5, r5,lsr#1 \n"); |
— | — | @@ -296,7 +295,7 @@ |
297 | 296 | __asm__ volatile(" mvnhi r1, r1,asr#31 \n"); |
298 | 297 | __asm__ volatile(" andhi r1, r1, #0xff \n"); |
299 | 298 | __asm__ volatile(" mov r0, r1,lsr#3 \n"); |
300 | | - __asm__ volatile(" orr r2, r0 \n"); |
| 299 | + __asm__ volatile(" orr r2, r2, r0 \n"); |
301 | 300 | __asm__ volatile(" sub r1, r1, r0,lsl#3 \n"); |
302 | 301 | __asm__ volatile(" sub r1, r1, r0,lsr#2 \n"); |
303 | 302 | __asm__ volatile(" mov r6, r6,lsr#1 \n"); |
Index: emcore/trunk/target/ipodnano3g/lcd.c |
— | — | @@ -324,9 +324,9 @@ |
325 | 325 | __asm__ volatile(" mov r6, r6,lsr#1 \n"); |
326 | 326 | __asm__ volatile(" add r6, r6, r1,lsr#2 \n"); |
327 | 327 | __asm__ volatile(" strb r6, [r7], #1 \n"); |
328 | | - __asm__ volatile(" mov r6, r1,asr#1 \n"); |
329 | 328 | __asm__ volatile("displaylcd_dither_wait2: \n"); |
330 | 329 | __asm__ volatile(" ldr r0, [r9,#-0x24] \n"); |
| 330 | + __asm__ volatile(" mov r6, r1,asr#1 \n"); |
331 | 331 | __asm__ volatile(" tst r0, #0x10 \n"); |
332 | 332 | __asm__ volatile(" bne displaylcd_dither_wait2 \n"); |
333 | 333 | __asm__ volatile(" str r2, [r9] \n"); |