diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2010-06-07 21:16:59 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2010-06-07 21:16:59 +0000 |
| commit | fe0334394fc2d167ffa2bb2f8c15f82b91a5f22d (patch) | |
| tree | 35bfb1a41d2707d1080e0d8135c8fe500129f147 /firmware | |
| parent | c3ee226b3312d1d8c03e58714f844662ad949e73 (diff) | |
| download | rockbox-fe0334394fc2d167ffa2bb2f8c15f82b91a5f22d.tar.gz rockbox-fe0334394fc2d167ffa2bb2f8c15f82b91a5f22d.zip | |
Fix byte order for Mini G2, and fix comments.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26675 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/target/arm/ipod/lcd-as-gray.S | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/firmware/target/arm/ipod/lcd-as-gray.S b/firmware/target/arm/ipod/lcd-as-gray.S index 4579d15f71..1364c1f965 100644 --- a/firmware/target/arm/ipod/lcd-as-gray.S +++ b/firmware/target/arm/ipod/lcd-as-gray.S @@ -206,7 +206,7 @@ lcd_mono_data: * r12 - phase signs mask * lr - lcd bridge address */ - + lcd_grey_data: stmfd sp!, {r4-r7, lr} mov r12, #0x80 @@ -217,11 +217,11 @@ lcd_grey_data: .greyloop: ldmia r1, {r3-r4} /* Fetch 8 pixel phases */ - bic r5, r12, r3 /* r5 = 0.......1.......2.......3....... */ - orr r5, r5, r5, lsr #10 /* r5 = 0.......1.0.....2.1.....3.2..... */ - orr r5, r5, r5, lsr #10 /* r5 = 0.......1.0.....2.1.0...3.2.1... */ - orr r5, r5, r5, lsr #10 /* r5 = 0.......1.0.....2.1.0...3.2.1.0. */ - orr r5, r5, r5, lsr #1 /* r5 = 00......1100....221100..33221100 */ + bic r5, r12, r3 /* r5 = 3.......2.......1.......0....... */ + orr r5, r5, r5, lsr #10 /* r5 = 3.......2.3.....1.2.....0.1..... */ + orr r5, r5, r5, lsr #10 /* r5 = 3.......2.3.....1.2.3...0.1.2... */ + orr r5, r5, r5, lsr #10 /* r5 = 3.......2.3.....1.2.3...0.1.2.3. */ + orr r5, r5, r5, lsr #1 /* r5 = 33......2233....112233..00112233 */ bic r3, r3, r12 #ifndef IPOD_MINI2G /* 8 bit parallel bridge mode */ @@ -236,20 +236,20 @@ lcd_grey_data: ldmia r0!, {r6-r7} /* Fetch 8 pixel values */ add r3, r3, r6 - bic r6, r12, r4 /* r6 = 4.......5.......6.......7....... */ - orr r6, r6, r6, lsr #10 /* r6 = 4.......5.4.....6.5.....7.6..... */ - orr r6, r6, r6, lsr #10 /* r6 = 4.......5.4.....6.5.4...7.6.5... */ - orr r6, r6, r6, lsr #10 /* r6 = 4.......5.4.....6.5.4...7.6.5.4. */ - orr r6, r6, r6, lsr #1 /* r6 = 44......5544....665544..77665544 */ + bic r6, r12, r4 /* r6 = 7.......6.......5.......4....... */ + orr r6, r6, r6, lsr #10 /* r6 = 7.......6.7.....5.6.....4.5..... */ + orr r6, r6, r6, lsr #10 /* r6 = 7.......6.7.....5.6.7...4.5.6... */ + orr r6, r6, r6, lsr #10 /* r6 = 7.......6.7.....5.6.7...4.5.6.7. */ + orr r6, r6, r6, lsr #1 /* r6 = 77......6677....556677..44556677 */ bic r4, r4, r12 add r4, r4, r7 stmia r1!, {r3-r4} #ifdef IPOD_MINI2G /* 16 bit serial bridge mode */ - and r5, r5, #0xff /* r5 = ........................33221100 */ - and r6, r6, #0xff /* r6 = ........................77665544 */ - orr r5, r5, r6, lsl #8 /* r5 = ................7766554433221100 */ + and r5, r5, #0xff /* r5 = ........................00112233 */ + and r6, r6, #0xff /* r6 = ........................44556677 */ + orr r5, r6, r5, lsl #8 /* r5 = ................0011223344556677 */ orr r5, r5, #0x760000 /* data marker */ #endif |