From: ol.sc Date: Wed, 8 Feb 2012 15:54:44 +0000 (+0000) Subject: Normalized coding style. X-Git-Tag: V2.14~565 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9aac71b74a08c793e1cdd6f92e9185c4f38d3882;p=cc65 Normalized coding style. git-svn-id: svn://svn.cc65.org/cc65/trunk@5498 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- diff --git a/libsrc/geos-common/disk/blkalloc.s b/libsrc/geos-common/disk/blkalloc.s index 15f5a519a..bce4dd188 100644 --- a/libsrc/geos-common/disk/blkalloc.s +++ b/libsrc/geos-common/disk/blkalloc.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/disk/calcblksfree.s b/libsrc/geos-common/disk/calcblksfree.s index ec66d9fc9..481ab5657 100644 --- a/libsrc/geos-common/disk/calcblksfree.s +++ b/libsrc/geos-common/disk/calcblksfree.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; diff --git a/libsrc/geos-common/disk/freeblock.s b/libsrc/geos-common/disk/freeblock.s index 5010d6778..74bb74448 100644 --- a/libsrc/geos-common/disk/freeblock.s +++ b/libsrc/geos-common/disk/freeblock.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/disk/getblock.s b/libsrc/geos-common/disk/getblock.s index 2342a393c..24e8415a9 100644 --- a/libsrc/geos-common/disk/getblock.s +++ b/libsrc/geos-common/disk/getblock.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/disk/getdirhead.s b/libsrc/geos-common/disk/getdirhead.s index 26d386ba9..efe8b7217 100644 --- a/libsrc/geos-common/disk/getdirhead.s +++ b/libsrc/geos-common/disk/getdirhead.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/disk/getptrcurdknm.s b/libsrc/geos-common/disk/getptrcurdknm.s index f0fae0ec4..43c5fda01 100644 --- a/libsrc/geos-common/disk/getptrcurdknm.s +++ b/libsrc/geos-common/disk/getptrcurdknm.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; diff --git a/libsrc/geos-common/disk/gettrse.s b/libsrc/geos-common/disk/gettrse.s index 525df08af..bcae55c9b 100644 --- a/libsrc/geos-common/disk/gettrse.s +++ b/libsrc/geos-common/disk/gettrse.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -6,12 +5,13 @@ .export gettrse .importzp ptr4 + gettrse: - sta ptr4 - stx ptr4+1 - ldy #1 - lda (ptr4),y - tax - dey - lda (ptr4),y - rts + sta ptr4 + stx ptr4+1 + ldy #1 + lda (ptr4),y + tax + dey + lda (ptr4),y + rts diff --git a/libsrc/geos-common/disk/nxtblkalloc.s b/libsrc/geos-common/disk/nxtblkalloc.s index 532aadba9..e8cecd522 100644 --- a/libsrc/geos-common/disk/nxtblkalloc.s +++ b/libsrc/geos-common/disk/nxtblkalloc.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/disk/opendisk.s b/libsrc/geos-common/disk/opendisk.s index 89ab42f7e..362c0042f 100644 --- a/libsrc/geos-common/disk/opendisk.s +++ b/libsrc/geos-common/disk/opendisk.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/disk/putblock.s b/libsrc/geos-common/disk/putblock.s index 0488110fd..5da09a975 100644 --- a/libsrc/geos-common/disk/putblock.s +++ b/libsrc/geos-common/disk/putblock.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/disk/putdirhead.s b/libsrc/geos-common/disk/putdirhead.s index 0561b448e..8f1014d00 100644 --- a/libsrc/geos-common/disk/putdirhead.s +++ b/libsrc/geos-common/disk/putdirhead.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/disk/setnextfree.s b/libsrc/geos-common/disk/setnextfree.s index bd247c1ab..9bfbe2342 100644 --- a/libsrc/geos-common/disk/setnextfree.s +++ b/libsrc/geos-common/disk/setnextfree.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; diff --git a/libsrc/geos-common/dlgbox/Makefile b/libsrc/geos-common/dlgbox/Makefile index 00663c1ca..cf24c8a32 100644 --- a/libsrc/geos-common/dlgbox/Makefile +++ b/libsrc/geos-common/dlgbox/Makefile @@ -7,11 +7,11 @@ C_OBJS += messagebox.o -S_OBJS += dodlgbox.o \ - rstrfrmdialogue.o \ - dbget2lines.o \ - dlgboxyesno.o \ - dlgboxokcancel.o \ - dlgboxok.o \ +S_OBJS += dbget2lines.o \ dlgboxgetstring.o \ - dlgboxfileselect.o + dlgboxfileselect.o \ + dlgboxok.o \ + dlgboxokcancel.o \ + dlgboxyesno.o \ + dodlgbox.o \ + rstrfrmdialogue.o diff --git a/libsrc/geos-common/dlgbox/dbget2lines.s b/libsrc/geos-common/dlgbox/dbget2lines.s index 6e26b6ae7..67d72375c 100644 --- a/libsrc/geos-common/dlgbox/dbget2lines.s +++ b/libsrc/geos-common/dlgbox/dbget2lines.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -11,27 +10,27 @@ .code DB_get2lines: - sta ptr4 ; fetch line 2 - stx ptr4+1 - jsr popax - sta ptr3 ; fetch line 1 - stx ptr3+1 - ldx #ptr3 - jsr checknull - ldx #ptr4 - jmp checknull + sta ptr4 ; fetch line 2 + stx ptr4+1 + jsr popax + sta ptr3 ; fetch line 1 + stx ptr3+1 + ldx #ptr3 + jsr checknull + ldx #ptr4 + jmp checknull checknull: - lda $0,x - ora $1,x - bne cn_end - lda #nullstring - sta $1,x -cn_end: rts + lda $0,x + ora $1,x + bne cn_end + lda #nullstring + sta $1,x +cn_end: rts .rodata nullstring: - .byte 0 + .byte 0 diff --git a/libsrc/geos-common/dlgbox/dlgboxfileselect.s b/libsrc/geos-common/dlgbox/dlgboxfileselect.s index 4e34f1045..7acb6b9ed 100644 --- a/libsrc/geos-common/dlgbox/dlgboxfileselect.s +++ b/libsrc/geos-common/dlgbox/dlgboxfileselect.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -18,42 +17,45 @@ .code _DlgBoxFileSelect: - - sta tmp_r5 - stx tmp_r5+1 - jsr popa - sta tmp_r7L - jsr popax - sta tmp_r10 - stx tmp_r10+1 + sta tmp_r5 + stx tmp_r5+1 + jsr popa + sta tmp_r7L + jsr popax + sta tmp_r10 + stx tmp_r10+1 DB_FS_reload: - MoveW tmp_r5, r5 - MoveW tmp_r10, r10 - MoveB tmp_r7L, r7L - - lda #paramStrFileSelect - jsr _DoDlgBox - cmp #DISK - bne DB_FS_Fin - jsr OpenDisk - txa - beq DB_FS_reload -DB_FS_Fin: rts + MoveW tmp_r5, r5 + MoveW tmp_r10, r10 + MoveB tmp_r7L, r7L + + lda #paramStrFileSelect + jsr _DoDlgBox + cmp #DISK + bne DB_FS_Fin + jsr OpenDisk + txa + beq DB_FS_reload +DB_FS_Fin: + rts .rodata paramStrFileSelect: - .byte DEF_DB_POS | 1 - .byte DBGETFILES, 4, 4 - .byte OPEN, DBI_X_2, DBI_Y_0+16 - .byte DISK, DBI_X_2, DBI_Y_0+32+1 - .byte CANCEL, DBI_X_2, DBI_Y_0+64+3 - .byte NULL + .byte DEF_DB_POS | 1 + .byte DBGETFILES, 4, 4 + .byte OPEN, DBI_X_2, DBI_Y_0+16 + .byte DISK, DBI_X_2, DBI_Y_0+32+1 + .byte CANCEL, DBI_X_2, DBI_Y_0+64+3 + .byte NULL .bss -tmp_r5: .res 2 -tmp_r7L: .res 1 -tmp_r10: .res 2 +tmp_r5: + .res 2 +tmp_r7L: + .res 1 +tmp_r10: + .res 2 diff --git a/libsrc/geos-common/dlgbox/dlgboxgetstring.s b/libsrc/geos-common/dlgbox/dlgboxgetstring.s index 2b45f9fb9..4f0a25944 100644 --- a/libsrc/geos-common/dlgbox/dlgboxgetstring.s +++ b/libsrc/geos-common/dlgbox/dlgboxgetstring.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -17,23 +16,24 @@ .code _DlgBoxGetString: - jsr DB_get2lines - jsr popa - sta DB_strlen - jsr popax - sta ptr2 - stx ptr2+1 - lda #paramStrGetString - jmp _DoDlgBox + jsr DB_get2lines + jsr popa + sta DB_strlen + jsr popax + sta ptr2 + stx ptr2+1 + lda #paramStrGetString + jmp _DoDlgBox .data paramStrGetString: - .byte DEF_DB_POS | 1 - .byte DBVARSTR, TXT_LN_X, TXT_LN_1_Y, ptr3 - .byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr4 - .byte DBGETSTRING, TXT_LN_X, TXT_LN_3_Y, ptr2 -DB_strlen: .byte 17 - .byte CANCEL, DBI_X_2, DBI_Y_2 - .byte NULL + .byte DEF_DB_POS | 1 + .byte DBVARSTR, TXT_LN_X, TXT_LN_1_Y, ptr3 + .byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr4 + .byte DBGETSTRING, TXT_LN_X, TXT_LN_3_Y, ptr2 +DB_strlen: + .byte 17 + .byte CANCEL, DBI_X_2, DBI_Y_2 + .byte NULL diff --git a/libsrc/geos-common/dlgbox/dlgboxok.s b/libsrc/geos-common/dlgbox/dlgboxok.s index 5d3e5e3fc..7cfdc6112 100644 --- a/libsrc/geos-common/dlgbox/dlgboxok.s +++ b/libsrc/geos-common/dlgbox/dlgboxok.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -16,16 +15,16 @@ .code _DlgBoxOk: - jsr DB_get2lines - lda #paramStrOk - jmp _DoDlgBox + jsr DB_get2lines + lda #paramStrOk + jmp _DoDlgBox .rodata paramStrOk: - .byte DEF_DB_POS | 1 - .byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3 - .byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4 - .byte OK, DBI_X_0, DBI_Y_2 - .byte NULL + .byte DEF_DB_POS | 1 + .byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3 + .byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4 + .byte OK, DBI_X_0, DBI_Y_2 + .byte NULL diff --git a/libsrc/geos-common/dlgbox/dlgboxokcancel.s b/libsrc/geos-common/dlgbox/dlgboxokcancel.s index 999d037ec..828514fc5 100644 --- a/libsrc/geos-common/dlgbox/dlgboxokcancel.s +++ b/libsrc/geos-common/dlgbox/dlgboxokcancel.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -16,17 +15,17 @@ .code _DlgBoxOkCancel: - jsr DB_get2lines - lda #paramStrOkCancel - jmp _DoDlgBox + jsr DB_get2lines + lda #paramStrOkCancel + jmp _DoDlgBox .rodata paramStrOkCancel: - .byte DEF_DB_POS | 1 - .byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3 - .byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4 - .byte OK, DBI_X_0, DBI_Y_2 - .byte CANCEL, DBI_X_2, DBI_Y_2 - .byte NULL + .byte DEF_DB_POS | 1 + .byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3 + .byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4 + .byte OK, DBI_X_0, DBI_Y_2 + .byte CANCEL, DBI_X_2, DBI_Y_2 + .byte NULL diff --git a/libsrc/geos-common/dlgbox/dlgboxyesno.s b/libsrc/geos-common/dlgbox/dlgboxyesno.s index 2996c0d43..94eed142a 100644 --- a/libsrc/geos-common/dlgbox/dlgboxyesno.s +++ b/libsrc/geos-common/dlgbox/dlgboxyesno.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -16,17 +15,17 @@ .code _DlgBoxYesNo: - jsr DB_get2lines - lda #paramStrYesNo - jmp _DoDlgBox + jsr DB_get2lines + lda #paramStrYesNo + jmp _DoDlgBox .rodata paramStrYesNo: - .byte DEF_DB_POS | 1 - .byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3 - .byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4 - .byte YES, DBI_X_0, DBI_Y_2 - .byte NO, DBI_X_2, DBI_Y_2 - .byte NULL + .byte DEF_DB_POS | 1 + .byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3 + .byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4 + .byte YES, DBI_X_0, DBI_Y_2 + .byte NO, DBI_X_2, DBI_Y_2 + .byte NULL diff --git a/libsrc/geos-common/dlgbox/dodlgbox.s b/libsrc/geos-common/dlgbox/dodlgbox.s index 77b3b6b37..4f5a776b9 100644 --- a/libsrc/geos-common/dlgbox/dodlgbox.s +++ b/libsrc/geos-common/dlgbox/dodlgbox.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -12,9 +11,9 @@ .include "geossym.inc" _DoDlgBox: - sta r0L - stx r0H - jsr DoDlgBox - ldx #0 - lda r0L - rts + sta r0L + stx r0H + jsr DoDlgBox + ldx #0 + lda r0L + rts diff --git a/libsrc/geos-common/dlgbox/rstrfrmdialogue.s b/libsrc/geos-common/dlgbox/rstrfrmdialogue.s index a676bb440..84bd1b3ec 100644 --- a/libsrc/geos-common/dlgbox/rstrfrmdialogue.s +++ b/libsrc/geos-common/dlgbox/rstrfrmdialogue.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_RstrFrmDialogue = RstrFrmDialogue +_RstrFrmDialogue = RstrFrmDialogue diff --git a/libsrc/geos-common/file/Makefile b/libsrc/geos-common/file/Makefile index b9ba76208..9d64224d9 100644 --- a/libsrc/geos-common/file/Makefile +++ b/libsrc/geos-common/file/Makefile @@ -5,28 +5,28 @@ #-------------------------------------------------------------------------- # Object files -S_OBJS += get1stdirentry.o \ - getnxtdirentry.o \ - openrecordfile.o \ +S_OBJS += appendrecord.o \ closerecordfile.o \ - nextrecord.o \ - previousrecord.o \ - pointrecord.o \ + deletefile.o \ deleterecord.o \ - insertrecord.o \ - appendrecord.o \ - readrecord.o \ - writerecord.o \ - updaterecordfile.o \ findfile.o \ + findftypes.o \ + freefile.o \ + get1stdirentry.o \ getfhdrinfo.o \ + getfile.o \ + getnxtdirentry.o \ + insertrecord.o \ + nextrecord.o \ + openrecordfile.o \ + previousrecord.o \ + pointrecord.o \ + readbyte.o \ readfile.o \ - savefile.o \ - freefile.o \ - deletefile.o \ + readrecord.o \ renamefile.o \ - findftypes.o \ - readbyte.o \ - getfile.o \ + savefile.o \ sysremove.o \ - sysrename.o + sysrename.o \ + writerecord.o \ + updaterecordfile.o \ No newline at end of file diff --git a/libsrc/geos-common/file/appendrecord.s b/libsrc/geos-common/file/appendrecord.s index 26b99a1a8..49a9cee46 100644 --- a/libsrc/geos-common/file/appendrecord.s +++ b/libsrc/geos-common/file/appendrecord.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/closerecordfile.s b/libsrc/geos-common/file/closerecordfile.s index 1daa799a2..8ac739b8b 100644 --- a/libsrc/geos-common/file/closerecordfile.s +++ b/libsrc/geos-common/file/closerecordfile.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/deletefile.s b/libsrc/geos-common/file/deletefile.s index 4fb9dd7b0..cd7bade9b 100644 --- a/libsrc/geos-common/file/deletefile.s +++ b/libsrc/geos-common/file/deletefile.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/deleterecord.s b/libsrc/geos-common/file/deleterecord.s index fe40ad91d..be1a9863a 100644 --- a/libsrc/geos-common/file/deleterecord.s +++ b/libsrc/geos-common/file/deleterecord.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/findfile.s b/libsrc/geos-common/file/findfile.s index fe9c18912..2f3049915 100644 --- a/libsrc/geos-common/file/findfile.s +++ b/libsrc/geos-common/file/findfile.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/findftypes.s b/libsrc/geos-common/file/findftypes.s index 7cb485815..28e5fddff 100644 --- a/libsrc/geos-common/file/findftypes.s +++ b/libsrc/geos-common/file/findftypes.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -35,4 +34,5 @@ _FindFTypes: .bss -tmpFileMax: .res 1 +tmpFileMax: + .res 1 diff --git a/libsrc/geos-common/file/freefile.s b/libsrc/geos-common/file/freefile.s index e4a4344f5..a87620c09 100644 --- a/libsrc/geos-common/file/freefile.s +++ b/libsrc/geos-common/file/freefile.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/get1stdirentry.s b/libsrc/geos-common/file/get1stdirentry.s index 60b677914..675779f50 100644 --- a/libsrc/geos-common/file/get1stdirentry.s +++ b/libsrc/geos-common/file/get1stdirentry.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; diff --git a/libsrc/geos-common/file/getfhdrinfo.s b/libsrc/geos-common/file/getfhdrinfo.s index 55e7a49e2..a09694b14 100644 --- a/libsrc/geos-common/file/getfhdrinfo.s +++ b/libsrc/geos-common/file/getfhdrinfo.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/getfile.s b/libsrc/geos-common/file/getfile.s index f8bc908eb..b302df0c6 100644 --- a/libsrc/geos-common/file/getfile.s +++ b/libsrc/geos-common/file/getfile.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/getnxtdirentry.s b/libsrc/geos-common/file/getnxtdirentry.s index 72a7f68f4..a7246cff9 100644 --- a/libsrc/geos-common/file/getnxtdirentry.s +++ b/libsrc/geos-common/file/getnxtdirentry.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; diff --git a/libsrc/geos-common/file/insertrecord.s b/libsrc/geos-common/file/insertrecord.s index 1f5f886d8..75090322b 100644 --- a/libsrc/geos-common/file/insertrecord.s +++ b/libsrc/geos-common/file/insertrecord.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/nextrecord.s b/libsrc/geos-common/file/nextrecord.s index bad208a41..3be5528a0 100644 --- a/libsrc/geos-common/file/nextrecord.s +++ b/libsrc/geos-common/file/nextrecord.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/openrecordfile.s b/libsrc/geos-common/file/openrecordfile.s index 287bee71b..4361eaf3d 100644 --- a/libsrc/geos-common/file/openrecordfile.s +++ b/libsrc/geos-common/file/openrecordfile.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/pointrecord.s b/libsrc/geos-common/file/pointrecord.s index 4149dc4f2..299c30352 100644 --- a/libsrc/geos-common/file/pointrecord.s +++ b/libsrc/geos-common/file/pointrecord.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/previousrecord.s b/libsrc/geos-common/file/previousrecord.s index 560401891..bd514d2e0 100644 --- a/libsrc/geos-common/file/previousrecord.s +++ b/libsrc/geos-common/file/previousrecord.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/readbyte.s b/libsrc/geos-common/file/readbyte.s index e4408a3ec..72345af15 100644 --- a/libsrc/geos-common/file/readbyte.s +++ b/libsrc/geos-common/file/readbyte.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/readfile.s b/libsrc/geos-common/file/readfile.s index a74f224df..5dd33707d 100644 --- a/libsrc/geos-common/file/readfile.s +++ b/libsrc/geos-common/file/readfile.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/readrecord.s b/libsrc/geos-common/file/readrecord.s index 493e3b6dd..fb2faa95d 100644 --- a/libsrc/geos-common/file/readrecord.s +++ b/libsrc/geos-common/file/readrecord.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/renamefile.s b/libsrc/geos-common/file/renamefile.s index f0f2cec2f..a46a4f14e 100644 --- a/libsrc/geos-common/file/renamefile.s +++ b/libsrc/geos-common/file/renamefile.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/savefile.s b/libsrc/geos-common/file/savefile.s index 743e35bbb..65d9aee76 100644 --- a/libsrc/geos-common/file/savefile.s +++ b/libsrc/geos-common/file/savefile.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/sysremove.s b/libsrc/geos-common/file/sysremove.s index fc30f93be..0ae149aa0 100644 --- a/libsrc/geos-common/file/sysremove.s +++ b/libsrc/geos-common/file/sysremove.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/sysrename.s b/libsrc/geos-common/file/sysrename.s index 541c2cc60..cac878e19 100644 --- a/libsrc/geos-common/file/sysrename.s +++ b/libsrc/geos-common/file/sysrename.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/updaterecordfile.s b/libsrc/geos-common/file/updaterecordfile.s index b46440c6e..590643ff5 100644 --- a/libsrc/geos-common/file/updaterecordfile.s +++ b/libsrc/geos-common/file/updaterecordfile.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/file/writerecord.s b/libsrc/geos-common/file/writerecord.s index 13da13048..c495d069e 100644 --- a/libsrc/geos-common/file/writerecord.s +++ b/libsrc/geos-common/file/writerecord.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; diff --git a/libsrc/geos-common/graph/Makefile b/libsrc/geos-common/graph/Makefile index 9973a06fe..2c0a6e2bb 100644 --- a/libsrc/geos-common/graph/Makefile +++ b/libsrc/geos-common/graph/Makefile @@ -5,31 +5,31 @@ #-------------------------------------------------------------------------- # Object files -S_OBJS += drawline.o \ +S_OBJS += bitmapclip.o \ + bitmapregs.o \ + bitmapup.o \ + bitotherclip.o \ + drawline.o \ drawpoint.o \ framerectangle.o \ + getcharwidth.o \ + getintcharint.o \ + graphicsstring.o \ hlineregs.o \ horizontalline.o \ imprintrectangle.o \ + initdrawwindow.o \ invertline.o \ invertrectangle.o \ + loadcharset.o \ pointregs.o \ + put_char.o \ + putdecimal.o \ + putstring.o \ recoverline.o \ recoverrectangle.o \ rectangle.o \ - initdrawwindow.o \ setpattern.o \ testpoint.o \ - verticalline.o \ - put_char.o \ - putdecimal.o \ - putstring.o \ usesystemfont.o \ - getcharwidth.o \ - loadcharset.o \ - bitmapup.o \ - bitmapregs.o \ - bitmapclip.o \ - bitotherclip.o \ - graphicsstring.o \ - getintcharint.o + verticalline.o \ diff --git a/libsrc/geos-common/graph/bitmapclip.s b/libsrc/geos-common/graph/bitmapclip.s index 5785cb465..50e4e03b0 100644 --- a/libsrc/geos-common/graph/bitmapclip.s +++ b/libsrc/geos-common/graph/bitmapclip.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -14,12 +13,12 @@ .include "geossym.inc" _BitmapClip: - jsr BitmapRegs - jsr popax - sta r12L - stx r12H - jsr popa - sta r11H - jsr popa - sta r11L - jmp BitmapClip + jsr BitmapRegs + jsr popax + sta r12L + stx r12H + jsr popa + sta r11H + jsr popa + sta r11L + jmp BitmapClip diff --git a/libsrc/geos-common/graph/bitmapregs.s b/libsrc/geos-common/graph/bitmapregs.s index c1824ffd8..9ff45e872 100644 --- a/libsrc/geos-common/graph/bitmapregs.s +++ b/libsrc/geos-common/graph/bitmapregs.s @@ -1,22 +1,20 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; ; 21.12.99 .importzp ptr4 - .export BitmapRegs .include "geossym.inc" -BitmapRegs: ;a/x is a struct iconpic* - sta ptr4 - stx ptr4+1 - ldy #0 -bmpLp: lda (ptr4),y - sta r0L,y - iny - cpy #6 - bne bmpLp - rts +BitmapRegs: ; a/x is a struct iconpic* + sta ptr4 + stx ptr4+1 + ldy #0 +bmpLp: lda (ptr4),y + sta r0L,y + iny + cpy #6 + bne bmpLp + rts diff --git a/libsrc/geos-common/graph/bitmapup.s b/libsrc/geos-common/graph/bitmapup.s index dc87fe37e..214bf2357 100644 --- a/libsrc/geos-common/graph/bitmapup.s +++ b/libsrc/geos-common/graph/bitmapup.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -6,12 +5,11 @@ ; void BitmapUp (struct iconpic *myGfx); - .import BitmapRegs .export _BitmapUp .include "jumptab.inc" _BitmapUp: - jsr BitmapRegs - jmp BitmapUp + jsr BitmapRegs + jmp BitmapUp diff --git a/libsrc/geos-common/graph/bitotherclip.s b/libsrc/geos-common/graph/bitotherclip.s index 1d6ddabfa..5956ea738 100644 --- a/libsrc/geos-common/graph/bitotherclip.s +++ b/libsrc/geos-common/graph/bitotherclip.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -20,18 +19,18 @@ .include "geossym.inc" _BitOtherClip: - jsr BitOtherRegs - jsr popax - sta r12L - stx r12H - jsr popa - sta r11H - jsr popa - sta r11L - jsr popax - sta r14L - stx r14H - jsr popax - sta r13L - stx r13H - jmp BitOtherClip + jsr BitOtherRegs + jsr popax + sta r12L + stx r12H + jsr popa + sta r11H + jsr popa + sta r11L + jsr popax + sta r14L + stx r14H + jsr popax + sta r13L + stx r13H + jmp BitOtherClip diff --git a/libsrc/geos-common/graph/drawline.s b/libsrc/geos-common/graph/drawline.s index 79030561b..ebbdc645d 100644 --- a/libsrc/geos-common/graph/drawline.s +++ b/libsrc/geos-common/graph/drawline.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -16,16 +15,16 @@ .include "geosmac.ca65.inc" _DrawLine: - tay - PushW r2 - tya - jsr _InitDrawWindow - MoveW r2, r11 - PopW r2 - jsr popa - sta tmp1 - clc - bit tmp1 - bvc @1 - sec -@1: jmp DrawLine + tay + PushW r2 + tya + jsr _InitDrawWindow + MoveW r2, r11 + PopW r2 + jsr popa + sta tmp1 + clc + bit tmp1 + bvc @1 + sec +@1: jmp DrawLine diff --git a/libsrc/geos-common/graph/drawpoint.s b/libsrc/geos-common/graph/drawpoint.s index d8fac4dc1..6179d22d8 100644 --- a/libsrc/geos-common/graph/drawpoint.s +++ b/libsrc/geos-common/graph/drawpoint.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -6,7 +5,6 @@ ; void DrawPoint (char mode, struct pixel *mypixel); - .import PointRegs .import popa .importzp tmp1 @@ -15,11 +13,11 @@ .include "jumptab.inc" _DrawPoint: - jsr PointRegs - jsr popa - sta tmp1 - clc - bit tmp1 - bvc @1 - sec -@1: jmp DrawPoint + jsr PointRegs + jsr popa + sta tmp1 + clc + bit tmp1 + bvc @1 + sec +@1: jmp DrawPoint diff --git a/libsrc/geos-common/graph/framerectangle.s b/libsrc/geos-common/graph/framerectangle.s index d8bcc3cc5..f0f51d8fd 100644 --- a/libsrc/geos-common/graph/framerectangle.s +++ b/libsrc/geos-common/graph/framerectangle.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_FrameRectangle = FrameRectangle +_FrameRectangle = FrameRectangle diff --git a/libsrc/geos-common/graph/getcharwidth.s b/libsrc/geos-common/graph/getcharwidth.s index 0f971a8de..a98005f9a 100644 --- a/libsrc/geos-common/graph/getcharwidth.s +++ b/libsrc/geos-common/graph/getcharwidth.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -11,6 +10,6 @@ .include "jumptab.inc" _GetCharWidth: - jsr GetCharWidth - ldx #0 - rts + jsr GetCharWidth + ldx #0 + rts diff --git a/libsrc/geos-common/graph/getintcharint.s b/libsrc/geos-common/graph/getintcharint.s index 1c31df4ed..5b4088d21 100644 --- a/libsrc/geos-common/graph/getintcharint.s +++ b/libsrc/geos-common/graph/getintcharint.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,12 +9,12 @@ .include "geossym.inc" getintcharint: - sta r11L - stx r11H - jsr popa - sta r1H - jsr popax - sta r0L - stx r0H - rts + sta r11L + stx r11H + jsr popa + sta r1H + jsr popax + sta r0L + stx r0H + rts diff --git a/libsrc/geos-common/graph/graphicsstring.s b/libsrc/geos-common/graph/graphicsstring.s index 5dc3064a7..492b5e35c 100644 --- a/libsrc/geos-common/graph/graphicsstring.s +++ b/libsrc/geos-common/graph/graphicsstring.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -12,6 +11,6 @@ .include "geossym.inc" _GraphicsString: - sta r0L - stx r0H - jmp GraphicsString + sta r0L + stx r0H + jmp GraphicsString diff --git a/libsrc/geos-common/graph/hlineregs.s b/libsrc/geos-common/graph/hlineregs.s index 921081e28..836f85178 100644 --- a/libsrc/geos-common/graph/hlineregs.s +++ b/libsrc/geos-common/graph/hlineregs.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -6,17 +5,16 @@ .import popax, popa - .export HLineRegs .include "geossym.inc" HLineRegs: - stx r4H - sta r4L - jsr popax - stx r3H - sta r3L - jsr popa - sta r11L - rts + stx r4H + sta r4L + jsr popax + stx r3H + sta r3L + jsr popa + sta r11L + rts diff --git a/libsrc/geos-common/graph/horizontalline.s b/libsrc/geos-common/graph/horizontalline.s index 7d8ecf122..9b8a1c5d5 100644 --- a/libsrc/geos-common/graph/horizontalline.s +++ b/libsrc/geos-common/graph/horizontalline.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -8,12 +7,11 @@ .import popa .import HLineRegs - .export _HorizontalLine .include "jumptab.inc" _HorizontalLine: - jsr HLineRegs - jsr popa - jmp HorizontalLine + jsr HLineRegs + jsr popa + jmp HorizontalLine diff --git a/libsrc/geos-common/graph/imprintrectangle.s b/libsrc/geos-common/graph/imprintrectangle.s index 61cfb7fa3..0ac0c3092 100644 --- a/libsrc/geos-common/graph/imprintrectangle.s +++ b/libsrc/geos-common/graph/imprintrectangle.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; diff --git a/libsrc/geos-common/graph/initdrawwindow.s b/libsrc/geos-common/graph/initdrawwindow.s index e34ee5cd2..31e479065 100644 --- a/libsrc/geos-common/graph/initdrawwindow.s +++ b/libsrc/geos-common/graph/initdrawwindow.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -8,18 +7,17 @@ ; void InitDrawWindow (struct window *myWindow); .importzp ptr4 - .export _InitDrawWindow .include "geossym.inc" -_InitDrawWindow: ;a/x is a struct window* - sta ptr4 - stx ptr4+1 - ldy #0 -copyWin: lda (ptr4),y - sta r2L,y - iny - cpy #6 - bne copyWin - rts +_InitDrawWindow: ; a/x is a struct window* + sta ptr4 + stx ptr4+1 + ldy #0 +copyWin:lda (ptr4),y + sta r2L,y + iny + cpy #6 + bne copyWin + rts diff --git a/libsrc/geos-common/graph/invertline.s b/libsrc/geos-common/graph/invertline.s index 9456c7bf5..dcc68d40a 100644 --- a/libsrc/geos-common/graph/invertline.s +++ b/libsrc/geos-common/graph/invertline.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -12,5 +11,5 @@ .include "jumptab.inc" _InvertLine: - jsr HLineRegs - jmp InvertLine + jsr HLineRegs + jmp InvertLine diff --git a/libsrc/geos-common/graph/invertrectangle.s b/libsrc/geos-common/graph/invertrectangle.s index aac5176c4..3e2b1c71a 100644 --- a/libsrc/geos-common/graph/invertrectangle.s +++ b/libsrc/geos-common/graph/invertrectangle.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; diff --git a/libsrc/geos-common/graph/loadcharset.s b/libsrc/geos-common/graph/loadcharset.s index 503275023..a7e38a666 100644 --- a/libsrc/geos-common/graph/loadcharset.s +++ b/libsrc/geos-common/graph/loadcharset.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -12,6 +11,6 @@ .include "geossym.inc" _LoadCharSet: - sta r0L - stx r0H - jmp LoadCharSet + sta r0L + stx r0H + jmp LoadCharSet diff --git a/libsrc/geos-common/graph/pointregs.s b/libsrc/geos-common/graph/pointregs.s index a9cef94e8..edff38212 100644 --- a/libsrc/geos-common/graph/pointregs.s +++ b/libsrc/geos-common/graph/pointregs.s @@ -1,25 +1,23 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; ; 29.10.99 .importzp ptr4 - .export PointRegs .include "geossym.inc" -PointRegs: ;a/x is a struct pixel* - sta ptr4 - stx ptr4+1 - ldy #0 - lda (ptr4),y - sta r3L - iny - lda (ptr4),y - sta r3H - iny - lda (ptr4),y - sta r11L - rts +PointRegs: ; a/x is a struct pixel* + sta ptr4 + stx ptr4+1 + ldy #0 + lda (ptr4),y + sta r3L + iny + lda (ptr4),y + sta r3H + iny + lda (ptr4),y + sta r11L + rts diff --git a/libsrc/geos-common/graph/put_char.s b/libsrc/geos-common/graph/put_char.s index 7f7066866..bc22a70cb 100644 --- a/libsrc/geos-common/graph/put_char.s +++ b/libsrc/geos-common/graph/put_char.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -13,9 +12,9 @@ .include "geossym.inc" _PutChar: - sta r11L - stx r11H - jsr popa - sta r1H - jsr popa - jmp PutChar + sta r11L + stx r11H + jsr popa + sta r1H + jsr popa + jmp PutChar diff --git a/libsrc/geos-common/graph/putdecimal.s b/libsrc/geos-common/graph/putdecimal.s index 918d0bd4f..f3602c3d4 100644 --- a/libsrc/geos-common/graph/putdecimal.s +++ b/libsrc/geos-common/graph/putdecimal.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -13,6 +12,6 @@ .include "jumptab.inc" _PutDecimal: - jsr getintcharint - jsr popa - jmp PutDecimal + jsr getintcharint + jsr popa + jmp PutDecimal diff --git a/libsrc/geos-common/graph/putstring.s b/libsrc/geos-common/graph/putstring.s index a962be2a2..4c333f3ab 100644 --- a/libsrc/geos-common/graph/putstring.s +++ b/libsrc/geos-common/graph/putstring.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -13,5 +12,5 @@ .include "jumptab.inc" _PutString: - jsr getintcharint - jmp PutString + jsr getintcharint + jmp PutString diff --git a/libsrc/geos-common/graph/recoverline.s b/libsrc/geos-common/graph/recoverline.s index 181507b0b..6d4626cb3 100644 --- a/libsrc/geos-common/graph/recoverline.s +++ b/libsrc/geos-common/graph/recoverline.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -7,12 +6,11 @@ ; void RecoverLine (char y, int xstart, int xend); .import HLineRegs - .export _RecoverLine .include "jumptab.inc" _RecoverLine: - jsr HLineRegs - jmp RecoverLine + jsr HLineRegs + jmp RecoverLine diff --git a/libsrc/geos-common/graph/recoverrectangle.s b/libsrc/geos-common/graph/recoverrectangle.s index da0a5c496..077b342e0 100644 --- a/libsrc/geos-common/graph/recoverrectangle.s +++ b/libsrc/geos-common/graph/recoverrectangle.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; diff --git a/libsrc/geos-common/graph/rectangle.s b/libsrc/geos-common/graph/rectangle.s index b3afafae1..f0f11e4e3 100644 --- a/libsrc/geos-common/graph/rectangle.s +++ b/libsrc/geos-common/graph/rectangle.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_Rectangle = Rectangle +_Rectangle = Rectangle diff --git a/libsrc/geos-common/graph/setpattern.s b/libsrc/geos-common/graph/setpattern.s index 1f437da06..d81019f32 100644 --- a/libsrc/geos-common/graph/setpattern.s +++ b/libsrc/geos-common/graph/setpattern.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_SetPattern = SetPattern +_SetPattern = SetPattern diff --git a/libsrc/geos-common/graph/testpoint.s b/libsrc/geos-common/graph/testpoint.s index 11af3daff..6bf28589a 100644 --- a/libsrc/geos-common/graph/testpoint.s +++ b/libsrc/geos-common/graph/testpoint.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -13,8 +12,8 @@ .include "jumptab.inc" _TestPoint: - jsr PointRegs - jsr TestPoint - bcc goFalse - jmp return1 -goFalse: jmp return0 + jsr PointRegs + jsr TestPoint + bcc goFalse + jmp return1 +goFalse:jmp return0 diff --git a/libsrc/geos-common/graph/usesystemfont.s b/libsrc/geos-common/graph/usesystemfont.s index 4c732d5aa..3d72e7cf5 100644 --- a/libsrc/geos-common/graph/usesystemfont.s +++ b/libsrc/geos-common/graph/usesystemfont.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_UseSystemFont = UseSystemFont +_UseSystemFont = UseSystemFont diff --git a/libsrc/geos-common/graph/verticalline.s b/libsrc/geos-common/graph/verticalline.s index a80bdd6fc..12355aaab 100644 --- a/libsrc/geos-common/graph/verticalline.s +++ b/libsrc/geos-common/graph/verticalline.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -6,19 +5,18 @@ ; void VerticalLine (char pattern, char ystart, char yend, int x); - .import popa - + .import popa .export _VerticalLine .include "jumptab.inc" .include "geossym.inc" _VerticalLine: - stx r4H - sta r4L - jsr popa - sta r3H - jsr popa - sta r3L - jsr popa - jmp VerticalLine + stx r4H + sta r4L + jsr popa + sta r3H + jsr popa + sta r3L + jsr popa + jmp VerticalLine