get rid of port_config.s

This commit is contained in:
notaz 2013-06-25 02:38:21 +03:00
parent d4d626658a
commit f62850ba3a
7 changed files with 15 additions and 51 deletions

View file

@ -31,7 +31,7 @@ use_drz80 ?= 1
use_sh2drc ?= 1 use_sh2drc ?= 1
asm_memory = 1 asm_memory = 1
#asm_render = 1 asm_render = 1
asm_ym2612 = 1 asm_ym2612 = 1
asm_misc = 1 asm_misc = 1
asm_cdpico = 1 asm_cdpico = 1

View file

@ -15,8 +15,15 @@
@ .equiv START_ROW, 1 @ .equiv START_ROW, 1
@ .equiv END_ROW, 27 @ .equiv END_ROW, 27
@ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered. @ 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 .global BackFillFull @ int reg7

View file

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

View file

@ -6,8 +6,6 @@
* See COPYING file in the top-level directory. * See COPYING file in the top-level directory.
*/ */
@@ .include "port_config.s"
.equ SRR_MAPPED, (1 << 0) .equ SRR_MAPPED, (1 << 0)
.equ SRR_READONLY, (1 << 1) .equ SRR_READONLY, (1 << 1)
.equ SRF_EEPROM, (1 << 1) .equ SRF_EEPROM, (1 << 1)

View file

@ -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

View file

@ -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

View file

@ -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