From a3fa5273789d0bafd6788808145b53d6ec439219 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Sun, 10 Nov 2024 15:35:36 +0100 Subject: [PATCH] move shared cbm diskio to its own file (c64/c128) so that pet/atari/neo targets give better error message when trying to import non existing diskio module there --- compiler/res/prog8lib/c128/diskio.p8 | 4 ++++ compiler/res/prog8lib/c64/diskio.p8 | 4 ++++ compiler/res/prog8lib/{diskio.p8 => shared_cbm_diskio.p8} | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 compiler/res/prog8lib/c128/diskio.p8 create mode 100644 compiler/res/prog8lib/c64/diskio.p8 rename compiler/res/prog8lib/{diskio.p8 => shared_cbm_diskio.p8} (99%) diff --git a/compiler/res/prog8lib/c128/diskio.p8 b/compiler/res/prog8lib/c128/diskio.p8 new file mode 100644 index 000000000..7c3768a5e --- /dev/null +++ b/compiler/res/prog8lib/c128/diskio.p8 @@ -0,0 +1,4 @@ +%import shared_cbm_diskio + +; No alterations here; everything is taken from the shared module. + diff --git a/compiler/res/prog8lib/c64/diskio.p8 b/compiler/res/prog8lib/c64/diskio.p8 new file mode 100644 index 000000000..7c3768a5e --- /dev/null +++ b/compiler/res/prog8lib/c64/diskio.p8 @@ -0,0 +1,4 @@ +%import shared_cbm_diskio + +; No alterations here; everything is taken from the shared module. + diff --git a/compiler/res/prog8lib/diskio.p8 b/compiler/res/prog8lib/shared_cbm_diskio.p8 similarity index 99% rename from compiler/res/prog8lib/diskio.p8 rename to compiler/res/prog8lib/shared_cbm_diskio.p8 index 0d9ab649e..a29720377 100644 --- a/compiler/res/prog8lib/diskio.p8 +++ b/compiler/res/prog8lib/shared_cbm_diskio.p8 @@ -1,4 +1,4 @@ -; C64/C128 disk drive I/O routines. +; shared CBM (C64/C128) disk drive I/O routines. %import textio %import conv @@ -6,7 +6,7 @@ %import syslib diskio { - %option no_symbol_prefixing, ignore_unused + %option merge, no_symbol_prefixing, ignore_unused const ubyte READ_IO_CHANNEL=12 const ubyte WRITE_IO_CHANNEL=13