Moved the 'disk' files from 'geos-cbm' to 'geos-common' which are believed to work...

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

diff --git a/libsrc/geos-cbm/disk/Makefile b/libsrc/geos-cbm/disk/Makefile
index f1d3f329c7f865c8a75980e36992ad98c74bf817..26b70fcfd8c81b37ca732195a7a379e84587beaa 100644 (file)
--- a/libsrc/geos-cbm/disk/Makefile
+++ b/libsrc/geos-cbm/disk/Makefile
@@ -5,9 +5,7 @@
 #--------------------------------------------------------------------------
 # Object files
 
-S_OBJS +=      blkalloc.o              \
-               calcblksfree.o          \
-               changediskdevice.o      \
+S_OBJS +=      changediskdevice.o      \
                chkdkgeos.o             \
                dio_openclose.o         \
                dio_cts.o               \
@@ -19,22 +17,11 @@ S_OBJS +=   blkalloc.o              \
                enterturbo.o            \
                exitturbo.o             \
                findbambit.o            \
-               freeblock.o             \
-               getblock.o              \
-               getdirhead.o            \
-               getptrcurdknm.o         \
-               gettrse.o               \
                newdisk.o               \
-               nxtblkalloc.o           \
-               opendisk.o              \
                purgeturbo.o            \
-               putblock.o              \
-               putdirhead.o            \
                readblock.o             \
                readbuff.o              \
-               setnextfree.o           \
                setgeosdisk.o           \
-               setoserror.o            \
                writeblock.o            \
                writebuff.o             \
                verwriteblock.o

diff --git a/libsrc/geos-cbm/disk/blkalloc.s b/libsrc/geos-cbm/disk/blkalloc.s
deleted file mode 100644 (file)
index 15f5a51..0000000
--- a/libsrc/geos-cbm/disk/blkalloc.s
+++ /dev/null
@@ -1,22 +0,0 @@
-
-;
-; Maciej 'YTM/Elysium' Witkowiak
-;
-; 21.12.1999, 2.1.2003
-
-; char BlkAlloc (struct tr_se output[], int length);
-
-           .import popax, setoserror
-           .export _BlkAlloc
-
-           .include "jumptab.inc"
-           .include "geossym.inc"
-       
-_BlkAlloc:
-       sta r2L
-       stx r2H
-       jsr popax
-       sta r4L
-       stx r4H
-       jsr BlkAlloc
-       jmp setoserror

diff --git a/libsrc/geos-cbm/disk/calcblksfree.s b/libsrc/geos-cbm/disk/calcblksfree.s
deleted file mode 100644 (file)
index ec66d9f..0000000
--- a/libsrc/geos-cbm/disk/calcblksfree.s
+++ /dev/null
@@ -1,20 +0,0 @@
-
-;
-; Maciej 'YTM/Alliance' Witkowiak
-;
-; 21.12.99
-
-; int CalcBlksFree (void);
-
-           .import __oserror
-           .export _CalcBlksFree
-
-           .include "jumptab.inc"
-           .include "geossym.inc"
-       
-_CalcBlksFree:
-       jsr CalcBlksFree
-       stx __oserror
-       lda r4L
-       ldx r4H
-       rts

diff --git a/libsrc/geos-cbm/disk/freeblock.s b/libsrc/geos-cbm/disk/freeblock.s
deleted file mode 100644 (file)
index 5010d67..0000000
--- a/libsrc/geos-cbm/disk/freeblock.s
+++ /dev/null
@@ -1,20 +0,0 @@
-
-;
-; Maciej 'YTM/Elysium' Witkowiak
-;
-; 21.12.1999, 2.1.2003
-
-; char FreeBlock (struct tr_se *TS);
-
-           .import gettrse, setoserror
-           .export _FreeBlock
-
-           .include "jumptab.inc"
-           .include "geossym.inc"
-       
-_FreeBlock:
-       jsr gettrse
-       sta r6L
-       stx r6H
-       jsr FreeBlock
-       jmp setoserror

diff --git a/libsrc/geos-cbm/disk/getblock.s b/libsrc/geos-cbm/disk/getblock.s
deleted file mode 100644 (file)
index 2342a39..0000000
--- a/libsrc/geos-cbm/disk/getblock.s
+++ /dev/null
@@ -1,24 +0,0 @@
-
-;
-; Maciej 'YTM/Elysium' Witkowiak
-;
-; 21.12.1999, 2.1.2003
-
-; char GetBlock (struct tr_se *myTS, char *buffer);
-
-           .import popax, setoserror
-           .import gettrse
-           .export _GetBlock
-
-           .include "jumptab.inc"
-           .include "geossym.inc"
-       
-_GetBlock:
-       sta r4L
-       stx r4H
-       jsr popax
-       jsr gettrse
-       sta r1L
-       stx r1H
-       jsr GetBlock
-       jmp setoserror

diff --git a/libsrc/geos-cbm/disk/getdirhead.s b/libsrc/geos-cbm/disk/getdirhead.s
deleted file mode 100644 (file)
index 26d386b..0000000
--- a/libsrc/geos-cbm/disk/getdirhead.s
+++ /dev/null
@@ -1,16 +0,0 @@
-
-;
-; Maciej 'YTM/Elysium' Witkowiak
-;
-; 21.12.1999, 2.1.2003
-
-; char GetDirHead (void);
-
-           .import setoserror
-           .export _GetDirHead
-
-           .include "jumptab.inc"
-
-_GetDirHead:
-       jsr GetDirHead
-       jmp setoserror

diff --git a/libsrc/geos-cbm/disk/getptrcurdknm.s b/libsrc/geos-cbm/disk/getptrcurdknm.s
deleted file mode 100644 (file)
index 36797f4..0000000
--- a/libsrc/geos-cbm/disk/getptrcurdknm.s
+++ /dev/null
@@ -1,35 +0,0 @@
-
-;
-; Maciej 'YTM/Alliance' Witkowiak
-;
-; 21.12.99
-
-; void GetPtrCurDkNm (char *curName);
-;  (fills curName[17] with current disk's name)
-
-           .importzp ptr4, ptr3
-           .import __oserror
-           .export _GetPtrCurDkNm
-
-           .include "jumptab.inc"
-           .include "geossym.inc"
-       
-_GetPtrCurDkNm: 
-       sta ptr3
-       stx ptr3+1
-       ldx #ptr4
-       jsr GetPtrCurDkNm
-       ldy #0
-       txa
-       bne fin
-namelp:        lda (ptr4),y
-       cmp #$a0
-       beq fin
-       sta (ptr3),y
-       iny
-       cpy #16
-       bne namelp
-fin:   lda #0
-       sta (ptr3),y
-       stx __oserror
-       rts

diff --git a/libsrc/geos-cbm/disk/gettrse.s b/libsrc/geos-cbm/disk/gettrse.s
deleted file mode 100644 (file)
index 525df08..0000000
--- a/libsrc/geos-cbm/disk/gettrse.s
+++ /dev/null
@@ -1,17 +0,0 @@
-
-;
-; Maciej 'YTM/Alliance' Witkowiak
-;
-; 29.1.00
-
-           .export gettrse
-           .importzp ptr4
-gettrse:
-           sta ptr4
-           stx ptr4+1
-           ldy #1
-           lda (ptr4),y
-           tax
-           dey
-           lda (ptr4),y
-           rts

diff --git a/libsrc/geos-cbm/disk/nxtblkalloc.s b/libsrc/geos-cbm/disk/nxtblkalloc.s
deleted file mode 100644 (file)
index 532aadb..0000000
--- a/libsrc/geos-cbm/disk/nxtblkalloc.s
+++ /dev/null
@@ -1,28 +0,0 @@
-
-;
-; Maciej 'YTM/Elysium' Witkowiak
-;
-; 21.12.1999, 2.1.2003
-
-; char NxtBlkAlloc (struct tr_se *startTS, struct tr_se output[], int length );
-
-           .import popax, setoserror
-           .import gettrse
-           .importzp ptr4
-           .export _NxtBlkAlloc
-
-           .include "jumptab.inc"
-           .include "geossym.inc"
-       
-_NxtBlkAlloc:
-       sta r2L
-       stx r2H
-       jsr popax
-       sta r4L
-       stx r4H
-       jsr popax
-       jsr gettrse
-       sta r3L
-       stx r3H
-       jsr NxtBlkAlloc
-       jmp setoserror

diff --git a/libsrc/geos-cbm/disk/opendisk.s b/libsrc/geos-cbm/disk/opendisk.s
deleted file mode 100644 (file)
index 89ab42f..0000000
--- a/libsrc/geos-cbm/disk/opendisk.s
+++ /dev/null
@@ -1,16 +0,0 @@
-
-;
-; Maciej 'YTM/Elysium' Witkowiak
-;
-; 21.12.1999, 2.1.2003
-
-; char OpenDisk (void);
-
-           .import setoserror
-           .export _OpenDisk
-
-           .include "jumptab.inc"
-       
-_OpenDisk:
-       jsr OpenDisk
-       jmp setoserror

diff --git a/libsrc/geos-cbm/disk/putblock.s b/libsrc/geos-cbm/disk/putblock.s
deleted file mode 100644 (file)
index 0488110..0000000
--- a/libsrc/geos-cbm/disk/putblock.s
+++ /dev/null
@@ -1,24 +0,0 @@
-
-;
-; Maciej 'YTM/Elysium' Witkowiak
-;
-; 21.12.1999, 2.1.2003
-
-; char PutBlock (struct tr_se *myTS, char *buffer);
-
-           .import popax, setoserror
-           .import gettrse
-           .export _PutBlock
-
-           .include "jumptab.inc"
-           .include "geossym.inc"
-       
-_PutBlock:
-       sta r4L
-       stx r4H
-       jsr popax
-       jsr gettrse
-       sta r1L
-       stx r1H
-       jsr PutBlock
-       jmp setoserror

diff --git a/libsrc/geos-cbm/disk/putdirhead.s b/libsrc/geos-cbm/disk/putdirhead.s
deleted file mode 100644 (file)
index 0561b44..0000000
--- a/libsrc/geos-cbm/disk/putdirhead.s
+++ /dev/null
@@ -1,16 +0,0 @@
-
-;
-; Maciej 'YTM/Elysium' Witkowiak
-;
-; 21.12.99, 2.1.2003
-
-; char PutDirHead (void);
-
-           .import setoserror
-           .export _PutDirHead
-
-           .include "jumptab.inc"
-       
-_PutDirHead:
-       jsr PutDirHead
-       jmp setoserror

diff --git a/libsrc/geos-cbm/disk/setnextfree.s b/libsrc/geos-cbm/disk/setnextfree.s
deleted file mode 100644 (file)
index bd247c1..0000000
--- a/libsrc/geos-cbm/disk/setnextfree.s
+++ /dev/null
@@ -1,24 +0,0 @@
-
-;
-; Maciej 'YTM/Alliance' Witkowiak
-;
-; 21.12.99
-
-; struct tr_se SetNextFree (struct tr_se *startTS);
-
-           .import __oserror
-           .import gettrse
-           .export _SetNextFree
-
-           .include "jumptab.inc"
-           .include "geossym.inc"
-       
-_SetNextFree:
-       jsr gettrse
-       sta r3L
-       stx r3H
-       jsr SetNextFree
-       stx __oserror
-       lda r3L
-       ldx r3H
-       rts

diff --git a/libsrc/geos-cbm/disk/setoserror.s b/libsrc/geos-cbm/disk/setoserror.s
deleted file mode 100644 (file)
index 382f565..0000000
--- a/libsrc/geos-cbm/disk/setoserror.s
+++ /dev/null
@@ -1,16 +0,0 @@
-
-;
-; Maciej 'YTM/Elysium' Witkowiak
-;
-; 2.1.2003
-;
-
-           .export setoserror
-           .import __oserror
-
-setoserror:
-           stx __oserror
-           txa
-           ldx #0              ; X is cleared (high byte for promoting char to int)
-           tay                 ; Y register is used just to save flags state
-           rts

diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile
index 253cf6edf7363e803b4d975d7971b01ab3a04931..2f01b87cd0e6d8111a462cb57e2399a415713d22 100644 (file)
--- a/libsrc/geos-common/Makefile
+++ b/libsrc/geos-common/Makefile
@@ -30,6 +30,7 @@ CFLAGS        = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 # Directories
 
 DIRS = dlgbox          \
+       disk            \
        file            \
        graph           \
        memory          \

diff --git a/libsrc/geos-common/disk/Makefile b/libsrc/geos-common/disk/Makefile
new file mode 100644 (file)
index 0000000..a628801
--- /dev/null
+++ b/libsrc/geos-common/disk/Makefile
@@ -0,0 +1,20 @@
+#
+# makefile for CC65 runtime library
+#
+
+#--------------------------------------------------------------------------
+# Object files
+
+S_OBJS +=      blkalloc.o              \
+               calcblksfree.o          \
+               freeblock.o             \
+               getblock.o              \
+               getdirhead.o            \
+               getptrcurdknm.o         \
+               gettrse.o               \
+               nxtblkalloc.o           \
+               opendisk.o              \
+               putblock.o              \
+               putdirhead.o            \
+               setnextfree.o           \
+               setoserror.o

diff --git a/libsrc/geos-common/disk/blkalloc.s b/libsrc/geos-common/disk/blkalloc.s
new file mode 100644 (file)
index 0000000..15f5a51
--- /dev/null
+++ b/libsrc/geos-common/disk/blkalloc.s
@@ -0,0 +1,22 @@
+
+;
+; Maciej 'YTM/Elysium' Witkowiak
+;
+; 21.12.1999, 2.1.2003
+
+; char BlkAlloc (struct tr_se output[], int length);
+
+           .import popax, setoserror
+           .export _BlkAlloc
+
+           .include "jumptab.inc"
+           .include "geossym.inc"
+       
+_BlkAlloc:
+       sta r2L
+       stx r2H
+       jsr popax
+       sta r4L
+       stx r4H
+       jsr BlkAlloc
+       jmp setoserror

diff --git a/libsrc/geos-common/disk/calcblksfree.s b/libsrc/geos-common/disk/calcblksfree.s
new file mode 100644 (file)
index 0000000..ec66d9f
--- /dev/null
+++ b/libsrc/geos-common/disk/calcblksfree.s
@@ -0,0 +1,20 @@
+
+;
+; Maciej 'YTM/Alliance' Witkowiak
+;
+; 21.12.99
+
+; int CalcBlksFree (void);
+
+           .import __oserror
+           .export _CalcBlksFree
+
+           .include "jumptab.inc"
+           .include "geossym.inc"
+       
+_CalcBlksFree:
+       jsr CalcBlksFree
+       stx __oserror
+       lda r4L
+       ldx r4H
+       rts

diff --git a/libsrc/geos-common/disk/freeblock.s b/libsrc/geos-common/disk/freeblock.s
new file mode 100644 (file)
index 0000000..5010d67
--- /dev/null
+++ b/libsrc/geos-common/disk/freeblock.s
@@ -0,0 +1,20 @@
+
+;
+; Maciej 'YTM/Elysium' Witkowiak
+;
+; 21.12.1999, 2.1.2003
+
+; char FreeBlock (struct tr_se *TS);
+
+           .import gettrse, setoserror
+           .export _FreeBlock
+
+           .include "jumptab.inc"
+           .include "geossym.inc"
+       
+_FreeBlock:
+       jsr gettrse
+       sta r6L
+       stx r6H
+       jsr FreeBlock
+       jmp setoserror

diff --git a/libsrc/geos-common/disk/getblock.s b/libsrc/geos-common/disk/getblock.s
new file mode 100644 (file)
index 0000000..2342a39
--- /dev/null
+++ b/libsrc/geos-common/disk/getblock.s
@@ -0,0 +1,24 @@
+
+;
+; Maciej 'YTM/Elysium' Witkowiak
+;
+; 21.12.1999, 2.1.2003
+
+; char GetBlock (struct tr_se *myTS, char *buffer);
+
+           .import popax, setoserror
+           .import gettrse
+           .export _GetBlock
+
+           .include "jumptab.inc"
+           .include "geossym.inc"
+       
+_GetBlock:
+       sta r4L
+       stx r4H
+       jsr popax
+       jsr gettrse
+       sta r1L
+       stx r1H
+       jsr GetBlock
+       jmp setoserror

diff --git a/libsrc/geos-common/disk/getdirhead.s b/libsrc/geos-common/disk/getdirhead.s
new file mode 100644 (file)
index 0000000..26d386b
--- /dev/null
+++ b/libsrc/geos-common/disk/getdirhead.s
@@ -0,0 +1,16 @@
+
+;
+; Maciej 'YTM/Elysium' Witkowiak
+;
+; 21.12.1999, 2.1.2003
+
+; char GetDirHead (void);
+
+           .import setoserror
+           .export _GetDirHead
+
+           .include "jumptab.inc"
+
+_GetDirHead:
+       jsr GetDirHead
+       jmp setoserror

diff --git a/libsrc/geos-common/disk/getptrcurdknm.s b/libsrc/geos-common/disk/getptrcurdknm.s
new file mode 100644 (file)
index 0000000..36797f4
--- /dev/null
+++ b/libsrc/geos-common/disk/getptrcurdknm.s
@@ -0,0 +1,35 @@
+
+;
+; Maciej 'YTM/Alliance' Witkowiak
+;
+; 21.12.99
+
+; void GetPtrCurDkNm (char *curName);
+;  (fills curName[17] with current disk's name)
+
+           .importzp ptr4, ptr3
+           .import __oserror
+           .export _GetPtrCurDkNm
+
+           .include "jumptab.inc"
+           .include "geossym.inc"
+       
+_GetPtrCurDkNm: 
+       sta ptr3
+       stx ptr3+1
+       ldx #ptr4
+       jsr GetPtrCurDkNm
+       ldy #0
+       txa
+       bne fin
+namelp:        lda (ptr4),y
+       cmp #$a0
+       beq fin
+       sta (ptr3),y
+       iny
+       cpy #16
+       bne namelp
+fin:   lda #0
+       sta (ptr3),y
+       stx __oserror
+       rts

diff --git a/libsrc/geos-common/disk/gettrse.s b/libsrc/geos-common/disk/gettrse.s
new file mode 100644 (file)
index 0000000..525df08
--- /dev/null
+++ b/libsrc/geos-common/disk/gettrse.s
@@ -0,0 +1,17 @@
+
+;
+; Maciej 'YTM/Alliance' Witkowiak
+;
+; 29.1.00
+
+           .export gettrse
+           .importzp ptr4
+gettrse:
+           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
new file mode 100644 (file)
index 0000000..532aadb
--- /dev/null
+++ b/libsrc/geos-common/disk/nxtblkalloc.s
@@ -0,0 +1,28 @@
+
+;
+; Maciej 'YTM/Elysium' Witkowiak
+;
+; 21.12.1999, 2.1.2003
+
+; char NxtBlkAlloc (struct tr_se *startTS, struct tr_se output[], int length );
+
+           .import popax, setoserror
+           .import gettrse
+           .importzp ptr4
+           .export _NxtBlkAlloc
+
+           .include "jumptab.inc"
+           .include "geossym.inc"
+       
+_NxtBlkAlloc:
+       sta r2L
+       stx r2H
+       jsr popax
+       sta r4L
+       stx r4H
+       jsr popax
+       jsr gettrse
+       sta r3L
+       stx r3H
+       jsr NxtBlkAlloc
+       jmp setoserror

diff --git a/libsrc/geos-common/disk/opendisk.s b/libsrc/geos-common/disk/opendisk.s
new file mode 100644 (file)
index 0000000..89ab42f
--- /dev/null
+++ b/libsrc/geos-common/disk/opendisk.s
@@ -0,0 +1,16 @@
+
+;
+; Maciej 'YTM/Elysium' Witkowiak
+;
+; 21.12.1999, 2.1.2003
+
+; char OpenDisk (void);
+
+           .import setoserror
+           .export _OpenDisk
+
+           .include "jumptab.inc"
+       
+_OpenDisk:
+       jsr OpenDisk
+       jmp setoserror

diff --git a/libsrc/geos-common/disk/putblock.s b/libsrc/geos-common/disk/putblock.s
new file mode 100644 (file)
index 0000000..0488110
--- /dev/null
+++ b/libsrc/geos-common/disk/putblock.s
@@ -0,0 +1,24 @@
+
+;
+; Maciej 'YTM/Elysium' Witkowiak
+;
+; 21.12.1999, 2.1.2003
+
+; char PutBlock (struct tr_se *myTS, char *buffer);
+
+           .import popax, setoserror
+           .import gettrse
+           .export _PutBlock
+
+           .include "jumptab.inc"
+           .include "geossym.inc"
+       
+_PutBlock:
+       sta r4L
+       stx r4H
+       jsr popax
+       jsr gettrse
+       sta r1L
+       stx r1H
+       jsr PutBlock
+       jmp setoserror

diff --git a/libsrc/geos-common/disk/putdirhead.s b/libsrc/geos-common/disk/putdirhead.s
new file mode 100644 (file)
index 0000000..0561b44
--- /dev/null
+++ b/libsrc/geos-common/disk/putdirhead.s
@@ -0,0 +1,16 @@
+
+;
+; Maciej 'YTM/Elysium' Witkowiak
+;
+; 21.12.99, 2.1.2003
+
+; char PutDirHead (void);
+
+           .import setoserror
+           .export _PutDirHead
+
+           .include "jumptab.inc"
+       
+_PutDirHead:
+       jsr PutDirHead
+       jmp setoserror

diff --git a/libsrc/geos-common/disk/setnextfree.s b/libsrc/geos-common/disk/setnextfree.s
new file mode 100644 (file)
index 0000000..bd247c1
--- /dev/null
+++ b/libsrc/geos-common/disk/setnextfree.s
@@ -0,0 +1,24 @@
+
+;
+; Maciej 'YTM/Alliance' Witkowiak
+;
+; 21.12.99
+
+; struct tr_se SetNextFree (struct tr_se *startTS);
+
+           .import __oserror
+           .import gettrse
+           .export _SetNextFree
+
+           .include "jumptab.inc"
+           .include "geossym.inc"
+       
+_SetNextFree:
+       jsr gettrse
+       sta r3L
+       stx r3H
+       jsr SetNextFree
+       stx __oserror
+       lda r3L
+       ldx r3H
+       rts

diff --git a/libsrc/geos-common/disk/setoserror.s b/libsrc/geos-common/disk/setoserror.s
new file mode 100644 (file)
index 0000000..382f565
--- /dev/null
+++ b/libsrc/geos-common/disk/setoserror.s
@@ -0,0 +1,16 @@
+
+;
+; Maciej 'YTM/Elysium' Witkowiak
+;
+; 2.1.2003
+;
+
+           .export setoserror
+           .import __oserror
+
+setoserror:
+           stx __oserror
+           txa
+           ldx #0              ; X is cleared (high byte for promoting char to int)
+           tay                 ; Y register is used just to save flags state
+           rts