From 10374c66cedd8498b040beaa329fa45094b9acf5 Mon Sep 17 00:00:00 2001 From: "ol.sc" Date: Sat, 4 Feb 2012 21:46:26 +0000 Subject: [PATCH] Moved the 'disk' files from 'geos-cbm' to 'geos-common' which are believed to work as-is on Apple GEOS too. git-svn-id: svn://svn.cc65.org/cc65/trunk@5447 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/geos-cbm/disk/Makefile | 15 +------------- libsrc/geos-common/Makefile | 1 + libsrc/geos-common/disk/Makefile | 20 +++++++++++++++++++ .../{geos-cbm => geos-common}/disk/blkalloc.s | 0 .../disk/calcblksfree.s | 0 .../disk/freeblock.s | 0 .../{geos-cbm => geos-common}/disk/getblock.s | 0 .../disk/getdirhead.s | 0 .../disk/getptrcurdknm.s | 0 .../{geos-cbm => geos-common}/disk/gettrse.s | 0 .../disk/nxtblkalloc.s | 0 .../{geos-cbm => geos-common}/disk/opendisk.s | 0 .../{geos-cbm => geos-common}/disk/putblock.s | 0 .../disk/putdirhead.s | 0 .../disk/setnextfree.s | 0 .../disk/setoserror.s | 0 16 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 libsrc/geos-common/disk/Makefile rename libsrc/{geos-cbm => geos-common}/disk/blkalloc.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/calcblksfree.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/freeblock.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/getblock.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/getdirhead.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/getptrcurdknm.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/gettrse.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/nxtblkalloc.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/opendisk.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/putblock.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/putdirhead.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/setnextfree.s (100%) rename libsrc/{geos-cbm => geos-common}/disk/setoserror.s (100%) diff --git a/libsrc/geos-cbm/disk/Makefile b/libsrc/geos-cbm/disk/Makefile index f1d3f329c..26b70fcfd 100644 --- 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-common/Makefile b/libsrc/geos-common/Makefile index 253cf6edf..2f01b87cd 100644 --- 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 index 000000000..a6288012d --- /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-cbm/disk/blkalloc.s b/libsrc/geos-common/disk/blkalloc.s similarity index 100% rename from libsrc/geos-cbm/disk/blkalloc.s rename to libsrc/geos-common/disk/blkalloc.s diff --git a/libsrc/geos-cbm/disk/calcblksfree.s b/libsrc/geos-common/disk/calcblksfree.s similarity index 100% rename from libsrc/geos-cbm/disk/calcblksfree.s rename to libsrc/geos-common/disk/calcblksfree.s diff --git a/libsrc/geos-cbm/disk/freeblock.s b/libsrc/geos-common/disk/freeblock.s similarity index 100% rename from libsrc/geos-cbm/disk/freeblock.s rename to libsrc/geos-common/disk/freeblock.s diff --git a/libsrc/geos-cbm/disk/getblock.s b/libsrc/geos-common/disk/getblock.s similarity index 100% rename from libsrc/geos-cbm/disk/getblock.s rename to libsrc/geos-common/disk/getblock.s diff --git a/libsrc/geos-cbm/disk/getdirhead.s b/libsrc/geos-common/disk/getdirhead.s similarity index 100% rename from libsrc/geos-cbm/disk/getdirhead.s rename to libsrc/geos-common/disk/getdirhead.s diff --git a/libsrc/geos-cbm/disk/getptrcurdknm.s b/libsrc/geos-common/disk/getptrcurdknm.s similarity index 100% rename from libsrc/geos-cbm/disk/getptrcurdknm.s rename to libsrc/geos-common/disk/getptrcurdknm.s diff --git a/libsrc/geos-cbm/disk/gettrse.s b/libsrc/geos-common/disk/gettrse.s similarity index 100% rename from libsrc/geos-cbm/disk/gettrse.s rename to libsrc/geos-common/disk/gettrse.s diff --git a/libsrc/geos-cbm/disk/nxtblkalloc.s b/libsrc/geos-common/disk/nxtblkalloc.s similarity index 100% rename from libsrc/geos-cbm/disk/nxtblkalloc.s rename to libsrc/geos-common/disk/nxtblkalloc.s diff --git a/libsrc/geos-cbm/disk/opendisk.s b/libsrc/geos-common/disk/opendisk.s similarity index 100% rename from libsrc/geos-cbm/disk/opendisk.s rename to libsrc/geos-common/disk/opendisk.s diff --git a/libsrc/geos-cbm/disk/putblock.s b/libsrc/geos-common/disk/putblock.s similarity index 100% rename from libsrc/geos-cbm/disk/putblock.s rename to libsrc/geos-common/disk/putblock.s diff --git a/libsrc/geos-cbm/disk/putdirhead.s b/libsrc/geos-common/disk/putdirhead.s similarity index 100% rename from libsrc/geos-cbm/disk/putdirhead.s rename to libsrc/geos-common/disk/putdirhead.s diff --git a/libsrc/geos-cbm/disk/setnextfree.s b/libsrc/geos-common/disk/setnextfree.s similarity index 100% rename from libsrc/geos-cbm/disk/setnextfree.s rename to libsrc/geos-common/disk/setnextfree.s diff --git a/libsrc/geos-cbm/disk/setoserror.s b/libsrc/geos-common/disk/setoserror.s similarity index 100% rename from libsrc/geos-cbm/disk/setoserror.s rename to libsrc/geos-common/disk/setoserror.s -- 2.39.5