got rid of fb border integration, using defines instead

[picodrive.git] / platform / uiq3 / engine / blit.s

diff --git a/platform/uiq3/engine/blit.s b/platform/uiq3/engine/blit.s
index c377a76..f10a3cc 100644 (file)
--- a/platform/uiq3/engine/blit.s
+++ b/platform/uiq3/engine/blit.s
@@ -4,6 +4,8 @@
 @ (c) Copyright 2006, notaz\r
 @ All Rights Reserved\r
 \r
+.include "port_config.s"\r
+\r
 \r
 @ Convert 0000bbb0 ggg0rrr0 0000bbb0 ggg0rrr0\r
 @ to      00000000 rrr00000 ggg00000 bbb00000 ...\r
@@ -342,13 +344,13 @@ vidConvCpy_90:
     mov     r6,  #0\r
     stmia   r0!, {r3-r6}\r
     stmia   r0!, {r3-r6}\r
-    add     r7,  r0, #256*4-8*4\r
+    add     r7,  r0, #(240+BORDER_R)*4-8*4\r
     stmia   r7!, {r3-r6}\r
     stmia   r7!, {r3-r6}\r
-    add     r7,  r7, #256*4-8*4\r
+    add     r7,  r7, #(240+BORDER_R)*4-8*4\r
     stmia   r7!, {r3-r6}\r
     stmia   r7!, {r3-r6}\r
-    add     r7,  r7, #256*4-8*4\r
+    add     r7,  r7, #(240+BORDER_R)*4-8*4\r
     stmia   r7!, {r3-r6}\r
     stmia   r7!, {r3-r6}\r
 \r
@@ -373,7 +375,7 @@ vidConvCpy_90:
     mode2_4pix  0\r
 .endif\r
     stmia   r0, {r7,r8,r10,lr}\r
-    add     r0, r0, #256*4\r
+    add     r0, r0, #(240+BORDER_R)*4\r
 \r
 .if \is270\r
     mode2_4pix 16\r
@@ -381,7 +383,7 @@ vidConvCpy_90:
     mode2_4pix  8\r
 .endif\r
     stmia   r0, {r7,r8,r10,lr}\r
-    add     r0, r0, #256*4\r
+    add     r0, r0, #(240+BORDER_R)*4\r
 \r
 .if \is270\r
     mode2_4pix  8\r
@@ -389,7 +391,7 @@ vidConvCpy_90:
     mode2_4pix 16\r
 .endif\r
     stmia   r0, {r7,r8,r10,lr}\r
-    add     r0, r0, #256*4\r
+    add     r0, r0, #(240+BORDER_R)*4\r
 \r
 .if \is270\r
     mode2_4pix  0\r
@@ -397,7 +399,7 @@ vidConvCpy_90:
     mode2_4pix 24\r
 .endif\r
     stmia   r0!,{r7,r8,r10,lr}\r
-    sub     r0, r0, #256*4*3\r
+    sub     r0, r0, #(240+BORDER_R)*4*3\r
 \r
     bpl     0b @ .loopM2RGB32_270\r
 \r
@@ -407,13 +409,13 @@ vidConvCpy_90:
     mov     r6,  #0\r
     stmia   r0!, {r3-r6}\r
     stmia   r0!, {r3-r6}\r
-    add     r0,  r0, #256*4-8*4\r
+    add     r0,  r0, #(240+BORDER_R)*4-8*4\r
     stmia   r0!, {r3-r6}\r
     stmia   r0!, {r3-r6}\r
-    add     r0,  r0, #256*4-8*4\r
+    add     r0,  r0, #(240+BORDER_R)*4-8*4\r
     stmia   r0!, {r3-r6}\r
     stmia   r0!, {r3-r6}\r
-    add     r0,  r0, #256*4-8*4\r
+    add     r0,  r0, #(240+BORDER_R)*4-8*4\r
     stmia   r0!, {r3-r6}\r
     nop                             @ phone crashes if this is commented out. Do I stress it too much?\r
     stmia   r0!, {r3-r6}\r
@@ -422,7 +424,9 @@ vidConvCpy_90:
     subs    r12, r12, #1\r
     ldmeqfd sp!, {r4-r11,pc}        @ return\r
 \r
-    add     r0,  r0, #16*4\r
+.if BORDER_R\r
+    add     r0,  r0, #BORDER_R*4\r
+.endif\r
 .if \is270\r
     sub     r9,  r9, #4            @ fix src pointer\r
 .else\r
@@ -432,13 +436,13 @@ vidConvCpy_90:
 \r
     stmia   r0!, {r3-r6}            @ top border\r
     stmia   r0!, {r3-r6}\r
-    add     r7,  r0, #256*4-8*4\r
+    add     r7,  r0, #(240+BORDER_R)*4-8*4\r
     stmia   r7!, {r3-r6}\r
     stmia   r7!, {r3-r6}\r
-    add     r7,  r7, #256*4-8*4\r
+    add     r7,  r7, #(240+BORDER_R)*4-8*4\r
     stmia   r7!, {r3-r6}\r
     stmia   r7!, {r3-r6}\r
-    add     r7,  r7, #256*4-8*4\r
+    add     r7,  r7, #(240+BORDER_R)*4-8*4\r
     stmia   r7!, {r3-r6}\r
     stmia   r7!, {r3-r6}\r
 \r
@@ -481,7 +485,9 @@ vidConvCpy_center_0:
        sub     r12, r12, #1\r
        adds    r12, r12, #1<<16\r
     ldmeqfd sp!, {r4-r6,r11,pc} @ return\r
-    add     r0,  r0, #16*4\r
+.if BORDER_R\r
+    add     r0,  r0, #BORDER_R*4\r
+.endif\r
     add     r1,  r1, #88\r
     orr     r12, #(240/4-1)<<16\r
     b       .loopRGB32_c0\r
@@ -510,7 +516,9 @@ vidConvCpy_center_180:
        sub     r12, r12, #1\r
        adds    r12, r12, #1<<16\r
     ldmeqfd sp!, {r4-r6,r11,pc} @ return\r
-    add     r0,  r0, #16*4\r
+.if BORDER_R\r
+    add     r0,  r0, #BORDER_R*4\r
+.endif\r
     sub     r1,  r1, #88\r
     orr     r12, #(240/4-1)<<16\r
     b       .loopRGB32_c180\r
@@ -544,7 +552,9 @@ vidConvCpy_center2_40c_0:
        sub     r12, r12, #1\r
        adds    r12, r12, #1<<16\r
     ldmeqfd sp!, {r4-r6,r10,r11,pc} @ return\r
-    add     r0,  r0, #16*4\r
+.if BORDER_R\r
+    add     r0,  r0, #BORDER_R*4\r
+.endif\r
     add     r1,  r1, #8\r
     orr     r12, #(240/3-1)<<16\r
     b       .loopRGB32_c2_40c_0\r
@@ -580,7 +590,9 @@ vidConvCpy_center2_40c_180:
        sub     r12, r12, #1\r
        adds    r12, r12, #1<<16\r
     ldmeqfd sp!, {r4-r6,r10,r11,pc} @ return\r
-    add     r0,  r0, #16*4\r
+.if BORDER_R\r
+    add     r0,  r0, #BORDER_R*4\r
+.endif\r
     sub     r1,  r1, #8\r
     orr     r12, #(240/3-1)<<16\r
     b       .loop_c2_40c_180\r
@@ -617,7 +629,9 @@ vidConvCpy_center2_32c_0:
        sub     r12, r12, #1\r
        adds    r12, r12, #1<<16\r
     ldmeqfd sp!, {r4-r11,pc} @ return\r
-    add     r0,  r0, #16*4\r
+.if BORDER_R\r
+    add     r0,  r0, #BORDER_R*4\r
+.endif\r
     add     r1,  r1, #64+8\r
     orr     r12, #(240/15-1)<<16\r
     b       .loop_c2_32c_0\r
@@ -658,7 +672,9 @@ vidConvCpy_center2_32c_180:
        sub     r12, r12, #1\r
        adds    r12, r12, #1<<16\r
     ldmeqfd sp!, {r4-r11,pc} @ return\r
-    add     r0,  r0, #16*4\r
+.if BORDER_R\r
+    add     r0,  r0, #BORDER_R*4\r
+.endif\r
     sub     r1,  r1, #64+8\r
     orr     r12, #(240/15-1)<<16\r
     b       .loop_c2_32c_180\r
@@ -690,7 +706,9 @@ vidClear:
        sub     r12, r12, #1\r
        adds    r12, r12, #1<<16\r
     ldmeqfd sp!, {pc}        @ return\r
-    add     r0,  r0, #16*4\r
+.if BORDER_R\r
+    add     r0,  r0, #BORDER_R*4\r
+.endif\r
     orr     r12, #(240/16-1)<<16\r
     b       .loopVidClear\r
 \r