changeset 2886:fea5c20fdbfe

Various whitespace fixups just to make less merge conflicts
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 24 Nov 2013 17:00:47 +0100
parents 66a8466f067c
children a1296ceb6797
files 3rdparty/packages/arcadepak/makefile level1/modules/boot_scsi.asm level1/modules/dwread.asm level1/modules/dwwrite.asm
diffstat 4 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/arcadepak/makefile	Sun Nov 24 16:33:24 2013 +0100
+++ b/3rdparty/packages/arcadepak/makefile	Sun Nov 24 17:00:47 2013 +0100
@@ -9,7 +9,7 @@
 CMD		= $(6809L2)/cmds
 DISK_40D	= arcadepack_40d.dsk
 DISK_80D	= arcadepack_80d.dsk
-DISK_DW	= arcadepack_dw.dsk
+DISK_DW		= arcadepack_dw.dsk
 DISK_BECKER	= arcadepack_becker.dsk
 CMDS		= grfdrv runb
 SHELLMODS	= $(CMD)/shell_21 $(CMD)/dir $(CMD)/echo $(CMD)/link $(CMD)/load $(CMD)/mdir
--- a/level1/modules/boot_scsi.asm	Sun Nov 24 16:33:24 2013 +0100
+++ b/level1/modules/boot_scsi.asm	Sun Nov 24 17:00:47 2013 +0100
@@ -150,7 +150,7 @@
 			   ENDC
                rts
 
- * Sooooo, at end of module, the FF64XX, the XX is not a marching bit
+* Sooooo, at end of module, the FF64XX, the XX is not a marching bit
 * pattern any more.  Cool but a huge gotcha needing makefile changes
 * all over.  And theres too many of them.
 
--- a/level1/modules/dwread.asm	Sun Nov 24 16:33:24 2013 +0100
+++ b/level1/modules/dwread.asm	Sun Nov 24 17:00:47 2013 +0100
@@ -31,7 +31,6 @@
           abx                           ; update checksum
           leay   ,-y
           bne    loop@
-
           leay      ,x                  ; return checksum in Y
           puls      cc,x,u,pc        ; restore registers and return
 
--- a/level1/modules/dwwrite.asm	Sun Nov 24 16:33:24 2013 +0100
+++ b/level1/modules/dwwrite.asm	Sun Nov 24 17:00:47 2013 +0100
@@ -26,7 +26,6 @@
           tst       $FF52              ; clear CB1 in status register
           leay      -1,y                ; decrement byte counter
           bne       txByte              ; loop if more to send
-
           puls      a,pc                ; restore registers and return
 
           ELSE