Removed .import for std kernal entries. Added .include "cbm.inc"

diff --git a/libsrc/cbm/c_acptr.s b/libsrc/cbm/c_acptr.s
index 87f063a07a90d144c0f41da7890af90ceabc6534..0c1363c8cd2ec3972502328559307da1b04926b9 100644 (file)
--- a/libsrc/cbm/c_acptr.s
+++ b/libsrc/cbm/c_acptr.s
@@ -4,8 +4,8 @@
 ; unsigned char cbm_k_acptr (void);
 ;
 
 ; unsigned char cbm_k_acptr (void);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_acptr
         .export         _cbm_k_acptr

-        .import         ACPTR

 
 
 _cbm_k_acptr:
 
 
 _cbm_k_acptr:

diff --git a/libsrc/cbm/c_basin.s b/libsrc/cbm/c_basin.s
index 15d7e7f5c4a85c9cc9c20a48c56cdc3e3349f3eb..9e3befee02e9747e03a2511ec73210a645a4fc0d 100644 (file)
--- a/libsrc/cbm/c_basin.s
+++ b/libsrc/cbm/c_basin.s
@@ -4,8 +4,8 @@
 ; unsigned char cbm_k_basin (void);
 ;
 
 ; unsigned char cbm_k_basin (void);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_basin
         .export         _cbm_k_basin

-        .import         BASIN

 
 
 _cbm_k_basin:
 
 
 _cbm_k_basin:

diff --git a/libsrc/cbm/c_bsout.s b/libsrc/cbm/c_bsout.s
index 8b9f4403764ff58c89957d3e0a8925778eabf01f..043efd7d31ed7d8edb834cff2a21c07e5bc91e39 100644 (file)
--- a/libsrc/cbm/c_bsout.s
+++ b/libsrc/cbm/c_bsout.s
@@ -4,7 +4,7 @@
 ; void __fastcall__ cbm_k_bsout (unsigned char C);
 ;
 
 ; void __fastcall__ cbm_k_bsout (unsigned char C);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_bsout
         .export         _cbm_k_bsout

-        .import         BSOUT

 
 _cbm_k_bsout = BSOUT
 
 _cbm_k_bsout = BSOUT

diff --git a/libsrc/cbm/c_chkin.s b/libsrc/cbm/c_chkin.s
index 4ed8c1bff8c50bba4616fdf146023d0bdff8783b..39bc2222ec7be4981bbd346e843ed8bb82f4e81c 100644 (file)
--- a/libsrc/cbm/c_chkin.s
+++ b/libsrc/cbm/c_chkin.s
@@ -4,8 +4,9 @@
 ; unsigned char __fastcall__ cbm_k_chkin (unsigned char FN);
 ;
 
 ; unsigned char __fastcall__ cbm_k_chkin (unsigned char FN);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_chkin
         .export         _cbm_k_chkin

-        .import         CHKIN
+

 
 _cbm_k_chkin:
         tax
 
 _cbm_k_chkin:
         tax

diff --git a/libsrc/cbm/c_ciout.s b/libsrc/cbm/c_ciout.s
index 9906e06584fa83893bef84f39c5af88de540efe5..5ef59c5b73b18a67f757bbd6fae6dacf1220b05b 100644 (file)
--- a/libsrc/cbm/c_ciout.s
+++ b/libsrc/cbm/c_ciout.s
@@ -4,7 +4,6 @@
 ; void __fastcall__ cbm_k_ciout (unsigned char C);
 ;
 
 ; void __fastcall__ cbm_k_ciout (unsigned char C);
 ;
 

-        .import         CIOUT
-        .export         _cbm_k_ciout := CIOUT
-

 
 

+        .include        "cbm.inc"
+        .export         _cbm_k_ciout := CIOUT

diff --git a/libsrc/cbm/c_ckout.s b/libsrc/cbm/c_ckout.s
index 380d7170a95a1f4f7223a66d193744051339ee86..9efbb7343c20c7d0e30505a6f022043a5b606879 100644 (file)
--- a/libsrc/cbm/c_ckout.s
+++ b/libsrc/cbm/c_ckout.s
@@ -4,8 +4,8 @@
 ; unsigned char __fastcall__ cbm_k_ckout (unsigned char FN);
 ;
 
 ; unsigned char __fastcall__ cbm_k_ckout (unsigned char FN);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_ckout
         .export         _cbm_k_ckout

-        .import         CKOUT

 
 
 _cbm_k_ckout:
 
 
 _cbm_k_ckout:

diff --git a/libsrc/cbm/c_clall.s b/libsrc/cbm/c_clall.s
index cdd7d4ddc9815c83163551f83fff1b0a023067d0..1bc7bf7477e119960de9edff7e624815d4d11072 100644 (file)
--- a/libsrc/cbm/c_clall.s
+++ b/libsrc/cbm/c_clall.s
@@ -4,5 +4,5 @@
 ; void cbm_k_clall (void);
 ;
 
 ; void cbm_k_clall (void);
 ;
 

-        .import         CLALL
+        .include        "cbm.inc"

         .export         _cbm_k_clall := CLALL
         .export         _cbm_k_clall := CLALL

diff --git a/libsrc/cbm/c_close.s b/libsrc/cbm/c_close.s
index 9582baca2d54f399a25d288cb8db07731d57fcf7..db19f34c6316baf59540c158db44cd41300aaf18 100644 (file)
--- a/libsrc/cbm/c_close.s
+++ b/libsrc/cbm/c_close.s
@@ -4,11 +4,9 @@
 ; void __fastcall__ cbm_k_close (unsigned char FN);
 ;
 
 ; void __fastcall__ cbm_k_close (unsigned char FN);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_close
         .export         _cbm_k_close

-        .import         CLOSE

 
 _cbm_k_close:
 
 _cbm_k_close:

-        clc                  
+        clc

         jmp     CLOSE
         jmp     CLOSE

-
-

diff --git a/libsrc/cbm/c_clrch.s b/libsrc/cbm/c_clrch.s
index 7c0506a1ca9e82af377c9f7d2d36098321b7cc58..b0db2be4e575889600932c680f35b5b8bdb4d4da 100644 (file)
--- a/libsrc/cbm/c_clrch.s
+++ b/libsrc/cbm/c_clrch.s
@@ -4,7 +4,7 @@
 ; void cbm_k_clrch (void);
 ;
 
 ; void cbm_k_clrch (void);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_clrch
         .export         _cbm_k_clrch

-        .import         CLRCH

 
 _cbm_k_clrch = CLRCH
 
 _cbm_k_clrch = CLRCH

diff --git a/libsrc/cbm/c_getin.s b/libsrc/cbm/c_getin.s
index b4cb34f76509ad3496991ff20e8e3111c2d49f77..23c1edc7410cc83aa97661681da098cdf5adb8c7 100644 (file)
--- a/libsrc/cbm/c_getin.s
+++ b/libsrc/cbm/c_getin.s
@@ -4,8 +4,8 @@
 ; unsigned char cbm_k_getin (void);
 ;
 
 ; unsigned char cbm_k_getin (void);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_getin
         .export         _cbm_k_getin

-        .import         GETIN

 
 
 _cbm_k_getin:
 
 
 _cbm_k_getin:

diff --git a/libsrc/cbm/c_iobase.s b/libsrc/cbm/c_iobase.s
index 254879017d626b5871344061d7f7c9a3a5ab30dc..58b66fd0bd01da17b82be0ca0838b964745cd694 100644 (file)
--- a/libsrc/cbm/c_iobase.s
+++ b/libsrc/cbm/c_iobase.s
@@ -4,10 +4,10 @@
 ; unsigned cbm_k_iobase (void);
 ;
 
 ; unsigned cbm_k_iobase (void);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_iobase
         .export         _cbm_k_iobase

-        .import         IOBASE

 
 

-_cbm_k_iobase:                   
+_cbm_k_iobase:

         jsr     IOBASE
         txa
         pha
         jsr     IOBASE
         txa
         pha

diff --git a/libsrc/cbm/c_listen.s b/libsrc/cbm/c_listen.s
index 85ef8b7fa98b8034ba0443a4f0588e182ef09d47..38908a60be6c35754b23c0f2455a5b92770b86ab 100644 (file)
--- a/libsrc/cbm/c_listen.s
+++ b/libsrc/cbm/c_listen.s
@@ -4,10 +4,5 @@
 ; void __fastcall__ cbm_k_listen (unsigned char dev);
 ;
 
 ; void __fastcall__ cbm_k_listen (unsigned char dev);
 ;
 

-        .import         LISTEN
+        .include        "cbm.inc"

         .export         _cbm_k_listen := LISTEN
         .export         _cbm_k_listen := LISTEN

-
-
-
-
-

diff --git a/libsrc/cbm/c_load.s b/libsrc/cbm/c_load.s
index f2b5b0c89309793d0e5dddc3e15add27e4657815..c9bd55ca097ed4638ac1dfd2999cc542938686d5 100644 (file)
--- a/libsrc/cbm/c_load.s
+++ b/libsrc/cbm/c_load.s
@@ -4,8 +4,8 @@
 ; unsigned int __fastcall__ cbm_k_load (unsigned char flag, unsigned addr);
 ;
 
 ; unsigned int __fastcall__ cbm_k_load (unsigned char flag, unsigned addr);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_load
         .export         _cbm_k_load

-        .import         LOAD

         .import         __oserror
         .import         popa
         .importzp       ptr1
         .import         __oserror
         .import         popa
         .importzp       ptr1


@@ -27,4 +27,3 @@ _cbm_k_load:
         tax
         pla
         rts
         tax
         pla
         rts

-

diff --git a/libsrc/cbm/c_open.s b/libsrc/cbm/c_open.s
index 6461ffedf01125ba159fd04d8217273df00d48bc..63249a57f85ada364ac6883a2194d45e8035e246 100644 (file)
--- a/libsrc/cbm/c_open.s
+++ b/libsrc/cbm/c_open.s
@@ -4,8 +4,8 @@
 ; unsigned char cbm_k_open (void);
 ;
 
 ; unsigned char cbm_k_open (void);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_open
         .export         _cbm_k_open

-        .import         OPEN

 
 
 _cbm_k_open:
 
 
 _cbm_k_open:

diff --git a/libsrc/cbm/c_readst.s b/libsrc/cbm/c_readst.s
index 301cd9b4260b054b917f04751680bc1317da4de7..e6243cef00b7527b5bf80bf200adab99d8ed9859 100644 (file)
--- a/libsrc/cbm/c_readst.s
+++ b/libsrc/cbm/c_readst.s
@@ -4,8 +4,8 @@
 ; unsigned char cbm_k_readst (void);
 ;
 
 ; unsigned char cbm_k_readst (void);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_readst
         .export         _cbm_k_readst

-        .import         READST

 
 
 _cbm_k_readst:
 
 
 _cbm_k_readst:

diff --git a/libsrc/cbm/c_save.s b/libsrc/cbm/c_save.s
index 0597e9401a87c6de27ecf8728838d0b95397d1d7..6d05e6344525e7ce41b20767dc71b3fb7ddcb2ac 100644 (file)
--- a/libsrc/cbm/c_save.s
+++ b/libsrc/cbm/c_save.s
@@ -4,8 +4,8 @@
 ; unsigned char __fastcall__ cbm_k_save(unsigned int start, unsigned int end);
 ;
 
 ; unsigned char __fastcall__ cbm_k_save(unsigned int start, unsigned int end);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_save
         .export         _cbm_k_save

-        .import         SAVE

         .import         popptr1
         .importzp       ptr1, tmp1
 
         .import         popptr1
         .importzp       ptr1, tmp1
 

diff --git a/libsrc/cbm/c_scnkey.s b/libsrc/cbm/c_scnkey.s
index cdae50e7b26da2026f8c4ccb85d7a8d5c4c358e1..38e3f4cec712fb61eba4b3b03341de7667093201 100644 (file)
--- a/libsrc/cbm/c_scnkey.s
+++ b/libsrc/cbm/c_scnkey.s
@@ -4,5 +4,5 @@
 ; void cbm_k_scnkey (void);
 ;
 
 ; void cbm_k_scnkey (void);
 ;
 

-        .import         SCNKEY
+        .include        "cbm.inc"

         .export         _cbm_k_scnkey := SCNKEY
         .export         _cbm_k_scnkey := SCNKEY

diff --git a/libsrc/cbm/c_second.s b/libsrc/cbm/c_second.s
index b5cc98c807884561b65101390483a153665c28b6..2670e1cd457b5dce0bf431eadfeda198c67281be 100644 (file)
--- a/libsrc/cbm/c_second.s
+++ b/libsrc/cbm/c_second.s
@@ -4,9 +4,7 @@
 ; void __fastcall__ cbm_k_second (unsigned char addr)
 ;
 
 ; void __fastcall__ cbm_k_second (unsigned char addr)
 ;
 

-
-        .import SECOND
-        .export _cbm_k_second
+        .include        "cbm.inc"
+        .export         _cbm_k_second

 
 _cbm_k_second = SECOND
 
 _cbm_k_second = SECOND

-

diff --git a/libsrc/cbm/c_setlfs.s b/libsrc/cbm/c_setlfs.s
index 00ebfae7adb40b5b7df2e244b8e4f0775e221c7c..b93d80c0919ecd0d6f06cb967b679bd3ba893e75 100644 (file)
--- a/libsrc/cbm/c_setlfs.s
+++ b/libsrc/cbm/c_setlfs.s
@@ -6,11 +6,11 @@
 ;                                 unsigned char SA);
 ;
 
 ;                                 unsigned char SA);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_setlfs
         .export         _cbm_k_setlfs

-        .import         SETLFS

         .import         popa
         .importzp       tmp1
         .import         popa
         .importzp       tmp1

-                              
+

 
 _cbm_k_setlfs:
         sta     tmp1            ; Save SA
 
 _cbm_k_setlfs:
         sta     tmp1            ; Save SA


@@ -19,5 +19,3 @@ _cbm_k_setlfs:
         jsr     popa            ; Get LFN
         ldy     tmp1            ; Get SA
         jmp     SETLFS
         jsr     popa            ; Get LFN
         ldy     tmp1            ; Get SA
         jmp     SETLFS

-
-

diff --git a/libsrc/cbm/c_setnam.s b/libsrc/cbm/c_setnam.s
index 3249d8539a39b0fbeef3efd0a81dbc867bd2d6a1..5b6b90c64ffef6f78024a016183062e93de6c488 100644 (file)
--- a/libsrc/cbm/c_setnam.s
+++ b/libsrc/cbm/c_setnam.s
@@ -4,10 +4,10 @@
 ; void __fastcall__ cbm_k_setnam (const char* Name);
 ;
 
 ; void __fastcall__ cbm_k_setnam (const char* Name);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_setnam
         .export         _cbm_k_setnam

-        .import         SETNAM

         .importzp       ptr1
         .importzp       ptr1

-                              
+

 
 _cbm_k_setnam:
         sta     ptr1            ; Store pointer to file name
 
 _cbm_k_setnam:
         sta     ptr1            ; Store pointer to file name


@@ -21,4 +21,3 @@ _cbm_k_setnam:
         ldx     ptr1
         ldy     ptr1+1
         jmp     SETNAM
         ldx     ptr1
         ldy     ptr1+1
         jmp     SETNAM

-

diff --git a/libsrc/cbm/c_talk.s b/libsrc/cbm/c_talk.s
index ff80b3499ff4c9c0fb1d509ebde5ea8bb81fd1f6..01ab376d14251e0a129122e26c0b92eac16c804b 100644 (file)
--- a/libsrc/cbm/c_talk.s
+++ b/libsrc/cbm/c_talk.s
@@ -4,12 +4,5 @@
 ; void __fastcall__ cbm_k_talk (unsigned char dev);
 ;
 
 ; void __fastcall__ cbm_k_talk (unsigned char dev);
 ;
 

-        .import         TALK
+        .include        "cbm.inc"

         .export         _cbm_k_talk := TALK
         .export         _cbm_k_talk := TALK

-
-
-
-
-
-
-

diff --git a/libsrc/cbm/c_tksa.s b/libsrc/cbm/c_tksa.s
index b818d720519a8f80c4a1f3ee7238965d26e028a6..c59c7f5a09e647d3a3fd198ab284143c95e669ba 100644 (file)
--- a/libsrc/cbm/c_tksa.s
+++ b/libsrc/cbm/c_tksa.s
@@ -4,9 +4,7 @@
 ; void __fastcall__ cbm_k_tksa (unsigned char addr)
 ;
 
 ; void __fastcall__ cbm_k_tksa (unsigned char addr)
 ;
 

-
-        .import TKSA
-        .export _cbm_k_tksa
+        .include        "cbm.inc"
+        .export         _cbm_k_tksa

 
 _cbm_k_tksa = TKSA
 
 _cbm_k_tksa = TKSA

-

diff --git a/libsrc/cbm/c_udtim.s b/libsrc/cbm/c_udtim.s
index b867efaba96d56cf4a80f00309eaaff292daebc5..ba12d1e35c6b21462003ff7796d51d87744f081c 100644 (file)
--- a/libsrc/cbm/c_udtim.s
+++ b/libsrc/cbm/c_udtim.s
@@ -4,5 +4,5 @@
 ; void cbm_k_udtim (void);
 ;
 
 ; void cbm_k_udtim (void);
 ;
 

-        .import         UDTIM
+        .include        "cbm.inc"

         .export         _cbm_k_udtim := UDTIM
         .export         _cbm_k_udtim := UDTIM

diff --git a/libsrc/cbm/c_unlsn.s b/libsrc/cbm/c_unlsn.s
index fd6b1b074fdd22f18112a8d84641c581ac5f9573..5a525374b6a8dc91324529ff3cfa4a0046ce4e50 100644 (file)
--- a/libsrc/cbm/c_unlsn.s
+++ b/libsrc/cbm/c_unlsn.s
@@ -4,5 +4,5 @@
 ; void cbm_k_unlsn (void);
 ;
 
 ; void cbm_k_unlsn (void);
 ;
 

-        .import         UNLSN
+        .include        "cbm.inc"

         .export         _cbm_k_unlsn := UNLSN
         .export         _cbm_k_unlsn := UNLSN

diff --git a/libsrc/cbm/c_untlk.s b/libsrc/cbm/c_untlk.s
index 3865564cde79e555036af41d4da03a74b146ecaf..dfde77e3fa0c6bf071955902566c70fb1a443718 100644 (file)
--- a/libsrc/cbm/c_untlk.s
+++ b/libsrc/cbm/c_untlk.s
@@ -4,8 +4,7 @@
 ; void cbm_k_untlk (void);
 ;
 
 ; void cbm_k_untlk (void);
 ;
 

+        .include        "cbm.inc"

         .export         _cbm_k_untlk
         .export         _cbm_k_untlk

-        .import         UNTLK
-

 
 _cbm_k_untlk = UNTLK
 
 _cbm_k_untlk = UNTLK

diff --git a/libsrc/cbm/cbm_read.s b/libsrc/cbm/cbm_read.s
index c84ff65aa741d389289f294000c088817a94bec1..b010966a30382413a09c1a3cc317cfd7910b5fe0 100644 (file)
--- a/libsrc/cbm/cbm_read.s
+++ b/libsrc/cbm/cbm_read.s
@@ -39,7 +39,6 @@
         .include        "cbm.inc"
 
         .export         _cbm_read
         .include        "cbm.inc"
 
         .export         _cbm_read

-        .import         CHKIN, READST, BASIN, CLRCH

         .importzp       ptr1, ptr2, ptr3, tmp1
         .import         popax, popa
         .import         __oserror
         .importzp       ptr1, ptr2, ptr3, tmp1
         .import         popax, popa
         .import         __oserror

diff --git a/libsrc/cbm/cbm_write.s b/libsrc/cbm/cbm_write.s
index 0b709dff88357b15c4424905e71f86eb8bd7cb94..2d932d04a23e9ccd204469a92d5d50f836f1d2ac 100644 (file)
--- a/libsrc/cbm/cbm_write.s
+++ b/libsrc/cbm/cbm_write.s
@@ -31,11 +31,10 @@
         .include        "cbm.inc"
 
         .export         _cbm_write
         .include        "cbm.inc"
 
         .export         _cbm_write

-        .import         CKOUT, READST, BSOUT, CLRCH

         .importzp       ptr1, ptr2, ptr3
         .import         popax, popa
         .import         __oserror
         .importzp       ptr1, ptr2, ptr3
         .import         popax, popa
         .import         __oserror

-                                                   
+

 
 _cbm_write:
         sta     ptr3
 
 _cbm_write:
         sta     ptr3

diff --git a/libsrc/cbm/clock.s b/libsrc/cbm/clock.s
index ce36e3af5f065c6375d3bd907e7da16baf0d8c70..0c8ba9c45a702e36dbf562c3b3679b4e53eee8d2 100644 (file)
--- a/libsrc/cbm/clock.s
+++ b/libsrc/cbm/clock.s
@@ -4,12 +4,11 @@
 ; clock_t clock (void);
 ;
 
 ; clock_t clock (void);
 ;
 

+        .include        "cbm.inc"

         .export         _clock
         .export         _clock

-        .import         RDTIM

         .importzp       sreg
 
 
         .importzp       sreg
 
 

-

 .proc   _clock
 
         lda     #0              ; Byte 3 is always zero
 .proc   _clock
 
         lda     #0              ; Byte 3 is always zero


@@ -19,4 +18,3 @@
         rts
 
 .endproc
         rts
 
 .endproc

-

diff --git a/libsrc/cbm/close.s b/libsrc/cbm/close.s
index b43c07b57e54206e058339763c5559302f705e6d..7fc600e8732110a087b58eafbfdc70352741f427 100644 (file)
--- a/libsrc/cbm/close.s
+++ b/libsrc/cbm/close.s
@@ -6,7 +6,6 @@
 
         .export         _close
 
 
         .export         _close
 

-        .import         CLOSE

         .import         readdiskerror, closecmdchannel
         .importzp       tmp2
 
         .import         readdiskerror, closecmdchannel
         .importzp       tmp2
 


@@ -17,7 +16,7 @@
 
 ;--------------------------------------------------------------------------
 ; _close
 
 ;--------------------------------------------------------------------------
 ; _close

-                                                   
+

 .proc   _close
 
 ; Check if we have a valid handle
 .proc   _close
 
 ; Check if we have a valid handle


@@ -64,7 +63,3 @@ invalidfd:
         jmp     __directerrno   ; Set _errno, clear _oserror, return -1
 
 .endproc
         jmp     __directerrno   ; Set _errno, clear _oserror, return -1
 
 .endproc

-
-
-
-

diff --git a/libsrc/cbm/diskcmd.s b/libsrc/cbm/diskcmd.s
index d090afe14e5d474f83c6c3904e167623940c11ba..dbc15efbe65c4f1e4f904e830fb12a29b816d6da 100644 (file)
--- a/libsrc/cbm/diskcmd.s
+++ b/libsrc/cbm/diskcmd.s
@@ -11,8 +11,6 @@
         .export         writediskcmd
         .export         writefndiskcmd
 
         .export         writediskcmd
         .export         writefndiskcmd
 

-        .import         SETLFS, SETNAM, OPEN, CLOSE, BSOUT, BASIN
-        .import         CHKIN, CKOUT, CLRCH

         .import         fncmd, fnlen, fnunit
         .importzp       tmp1, ptr1
 
         .import         fncmd, fnlen, fnunit
         .importzp       tmp1, ptr1
 

diff --git a/libsrc/cbm/filename.s b/libsrc/cbm/filename.s
index a2b8aab5a298b9fc7bb33ded642f49b953cf20e9..413b88d2a4f5ea38cabf5ff8117ed013877a5a5f 100644 (file)
--- a/libsrc/cbm/filename.s
+++ b/libsrc/cbm/filename.s
@@ -8,11 +8,11 @@
         .export         fnadd, fnaddmode, fncomplete, fndefunit
         .export         fnunit, fnlen, fnisfile, fncmd, fnbuf
 
         .export         fnadd, fnaddmode, fncomplete, fndefunit
         .export         fnunit, fnlen, fnisfile, fncmd, fnbuf
 

-        .import         SETNAM

         .import         curunit, __filetype
         .importzp       ptr1, tmp1
 
         .include        "ctype.inc"
         .import         curunit, __filetype
         .importzp       ptr1, tmp1
 
         .include        "ctype.inc"

+        .include        "cbm.inc"

 
 
 ;------------------------------------------------------------------------------
 
 
 ;------------------------------------------------------------------------------

diff --git a/libsrc/cbm/open.s b/libsrc/cbm/open.s
index 5c97aff566c3446f912f4815da334b59024881e0..f23e97383cff68918ef262ad39b227c85751abe7 100644 (file)
--- a/libsrc/cbm/open.s
+++ b/libsrc/cbm/open.s
@@ -7,7 +7,6 @@
         .export         _open
         .destructor     closeallfiles, 5
 
         .export         _open
         .destructor     closeallfiles, 5
 

-        .import         SETLFS, OPEN, CLOSE

         .import         addysp, popax
         .import         scratch, fnparse, fnaddmode, fncomplete, fnset
         .import         opencmdchannel, closecmdchannel, readdiskerror
         .import         addysp, popax
         .import         scratch, fnparse, fnaddmode, fncomplete, fnset
         .import         opencmdchannel, closecmdchannel, readdiskerror


@@ -18,6 +17,7 @@
         .include        "errno.inc"
         .include        "fcntl.inc"
         .include        "filedes.inc"
         .include        "errno.inc"
         .include        "fcntl.inc"
         .include        "filedes.inc"

+        .include        "cbm.inc"

 
 
 ;--------------------------------------------------------------------------
 
 
 ;--------------------------------------------------------------------------

diff --git a/libsrc/cbm/read.s b/libsrc/cbm/read.s
index 9de4980ced86fd78c4b49699028676abb942be32..ee01596aa6ada0881eabfb0905d4cc7eeb76e252 100644 (file)
--- a/libsrc/cbm/read.s
+++ b/libsrc/cbm/read.s
@@ -8,7 +8,6 @@
         .export         _read
         .constructor    initstdin
 
         .export         _read
         .constructor    initstdin
 

-        .import         SETLFS, OPEN, CHKIN, BASIN, CLRCH, BSOUT, READST

         .import         rwcommon
         .import         popax
         .importzp       ptr1, ptr2, ptr3, tmp1, tmp2, tmp3
         .import         rwcommon
         .import         popax
         .importzp       ptr1, ptr2, ptr3, tmp1, tmp2, tmp3

diff --git a/libsrc/cbm/write.s b/libsrc/cbm/write.s
index dddec07920ce0e9608b4ade4d7b60c30aa817f7f..7a27f00445831f5626f27c444b41424bab7527b4 100644 (file)
--- a/libsrc/cbm/write.s
+++ b/libsrc/cbm/write.s
@@ -7,7 +7,6 @@
         .export         _write
         .constructor    initstdout
 
         .export         _write
         .constructor    initstdout
 

-        .import         SETLFS, OPEN, CKOUT, BSOUT, READST, CLRCH

         .import         rwcommon
         .importzp       sp, ptr1, ptr2, ptr3
 
         .import         rwcommon
         .importzp       sp, ptr1, ptr2, ptr3