From 00ddcaeb93004cf14b39ee36a7c57a91e1805ad4 Mon Sep 17 00:00:00 2001 From: "ol.sc" Date: Wed, 8 Feb 2012 16:13:01 +0000 Subject: [PATCH] Normalized coding style. git-svn-id: svn://svn.cc65.org/cc65/trunk@5499 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/geos-common/memory/Makefile | 16 ++++---- libsrc/geos-common/memory/clearram.s | 19 ++++----- libsrc/geos-common/memory/cmpfstring.s | 15 ++++--- libsrc/geos-common/memory/cmpstring.s | 11 +++-- libsrc/geos-common/memory/copyfstring.s | 9 ++-- libsrc/geos-common/memory/copystring.s | 5 +-- libsrc/geos-common/memory/crc.s | 11 +++-- libsrc/geos-common/memory/doublepop.s | 13 +++--- libsrc/geos-common/memory/doublespop.s | 19 ++++----- libsrc/geos-common/memory/fillram.s | 31 +++++++------- libsrc/geos-common/memory/initram.s | 7 ++-- libsrc/geos-common/memory/movedata.s | 25 ++++++----- libsrc/geos-common/menuicon/Makefile | 10 ++--- libsrc/geos-common/menuicon/doicons.s | 7 ++-- libsrc/geos-common/menuicon/domenu.s | 9 ++-- libsrc/geos-common/menuicon/dopreviousmenu.s | 3 +- libsrc/geos-common/menuicon/gotofirstmenu.s | 3 +- libsrc/geos-common/menuicon/recoverallmenus.s | 1 - libsrc/geos-common/menuicon/recovermenu.s | 3 +- libsrc/geos-common/menuicon/redomenu.s | 3 +- libsrc/geos-common/mousesprite/Makefile | 16 ++++---- .../geos-common/mousesprite/clearmousemode.s | 3 +- libsrc/geos-common/mousesprite/disablsprite.s | 5 +-- libsrc/geos-common/mousesprite/drawsprite.s | 14 +++---- libsrc/geos-common/mousesprite/enablsprite.s | 5 +-- libsrc/geos-common/mousesprite/getnextchar.s | 9 ++-- .../geos-common/mousesprite/inittextprompt.s | 1 - .../geos-common/mousesprite/ismseinregion.s | 10 ++--- libsrc/geos-common/mousesprite/mouseoff.s | 3 +- libsrc/geos-common/mousesprite/mouseup.s | 3 +- libsrc/geos-common/mousesprite/possprite.s | 31 +++++++------- libsrc/geos-common/mousesprite/promptoff.s | 3 +- libsrc/geos-common/mousesprite/prompton.s | 20 ++++----- .../geos-common/mousesprite/startmousemode.s | 5 +-- libsrc/geos-common/process/Makefile | 4 +- libsrc/geos-common/process/processblock.s | 11 ++--- libsrc/geos-common/process/processfreeze.s | 11 ++--- .../process/processinitrestartenable.s | 20 ++++----- libsrc/geos-common/process/processsleep.s | 41 +++++++++---------- 39 files changed, 193 insertions(+), 242 deletions(-) diff --git a/libsrc/geos-common/memory/Makefile b/libsrc/geos-common/memory/Makefile index e5fb77aff..61585a539 100644 --- a/libsrc/geos-common/memory/Makefile +++ b/libsrc/geos-common/memory/Makefile @@ -5,14 +5,14 @@ #-------------------------------------------------------------------------- # Object files -S_OBJS += crc.o \ +S_OBJS += clearram.o \ + cmpfstring.o \ + cmpstring.o \ + copyfstring.o \ + copystring.o \ + crc.o \ doublepop.o \ - clearram.o \ + doublespop.o \ fillram.o \ initram.o \ - movedata.o \ - doublespop.o \ - copystring.o \ - cmpstring.o \ - copyfstring.o \ - cmpfstring.o + movedata.o diff --git a/libsrc/geos-common/memory/clearram.s b/libsrc/geos-common/memory/clearram.s index 11e578dbe..3984f8a67 100644 --- a/libsrc/geos-common/memory/clearram.s +++ b/libsrc/geos-common/memory/clearram.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -13,13 +12,13 @@ .include "geossym.inc" _ClearRam: - jsr DoublePop - pha - txa - pha - jsr ClearRam - pla - tax - pla - rts + jsr DoublePop + pha + txa + pha + jsr ClearRam + pla + tax + pla + rts diff --git a/libsrc/geos-common/memory/cmpfstring.s b/libsrc/geos-common/memory/cmpfstring.s index b4aeb6845..4b5d42511 100644 --- a/libsrc/geos-common/memory/cmpfstring.s +++ b/libsrc/geos-common/memory/cmpfstring.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -13,10 +12,10 @@ .include "jumptab.inc" _CmpFString: - jsr DoubleSPop - jsr popa - jsr SetPtrXY - jsr CmpFString - bne L1 - jmp return0 -L1: jmp return1 + jsr DoubleSPop + jsr popa + jsr SetPtrXY + jsr CmpFString + bne L1 + jmp return0 +L1: jmp return1 diff --git a/libsrc/geos-common/memory/cmpstring.s b/libsrc/geos-common/memory/cmpstring.s index 532c50928..fc4ba8c3d 100644 --- a/libsrc/geos-common/memory/cmpstring.s +++ b/libsrc/geos-common/memory/cmpstring.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -13,8 +12,8 @@ .include "jumptab.inc" _CmpString: - jsr DoubleSPop - jsr CmpString - bne L1 - jmp return0 -L1: jmp return1 + jsr DoubleSPop + jsr CmpString + bne L1 + jmp return0 +L1: jmp return1 diff --git a/libsrc/geos-common/memory/copyfstring.s b/libsrc/geos-common/memory/copyfstring.s index bb963743e..6d84e4e82 100644 --- a/libsrc/geos-common/memory/copyfstring.s +++ b/libsrc/geos-common/memory/copyfstring.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -13,7 +12,7 @@ .include "jumptab.inc" _CopyFString: - jsr DoubleSPop - jsr popa - jsr SetPtrXY - jmp CopyFString + jsr DoubleSPop + jsr popa + jsr SetPtrXY + jmp CopyFString diff --git a/libsrc/geos-common/memory/copystring.s b/libsrc/geos-common/memory/copystring.s index 60a1aa02b..3f4941fbb 100644 --- a/libsrc/geos-common/memory/copystring.s +++ b/libsrc/geos-common/memory/copystring.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -12,5 +11,5 @@ .include "jumptab.inc" _CopyString: - jsr DoubleSPop - jmp CopyString + jsr DoubleSPop + jmp CopyString diff --git a/libsrc/geos-common/memory/crc.s b/libsrc/geos-common/memory/crc.s index 7f6f98e56..69908b3f2 100644 --- a/libsrc/geos-common/memory/crc.s +++ b/libsrc/geos-common/memory/crc.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -13,9 +12,9 @@ .include "geossym.inc" _CRC: - jsr DoublePop - jsr CRC - lda r2L - ldx r2H - rts + jsr DoublePop + jsr CRC + lda r2L + ldx r2H + rts \ No newline at end of file diff --git a/libsrc/geos-common/memory/doublepop.s b/libsrc/geos-common/memory/doublepop.s index 855265e92..f5fdb548c 100644 --- a/libsrc/geos-common/memory/doublepop.s +++ b/libsrc/geos-common/memory/doublepop.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,9 +9,9 @@ .include "geossym.inc" DoublePop: - sta r0L - stx r0H - jsr popax - sta r1L - stx r1H - rts + sta r0L + stx r0H + jsr popax + sta r1L + stx r1H + rts diff --git a/libsrc/geos-common/memory/doublespop.s b/libsrc/geos-common/memory/doublespop.s index 6a1165f3c..e8541207c 100644 --- a/libsrc/geos-common/memory/doublespop.s +++ b/libsrc/geos-common/memory/doublespop.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -12,17 +11,17 @@ .include "geossym.inc" DoubleSPop: - sta ptr4 - stx ptr4+1 - jsr popax - sta ptr3 - stx ptr3+1 -; rts + sta ptr4 + stx ptr4+1 + jsr popax + sta ptr3 + stx ptr3+1 +; rts ; ; SetPtrXY can be sometimes executed twice, but even this way it is few cycles ; faster... SetPtrXY: - ldx #ptr4 - ldy #ptr3 - rts + ldx #ptr4 + ldy #ptr3 + rts diff --git a/libsrc/geos-common/memory/fillram.s b/libsrc/geos-common/memory/fillram.s index f2eb51fbe..d67b4f242 100644 --- a/libsrc/geos-common/memory/fillram.s +++ b/libsrc/geos-common/memory/fillram.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -13,18 +12,18 @@ .include "geossym.inc" _FillRam: - sta r0L - stx r0H - jsr popa - sta r2L - jsr popax - sta r1L - stx r1H - pha - txa - pha - jsr FillRam - pla - tax - pla - rts + sta r0L + stx r0H + jsr popa + sta r2L + jsr popax + sta r1L + stx r1H + pha + txa + pha + jsr FillRam + pla + tax + pla + rts diff --git a/libsrc/geos-common/memory/initram.s b/libsrc/geos-common/memory/initram.s index 6127985a0..19953694f 100644 --- a/libsrc/geos-common/memory/initram.s +++ b/libsrc/geos-common/memory/initram.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -12,6 +11,6 @@ .include "geossym.inc" _InitRam: - sta r0L - stx r0H - jmp InitRam + sta r0L + stx r0H + jmp InitRam diff --git a/libsrc/geos-common/memory/movedata.s b/libsrc/geos-common/memory/movedata.s index 656285df5..c5134bef3 100644 --- a/libsrc/geos-common/memory/movedata.s +++ b/libsrc/geos-common/memory/movedata.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -13,15 +12,15 @@ .include "geossym.inc" _MoveData: - sta r2L - stx r2H - jsr popax - sta r0L - stx r0H - jsr popax - sta r1L - stx r1H - jsr MoveData - lda r1L ; return dest ptr to be compatible with memmove and memcpy - ldx r1H - rts + sta r2L + stx r2H + jsr popax + sta r0L + stx r0H + jsr popax + sta r1L + stx r1H + jsr MoveData + lda r1L ; return dest ptr to be compatible with memmove and memcpy + ldx r1H + rts diff --git a/libsrc/geos-common/menuicon/Makefile b/libsrc/geos-common/menuicon/Makefile index 9460a7ce7..bfa9a89fb 100644 --- a/libsrc/geos-common/menuicon/Makefile +++ b/libsrc/geos-common/menuicon/Makefile @@ -5,10 +5,10 @@ #-------------------------------------------------------------------------- # Object files -S_OBJS += domenu.o \ +S_OBJS += doicons.o \ + domenu.o \ dopreviousmenu.o \ - redomenu.o \ - recovermenu.o \ - recoverallmenus.o \ gotofirstmenu.o \ - doicons.o + recoverallmenus.o \ + recovermenu.o \ + redomenu.o diff --git a/libsrc/geos-common/menuicon/doicons.s b/libsrc/geos-common/menuicon/doicons.s index 60db81303..6213f9923 100644 --- a/libsrc/geos-common/menuicon/doicons.s +++ b/libsrc/geos-common/menuicon/doicons.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -12,6 +11,6 @@ .include "geossym.inc" _DoIcons: - sta r0L - stx r0H - jmp DoIcons \ No newline at end of file + sta r0L + stx r0H + jmp DoIcons \ No newline at end of file diff --git a/libsrc/geos-common/menuicon/domenu.s b/libsrc/geos-common/menuicon/domenu.s index 1cbaacdad..fb741de1d 100644 --- a/libsrc/geos-common/menuicon/domenu.s +++ b/libsrc/geos-common/menuicon/domenu.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -12,7 +11,7 @@ .include "geossym.inc" _DoMenu: - sta r0L - stx r0H - lda #0 - jmp DoMenu \ No newline at end of file + sta r0L + stx r0H + lda #0 + jmp DoMenu \ No newline at end of file diff --git a/libsrc/geos-common/menuicon/dopreviousmenu.s b/libsrc/geos-common/menuicon/dopreviousmenu.s index dcda2fe71..1b27e2622 100644 --- a/libsrc/geos-common/menuicon/dopreviousmenu.s +++ b/libsrc/geos-common/menuicon/dopreviousmenu.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_DoPreviousMenu = DoPreviousMenu \ No newline at end of file +_DoPreviousMenu = DoPreviousMenu \ No newline at end of file diff --git a/libsrc/geos-common/menuicon/gotofirstmenu.s b/libsrc/geos-common/menuicon/gotofirstmenu.s index 0695979d1..110061a4e 100644 --- a/libsrc/geos-common/menuicon/gotofirstmenu.s +++ b/libsrc/geos-common/menuicon/gotofirstmenu.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_GotoFirstMenu = GotoFirstMenu \ No newline at end of file +_GotoFirstMenu = GotoFirstMenu \ No newline at end of file diff --git a/libsrc/geos-common/menuicon/recoverallmenus.s b/libsrc/geos-common/menuicon/recoverallmenus.s index 86675c97d..02af28d4c 100644 --- a/libsrc/geos-common/menuicon/recoverallmenus.s +++ b/libsrc/geos-common/menuicon/recoverallmenus.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; diff --git a/libsrc/geos-common/menuicon/recovermenu.s b/libsrc/geos-common/menuicon/recovermenu.s index bd254f199..e803eeb7d 100644 --- a/libsrc/geos-common/menuicon/recovermenu.s +++ b/libsrc/geos-common/menuicon/recovermenu.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_RecoverMenu = RecoverMenu \ No newline at end of file +_RecoverMenu = RecoverMenu \ No newline at end of file diff --git a/libsrc/geos-common/menuicon/redomenu.s b/libsrc/geos-common/menuicon/redomenu.s index ce1108ad5..5c76abe05 100644 --- a/libsrc/geos-common/menuicon/redomenu.s +++ b/libsrc/geos-common/menuicon/redomenu.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_ReDoMenu = ReDoMenu \ No newline at end of file +_ReDoMenu = ReDoMenu \ No newline at end of file diff --git a/libsrc/geos-common/mousesprite/Makefile b/libsrc/geos-common/mousesprite/Makefile index 054546e64..bf49424d3 100644 --- a/libsrc/geos-common/mousesprite/Makefile +++ b/libsrc/geos-common/mousesprite/Makefile @@ -5,16 +5,16 @@ #-------------------------------------------------------------------------- # Object files -S_OBJS += startmousemode.o \ - clearmousemode.o \ - mouseup.o \ - mouseoff.o \ +S_OBJS += clearmousemode.o \ + disablsprite.o \ drawsprite.o \ - possprite.o \ enablsprite.o \ - disablsprite.o \ - ismseinregion.o \ + getnextchar.o \ inittextprompt.o \ + ismseinregion.o \ + mouseoff.o \ + mouseup.o \ + possprite.o \ promptoff.o \ prompton.o \ - getnextchar.o + startmousemode.o \ No newline at end of file diff --git a/libsrc/geos-common/mousesprite/clearmousemode.s b/libsrc/geos-common/mousesprite/clearmousemode.s index 17186cc9d..a747b1435 100644 --- a/libsrc/geos-common/mousesprite/clearmousemode.s +++ b/libsrc/geos-common/mousesprite/clearmousemode.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_ClearMouseMode = ClearMouseMode \ No newline at end of file +_ClearMouseMode = ClearMouseMode \ No newline at end of file diff --git a/libsrc/geos-common/mousesprite/disablsprite.s b/libsrc/geos-common/mousesprite/disablsprite.s index 37625d361..c9f6d5266 100644 --- a/libsrc/geos-common/mousesprite/disablsprite.s +++ b/libsrc/geos-common/mousesprite/disablsprite.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -12,5 +11,5 @@ .include "geossym.inc" _DisablSprite: - sta r3L - jmp DisablSprite \ No newline at end of file + sta r3L + jmp DisablSprite \ No newline at end of file diff --git a/libsrc/geos-common/mousesprite/drawsprite.s b/libsrc/geos-common/mousesprite/drawsprite.s index c5a071ebf..176cd296a 100644 --- a/libsrc/geos-common/mousesprite/drawsprite.s +++ b/libsrc/geos-common/mousesprite/drawsprite.s @@ -1,12 +1,9 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; ; 30.10.99 -; ; void DrawSprite (char spritenum, char *tab63 ); -; .import popa .export _DrawSprite @@ -15,9 +12,8 @@ .include "geossym.inc" _DrawSprite: - - sta r4L - stx r4H - jsr popa - sta r3L - jmp DrawSprite \ No newline at end of file + sta r4L + stx r4H + jsr popa + sta r3L + jmp DrawSprite \ No newline at end of file diff --git a/libsrc/geos-common/mousesprite/enablsprite.s b/libsrc/geos-common/mousesprite/enablsprite.s index 7c8328421..8712724b0 100644 --- a/libsrc/geos-common/mousesprite/enablsprite.s +++ b/libsrc/geos-common/mousesprite/enablsprite.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -12,5 +11,5 @@ .include "geossym.inc" _EnablSprite: - sta r3L - jmp EnablSprite \ No newline at end of file + sta r3L + jmp EnablSprite \ No newline at end of file diff --git a/libsrc/geos-common/mousesprite/getnextchar.s b/libsrc/geos-common/mousesprite/getnextchar.s index 0ddbf1e99..ab495cd44 100644 --- a/libsrc/geos-common/mousesprite/getnextchar.s +++ b/libsrc/geos-common/mousesprite/getnextchar.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -12,7 +11,7 @@ .include "jumptab.inc" _GetNextChar: - jsr GetNextChar - ldx #0 - tay ; preserve Z flag - rts + jsr GetNextChar + ldx #0 + tay ; preserve Z flag + rts diff --git a/libsrc/geos-common/mousesprite/inittextprompt.s b/libsrc/geos-common/mousesprite/inittextprompt.s index 21c213544..342ad0ce8 100644 --- a/libsrc/geos-common/mousesprite/inittextprompt.s +++ b/libsrc/geos-common/mousesprite/inittextprompt.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; diff --git a/libsrc/geos-common/mousesprite/ismseinregion.s b/libsrc/geos-common/mousesprite/ismseinregion.s index 554ca58ef..c487e29cd 100644 --- a/libsrc/geos-common/mousesprite/ismseinregion.s +++ b/libsrc/geos-common/mousesprite/ismseinregion.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; @@ -7,13 +6,12 @@ ; char IsMseInRegion (struct window *mywindow); .import _InitDrawWindow - .export _IsMseInRegion .include "jumptab.inc" _IsMseInRegion: - jsr _InitDrawWindow - jsr IsMseInRegion - ldx #0 - rts + jsr _InitDrawWindow + jsr IsMseInRegion + ldx #0 + rts diff --git a/libsrc/geos-common/mousesprite/mouseoff.s b/libsrc/geos-common/mousesprite/mouseoff.s index 84f34701d..d60428c34 100644 --- a/libsrc/geos-common/mousesprite/mouseoff.s +++ b/libsrc/geos-common/mousesprite/mouseoff.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_MouseOff = MouseOff \ No newline at end of file +_MouseOff = MouseOff \ No newline at end of file diff --git a/libsrc/geos-common/mousesprite/mouseup.s b/libsrc/geos-common/mousesprite/mouseup.s index 08f831ce4..1b4365271 100644 --- a/libsrc/geos-common/mousesprite/mouseup.s +++ b/libsrc/geos-common/mousesprite/mouseup.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_MouseUp = MouseUp \ No newline at end of file +_MouseUp = MouseUp \ No newline at end of file diff --git a/libsrc/geos-common/mousesprite/possprite.s b/libsrc/geos-common/mousesprite/possprite.s index 1ffda37b4..e8e131f14 100644 --- a/libsrc/geos-common/mousesprite/possprite.s +++ b/libsrc/geos-common/mousesprite/possprite.s @@ -1,12 +1,9 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; ; 30.10.99 -; ; void PosSprite (char spritenum, struct pixel *position ); -; .importzp ptr4 .import popa @@ -16,17 +13,17 @@ .include "geossym.inc" _PosSprite: - sta ptr4 - stx ptr4+1 - ldy #0 - lda (ptr4),y - sta r4L - iny - lda (ptr4),y - sta r4H - iny - lda (ptr4),y - sta r5L - jsr popa - sta r3L - jmp PosSprite \ No newline at end of file + sta ptr4 + stx ptr4+1 + ldy #0 + lda (ptr4),y + sta r4L + iny + lda (ptr4),y + sta r4H + iny + lda (ptr4),y + sta r5L + jsr popa + sta r3L + jmp PosSprite \ No newline at end of file diff --git a/libsrc/geos-common/mousesprite/promptoff.s b/libsrc/geos-common/mousesprite/promptoff.s index 11088cb59..741bb629b 100644 --- a/libsrc/geos-common/mousesprite/promptoff.s +++ b/libsrc/geos-common/mousesprite/promptoff.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -10,4 +9,4 @@ .include "jumptab.inc" -_PromptOff = PromptOff \ No newline at end of file +_PromptOff = PromptOff diff --git a/libsrc/geos-common/mousesprite/prompton.s b/libsrc/geos-common/mousesprite/prompton.s index 3de1b01f4..3390bdf63 100644 --- a/libsrc/geos-common/mousesprite/prompton.s +++ b/libsrc/geos-common/mousesprite/prompton.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -13,12 +12,13 @@ .include "geossym.inc" _PromptOn: - sta ptr4 - stx ptr4+1 - ldy #0 -promptLp: lda (ptr4),y - sta stringX,y - iny - cpy #3 - bne promptLp - jmp PromptOn \ No newline at end of file + sta ptr4 + stx ptr4+1 + ldy #0 +promptLp: + lda (ptr4),y + sta stringX,y + iny + cpy #3 + bne promptLp + jmp PromptOn diff --git a/libsrc/geos-common/mousesprite/startmousemode.s b/libsrc/geos-common/mousesprite/startmousemode.s index cefde425e..a64e1816e 100644 --- a/libsrc/geos-common/mousesprite/startmousemode.s +++ b/libsrc/geos-common/mousesprite/startmousemode.s @@ -1,4 +1,3 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; @@ -11,5 +10,5 @@ .include "jumptab.inc" _StartMouseMode: - clc - jmp StartMouseMode \ No newline at end of file + clc + jmp StartMouseMode \ No newline at end of file diff --git a/libsrc/geos-common/process/Makefile b/libsrc/geos-common/process/Makefile index e214f01c8..de9130679 100644 --- a/libsrc/geos-common/process/Makefile +++ b/libsrc/geos-common/process/Makefile @@ -5,7 +5,7 @@ #-------------------------------------------------------------------------- # Object files -S_OBJS += processinitrestartenable.o \ - processblock.o \ +S_OBJS += processblock.o \ processfreeze.o \ + processinitrestartenable.o \ processsleep.o diff --git a/libsrc/geos-common/process/processblock.s b/libsrc/geos-common/process/processblock.s index 94928894e..c7358f39e 100644 --- a/libsrc/geos-common/process/processblock.s +++ b/libsrc/geos-common/process/processblock.s @@ -1,15 +1,12 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; ; 27.10.99 -; ; void InitProcesses (char number, struct process* proctab); ; (rest) ; void BlockProcess (char number); ; void UnBlockProcess (char number); -; .export _BlockProcess .export _UnBlockProcess @@ -17,9 +14,9 @@ .include "jumptab.inc" _BlockProcess: - tax - jmp BlockProcess + tax + jmp BlockProcess _UnBlockProcess: - tax - jmp UnBlockProcess + tax + jmp UnBlockProcess diff --git a/libsrc/geos-common/process/processfreeze.s b/libsrc/geos-common/process/processfreeze.s index eb6b22019..7a96af50d 100644 --- a/libsrc/geos-common/process/processfreeze.s +++ b/libsrc/geos-common/process/processfreeze.s @@ -1,13 +1,10 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; ; 27.10.99 -; ; void FreezeProcess (char number); ; void UnFreezeProcess (char number); -; .export _FreezeProcess .export _UnFreezeProcess @@ -15,9 +12,9 @@ .include "jumptab.inc" _FreezeProcess: - tax - jmp FreezeProcess + tax + jmp FreezeProcess _UnFreezeProcess: - tax - jmp UnFreezeProcess + tax + jmp UnFreezeProcess diff --git a/libsrc/geos-common/process/processinitrestartenable.s b/libsrc/geos-common/process/processinitrestartenable.s index 5a0f33ac3..75b804c77 100644 --- a/libsrc/geos-common/process/processinitrestartenable.s +++ b/libsrc/geos-common/process/processinitrestartenable.s @@ -1,14 +1,11 @@ - ; ; Maciej 'YTM/Alliance' Witkowiak ; ; 27.10.99 -; ; void InitProcesses (char number, struct process* proctab); ; void RestartProcess (char number); ; void EnableProcess (char number); -; .import popa .export _InitProcesses @@ -19,16 +16,15 @@ .include "geossym.inc" _InitProcesses: - - sta r0L - stx r0H - jsr popa - jmp InitProcesses + sta r0L + stx r0H + jsr popa + jmp InitProcesses _RestartProcess: - tax - jmp RestartProcess + tax + jmp RestartProcess _EnableProcess: - tax - jmp EnableProcess + tax + jmp EnableProcess diff --git a/libsrc/geos-common/process/processsleep.s b/libsrc/geos-common/process/processsleep.s index e44ecd2eb..3abb39cf7 100644 --- a/libsrc/geos-common/process/processsleep.s +++ b/libsrc/geos-common/process/processsleep.s @@ -1,37 +1,34 @@ - ; ; Maciej 'YTM/Elysium' Witkowiak ; ; 30.10.99, 15.8.2003 -; ; void Sleep (int jiffies); -; + .importzp ptr1 + .importzp tmp1 .export _Sleep .include "jumptab.inc" .include "geossym.inc" - .importzp ptr1 - .importzp tmp1 _SleepExit: - jsr Sleep ; call Sleep - ldx tmp1 - txs ; restore stack pointer - jmp (ptr1) ; when timeouts control will reach here + jsr Sleep ; call Sleep + ldx tmp1 + txs ; restore stack pointer + jmp (ptr1) ; when timeouts control will reach here _Sleep: - sta r0L ; store data - stx r0H - pla - sta ptr1 - pla - sta ptr1+1 ; preserve return address - inc ptr1 - bne @L0 - inc ptr1+1 ; fix return address -@L0: tsx - stx tmp1 ; preserve stack pointer - jsr _SleepExit ; call Sleep - jmp MainLoop ; immediate return here - go to idle loop + sta r0L ; store data + stx r0H + pla + sta ptr1 + pla + sta ptr1+1 ; preserve return address + inc ptr1 + bne @L0 + inc ptr1+1 ; fix return address +@L0: tsx + stx tmp1 ; preserve stack pointer + jsr _SleepExit ; call Sleep + jmp MainLoop ; immediate return here - go to idle loop -- 2.39.5