From f62850ba3ae4170295a4a3cdea38d1806d99c474 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Tue, 25 Jun 2013 02:38:21 +0300
Subject: [PATCH] get rid of port_config.s

---
 Makefile                          |  2 +-
 pico/{draw2_arm.s => draw2_arm.S} | 11 +++++++++--
 pico/{draw_arm.s => draw_arm.S}   | 14 ++++++--------
 pico/memory_arm.s                 |  2 --
 platform/gizmondo/port_config.s   | 13 -------------
 platform/gp2x/port_config.s       | 13 -------------
 platform/pandora/port_config.s    | 13 -------------
 7 files changed, 16 insertions(+), 52 deletions(-)
 rename pico/{draw2_arm.s => draw2_arm.S} (95%)
 rename pico/{draw_arm.s => draw_arm.S} (96%)
 delete mode 100644 platform/gizmondo/port_config.s
 delete mode 100644 platform/gp2x/port_config.s
 delete mode 100644 platform/pandora/port_config.s

diff --git a/Makefile b/Makefile
index 8e1a030..2e44fed 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ use_drz80 ?= 1
 use_sh2drc ?= 1
 
 asm_memory = 1
-#asm_render = 1
+asm_render = 1
 asm_ym2612 = 1
 asm_misc = 1
 asm_cdpico = 1
diff --git a/pico/draw2_arm.s b/pico/draw2_arm.S
similarity index 95%
rename from pico/draw2_arm.s
rename to pico/draw2_arm.S
index 4427bee..c37d059 100644
--- a/pico/draw2_arm.s
+++ b/pico/draw2_arm.S
@@ -15,8 +15,15 @@
 @ .equiv START_ROW, 		1
 @ .equiv END_ROW, 		27
 @ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.
-.include "port_config.s"
-
+#ifndef START_ROW
+#define START_ROW 0
+#endif
+#ifndef END_ROW
+#define END_ROW 28
+#endif
+
+.text
+.align 2
 
 .global BackFillFull @ int reg7
 
diff --git a/pico/draw_arm.s b/pico/draw_arm.S
similarity index 96%
rename from pico/draw_arm.s
rename to pico/draw_arm.S
index ec5fcf7..0bf297b 100644
--- a/pico/draw_arm.s
+++ b/pico/draw_arm.S
@@ -8,8 +8,6 @@
  * this is highly specialized, be careful if changing related C code!
  */
 
-.include "port_config.s"
-
 .extern Pico
 .extern PicoOpt
 .extern HighCol
@@ -1768,11 +1766,11 @@ FinalizeLineRGB555_pal_done:
 
 .fl_no32colRGB555:
 
-.if UNALIGNED_DRAWLINEDEST
+#ifdef UNALIGNED_DRAWLINEDEST
     @ this is basically for Gizmondo, which has unaligned odd lines in the framebuffer
     tst     r0, #2
     bne     .fl_RGB555u
-.endif
+#endif
 
 .fl_loopRGB555:
     ldr     r12, [r1], #4
@@ -1815,10 +1813,10 @@ FinalizeLineRGB555_pal_done:
     mov     r9, #0x3900 @ f800 07e0 001f | e000 0780 001c | 3800 01e0 0007
     orr     r9, r9, #0x00e7
 
-.if UNALIGNED_DRAWLINEDEST
+#ifdef UNALIGNED_DRAWLINEDEST
     tst     r0, #2
     bne     .fl_32scale_RGB555u
-.endif
+#endif
 
 .fl_loop32scale_RGB555:
     ldr     r12, [r1], #4
@@ -1876,7 +1874,7 @@ FinalizeLineRGB555_pal_done:
     ldmfd   sp!, {r4-r9,lr}
     bx      lr
 
-.if UNALIGNED_DRAWLINEDEST
+#ifdef UNALIGNED_DRAWLINEDEST
     @ unaligned versions of loops
     @ warning: starts drawing 2bytes before dst
 
@@ -1989,7 +1987,7 @@ FinalizeLineRGB555_pal_done:
     ldmfd   sp!, {r4-r9,lr}
     bx      lr
 
-.endif @ UNALIGNED_DRAWLINEDEST
+#endif /* UNALIGNED_DRAWLINEDEST */
 
 
 @ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
diff --git a/pico/memory_arm.s b/pico/memory_arm.s
index 9d46ba9..be2fa99 100644
--- a/pico/memory_arm.s
+++ b/pico/memory_arm.s
@@ -6,8 +6,6 @@
  * See COPYING file in the top-level directory.
  */
 
-@@ .include "port_config.s"
-
 .equ SRR_MAPPED,    (1 <<  0)
 .equ SRR_READONLY,  (1 <<  1)
 .equ SRF_EEPROM,    (1 <<  1)
diff --git a/platform/gizmondo/port_config.s b/platform/gizmondo/port_config.s
deleted file mode 100644
index 833cb38..0000000
--- a/platform/gizmondo/port_config.s
+++ /dev/null
@@ -1,13 +0,0 @@
-@ vim:filetype=armasm
-
-@ .equiv START_ROW,         1
-@ .equiv END_ROW,          27
-@ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.
-.equiv START_ROW,               0
-.equiv END_ROW,                28
-
-.equiv UNALIGNED_DRAWLINEDEST,  1
-
-@ this should be set to one only for GP2X port
-.equiv EXTERNAL_YM2612,         0
-
diff --git a/platform/gp2x/port_config.s b/platform/gp2x/port_config.s
deleted file mode 100644
index 10d53ac..0000000
--- a/platform/gp2x/port_config.s
+++ /dev/null
@@ -1,13 +0,0 @@
-@ vim:filetype=armasm
-
-@ .equiv START_ROW,         1
-@ .equiv END_ROW,          27
-@ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.
-.equiv START_ROW,               0
-.equiv END_ROW,                28
-
-.equiv UNALIGNED_DRAWLINEDEST,  0
-
-@ this should be set to one only for GP2X port
-.equiv EXTERNAL_YM2612,         1
-
diff --git a/platform/pandora/port_config.s b/platform/pandora/port_config.s
deleted file mode 100644
index 10d53ac..0000000
--- a/platform/pandora/port_config.s
+++ /dev/null
@@ -1,13 +0,0 @@
-@ vim:filetype=armasm
-
-@ .equiv START_ROW,         1
-@ .equiv END_ROW,          27
-@ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.
-.equiv START_ROW,               0
-.equiv END_ROW,                28
-
-.equiv UNALIGNED_DRAWLINEDEST,  0
-
-@ this should be set to one only for GP2X port
-.equiv EXTERNAL_YM2612,         1
-
-- 
2.39.2