get rid of port_config.s

diff --git a/Makefile b/Makefile
index 8e1a030..2e44fed 100644 (file)
--- 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 (file)
--- a/pico/draw2_arm.s
+++ b/pico/draw2_arm.S
@@ -15,8 +15,15 @@
 @ .equiv START_ROW,            1\r
 @ .equiv END_ROW,              27\r
 @ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.\r
-.include "port_config.s"\r
-\r
+#ifndef START_ROW\r
+#define START_ROW 0\r
+#endif\r
+#ifndef END_ROW\r
+#define END_ROW 28\r
+#endif\r
+\r
+.text\r
+.align 2\r
 \r
 .global BackFillFull @ int reg7\r
 \r

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 (file)
--- 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!\r
  */\r
 \r
-.include "port_config.s"\r
-\r
 .extern Pico\r
 .extern PicoOpt\r
 .extern HighCol\r
@@ -1768,11 +1766,11 @@ FinalizeLineRGB555_pal_done:
 \r
 .fl_no32colRGB555:\r
 \r
-.if UNALIGNED_DRAWLINEDEST\r
+#ifdef UNALIGNED_DRAWLINEDEST\r
     @ this is basically for Gizmondo, which has unaligned odd lines in the framebuffer\r
     tst     r0, #2\r
     bne     .fl_RGB555u\r
-.endif\r
+#endif\r
 \r
 .fl_loopRGB555:\r
     ldr     r12, [r1], #4\r
@@ -1815,10 +1813,10 @@ FinalizeLineRGB555_pal_done:
     mov     r9, #0x3900 @ f800 07e0 001f | e000 0780 001c | 3800 01e0 0007\r
     orr     r9, r9, #0x00e7\r
 \r
-.if UNALIGNED_DRAWLINEDEST\r
+#ifdef UNALIGNED_DRAWLINEDEST\r
     tst     r0, #2\r
     bne     .fl_32scale_RGB555u\r
-.endif\r
+#endif\r
 \r
 .fl_loop32scale_RGB555:\r
     ldr     r12, [r1], #4\r
@@ -1876,7 +1874,7 @@ FinalizeLineRGB555_pal_done:
     ldmfd   sp!, {r4-r9,lr}\r
     bx      lr\r
 \r
-.if UNALIGNED_DRAWLINEDEST\r
+#ifdef UNALIGNED_DRAWLINEDEST\r
     @ unaligned versions of loops\r
     @ warning: starts drawing 2bytes before dst\r
 \r
@@ -1989,7 +1987,7 @@ FinalizeLineRGB555_pal_done:
     ldmfd   sp!, {r4-r9,lr}\r
     bx      lr\r
 \r
-.endif @ UNALIGNED_DRAWLINEDEST\r
+#endif /* UNALIGNED_DRAWLINEDEST */\r
 \r
 \r
 @ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\r

diff --git a/pico/memory_arm.s b/pico/memory_arm.s
index 9d46ba9..be2fa99 100644 (file)
--- a/pico/memory_arm.s
+++ b/pico/memory_arm.s
@@ -6,8 +6,6 @@
  * See COPYING file in the top-level directory.\r
  */\r
 \r
-@@ .include "port_config.s"\r
-\r
 .equ SRR_MAPPED,    (1 <<  0)\r
 .equ SRR_READONLY,  (1 <<  1)\r
 .equ SRF_EEPROM,    (1 <<  1)\r

diff --git a/platform/gizmondo/port_config.s b/platform/gizmondo/port_config.s
deleted file mode 100644 (file)
index 833cb38..0000000
--- a/platform/gizmondo/port_config.s
+++ /dev/null
@@ -1,13 +0,0 @@
-@ vim:filetype=armasm\r
-\r
-@ .equiv START_ROW,         1\r
-@ .equiv END_ROW,          27\r
-@ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.\r
-.equiv START_ROW,               0\r
-.equiv END_ROW,                28\r
-\r
-.equiv UNALIGNED_DRAWLINEDEST,  1\r
-\r
-@ this should be set to one only for GP2X port\r
-.equiv EXTERNAL_YM2612,         0\r
-\r

diff --git a/platform/gp2x/port_config.s b/platform/gp2x/port_config.s
deleted file mode 100644 (file)
index 10d53ac..0000000
--- a/platform/gp2x/port_config.s
+++ /dev/null
@@ -1,13 +0,0 @@
-@ vim:filetype=armasm\r
-\r
-@ .equiv START_ROW,         1\r
-@ .equiv END_ROW,          27\r
-@ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.\r
-.equiv START_ROW,               0\r
-.equiv END_ROW,                28\r
-\r
-.equiv UNALIGNED_DRAWLINEDEST,  0\r
-\r
-@ this should be set to one only for GP2X port\r
-.equiv EXTERNAL_YM2612,         1\r
-\r

diff --git a/platform/pandora/port_config.s b/platform/pandora/port_config.s
deleted file mode 100644 (file)
index 10d53ac..0000000
--- a/platform/pandora/port_config.s
+++ /dev/null
@@ -1,13 +0,0 @@
-@ vim:filetype=armasm\r
-\r
-@ .equiv START_ROW,         1\r
-@ .equiv END_ROW,          27\r
-@ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.\r
-.equiv START_ROW,               0\r
-.equiv END_ROW,                28\r
-\r
-.equiv UNALIGNED_DRAWLINEDEST,  0\r
-\r
-@ this should be set to one only for GP2X port\r
-.equiv EXTERNAL_YM2612,         1\r
-\r