Normalized coding style.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5499 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/geos-common/memory/Makefile b/libsrc/geos-common/memory/Makefile
index e5fb77aff861dec5fd78b27f1688a3b6b90dbe3c..61585a539436decae6b147346c7ed5e9f95aeb7f 100644 (file)
--- 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 11e578dbe1d43207b9bc769d07d2689716e567bd..3984f8a67d37cc3732fd1ea5471af645fc09e6dc 100644 (file)
--- 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 b4aeb6845f63f41d40675283c6a113a818a0e97f..4b5d4251199a4ada1ff11ac7f0c7fa90eb6f5a01 100644 (file)
--- 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 532c50928f59a9720b8d9384954ed6739b6fcc73..fc4ba8c3d1597854e4e34dcdf98dba74d6972993 100644 (file)
--- 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 bb963743e0240da219fb86426707a494256eb0b9..6d84e4e82cb87a94c0823f141b135f783169b439 100644 (file)
--- 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 60a1aa02bb0fcb4a48d40b2a608a68b52ceff8d1..3f4941fbbc9dde604673179e6585fa1d45089ec9 100644 (file)
--- 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 7f6f98e569ca8d20934b8fe692e6915769498da8..69908b3f2d9944be4ae0e9c22635b7030b5f7d5a 100644 (file)
--- 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 855265e92206b4b430c2a902c8c9cdcd7effde80..f5fdb548cb12ae79eee12e4241c2b6781ddd1395 100644 (file)
--- 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 6a1165f3c22ac37099febc516c3ab379aa49a7fd..e8541207c326a09ce90701aedafcff9e5f36cd45 100644 (file)
--- 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 f2eb51fbe715f3a0c6f03676dbdb6bd0cb095168..d67b4f242a2d66c0524c746ecf6a8facdc17942f 100644 (file)
--- 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 6127985a0c357ee956b47019ab892cb1286f45d0..19953694fa1b2502023085169ba76ba0c96950c7 100644 (file)
--- 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 656285df5a962899ad9f33d68c2b3c95c5575007..c5134bef327e45a262541463031dcf3257d1fb24 100644 (file)
--- 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 9460a7ce77725ab3bcdd5a70344b7645182912c1..bfa9a89fbe09d4a9db3ad4fe62149ed873e92aa3 100644 (file)
--- 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 60db813039ddac00507734added958e4e96bc66d..6213f992359f621e3ace7cdc924a4b632f56382f 100644 (file)
--- 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 1cbaacdad1be7e91d44c184cff002f9117f5cdeb..fb741de1df4889db9ca4323a2b64b212e33a99c8 100644 (file)
--- 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 dcda2fe71803ec4fdab51c440ad7da5961b33866..1b27e262236fb4c1a7d978955ff708c4a1f1a1d7 100644 (file)
--- 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 0695979d1ccbb724ff924f4356479456b8865d5a..110061a4eb2b5be5f0ac925008ce10067a8dd049 100644 (file)
--- 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 86675c97decbc38560245a9df51af97c91ab1927..02af28d4ce1eb25c61d904505a215a61c7a260b1 100644 (file)
--- 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 bd254f1993b30372d0bc0f8e1b5306a672cecbd9..e803eeb7df8d2a73869792966a4032535f233cf0 100644 (file)
--- 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 ce1108ad5f6ae66a4ef19006e81edcc7163565f1..5c76abe05554a91604ad4e2892ad0071b0fffeb8 100644 (file)
--- 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 054546e6493b3a04ebdb42e27d3fdfde12e0570c..bf49424d3207f3117ffda25bd6224ea52e33635e 100644 (file)
--- 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 17186cc9d4b3b84b9dfc6f5676eb71eb630361e3..a747b1435ecf59d281bf66899abc68cdd21d9ddb 100644 (file)
--- 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 37625d361df6d82f8d1206e014ae34b6a1dff14f..c9f6d5266ae1c828fd4d8f8ef0abe07199f01480 100644 (file)
--- 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 c5a071ebff5879b7cd4d05e720f2a900031594e8..176cd296a0d7593ee6012fff6185ddcd75656a9c 100644 (file)
--- 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 7c83284215dea8a0c45ac5d6421f75e8b25c97c0..8712724b0db726075bf409c1d2ce36bb80337654 100644 (file)
--- 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 0ddbf1e99c8aa1e2df1340955657fb77c0360396..ab495cd440c908bb1a1d809b4796878a41cb1f69 100644 (file)
--- 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 21c213544c3a4d72dad724e0385aafe9e01e5be3..342ad0ce8fc063a5fd90bb6f240e63be477e5cf2 100644 (file)
--- 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 554ca58efde8b3d8758812469e31f9bb45c87daa..c487e29cdd6c9eec9aaa6f49b4f7814f4d2ee5b9 100644 (file)
--- 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 84f34701d897bdaa9d99850f4f232df8f3e71079..d60428c3487043cb4cc4c8d1cc2e66b1cd7d2cd9 100644 (file)
--- 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 08f831ce4cb6b6c9bdfb1bd0b00ab3727a05c571..1b4365271d6504329ac11138f1b268589ce1a37d 100644 (file)
--- 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 1ffda37b42da2cf17bc9584eec4b7e04637e0e98..e8e131f14d1e4314931ebca2de80e90a67666c41 100644 (file)
--- 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 11088cb59051e328e512ea57d2eaae7bc9a34a77..741bb629bf60ab3135d59a45c5f689aaa4f59161 100644 (file)
--- 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 3de1b01f43f1c5b2c70e97b5d45e37f583b99e10..3390bdf633a032ada0fedca4db556c578232bca2 100644 (file)
--- 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 cefde425e2310179ad415f9378a42d50dd953b28..a64e1816ebcece1dea3f8dd0011d117fd7e5941b 100644 (file)
--- 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 e214f01c8eeb46b7bc0f0c62211f8d36137d7b4d..de913067974256aeb725edc0ba013b2ca0d17b0a 100644 (file)
--- 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 94928894e1d118224850304935179a44a6b956d3..c7358f39e73d998d05e085c1e60d8b9be70e8ea5 100644 (file)
--- 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 eb6b22019e4836f8885c9c6e533186e5949cd99f..7a96af50d428822cf50b647a47ee106c917be932 100644 (file)
--- 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 5a0f33ac389f57cc485851fd4cb72cf185cc9525..75b804c77b86b747b87b3b7fb0d3a71777eda64e 100644 (file)
--- 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 e44ecd2eb4de262d3355f5017b5e9e332625cbc4..3abb39cf77f1a3063a4a6a730dc85b611e38ee01 100644 (file)
--- 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