Unified names of CBM kernal level functions and completed the list of

functions in the cbm.h header file.

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

diff --git a/include/cbm.h b/include/cbm.h
index 9ce3cbfbfce2127b5483c6a1ec9dcbfb8e86d6c7..c9d21d657e2acee3877f8601382f4e00fcaed099 100644 (file)
--- a/include/cbm.h
+++ b/include/cbm.h
@@ -172,21 +172,27 @@ unsigned char get_tv (void);
 #define CBM_SEQ                2       /* default is ",r" -- or ",s" when writing */
 
 /* Kernal-level functions */
-void __fastcall__ cbm_k_setlfs (unsigned char LFN, unsigned char DEV,
-                                unsigned char SA);
-void __fastcall__ cbm_k_setnam (const char* Name);
-unsigned int __fastcall__ cbm_k_load(unsigned char flag, unsigned addr);
-unsigned char __fastcall__ cbm_k_save(unsigned int start, unsigned int end);
-unsigned char cbm_k_open (void);
-void __fastcall__ cbm_k_close (unsigned char FN);
-signed char cbm_k_readst (void);
-unsigned char __fastcall__ cbm_k_chkin (unsigned char FN);
-unsigned char __fastcall__ cbm_k_ckout (unsigned char FN);
+unsigned char cbm_k_acptr (void);
 unsigned char cbm_k_basin (void);
-unsigned char cbm_k_getin (void);
 void __fastcall__ cbm_k_bsout (unsigned char C);
-void cbm_k_clrch (void);
+unsigned char __fastcall__ cbm_k_chkin (unsigned char FN);
+void __fastcall__ cbm_k_ciout (unsigned char C);
+unsigned char __fastcall__ cbm_k_ckout (unsigned char FN);
 void cbm_clall (void);
+void __fastcall__ cbm_k_close (unsigned char FN);
+void cbm_k_clrch (void);
+unsigned char cbm_k_getin (void);
+unsigned cbm_k_iobase (void);
+void __fastcall__ cbm_k_listen (unsigned char dev);
+unsigned int __fastcall__ cbm_k_load(unsigned char flag, unsigned addr);
+unsigned char cbm_k_open (void);
+unsigned char cbm_k_readst (void);
+unsigned char __fastcall__ cbm_k_save(unsigned int start, unsigned int end);
+void __fastcall__ cbm_k_setlfs (unsigned char LFN, unsigned char DEV, 
+                                unsigned char SA);
+void __fastcall__ cbm_k_setnam (const char* Name);
+void __fastcall__ cbm_k_talk (unsigned char dev);
+void cbm_k_unlsn (void);
 
 
 

diff --git a/libsrc/cbm/c_acptr.s b/libsrc/cbm/c_acptr.s
index 162ae84e8744ef65f80d5c79c1bf59f6e3b3cc42..6a56659bf6ec10132a3e6603bb68d3591714d971 100644 (file)
--- a/libsrc/cbm/c_acptr.s
+++ b/libsrc/cbm/c_acptr.s
@@ -1,14 +1,14 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; unsigned char cbm_acptr (void);
+; unsigned char cbm_k_acptr (void);
 ;
 
-               .export         _cbm_acptr
+               .export         _cbm_k_acptr
         .import         ACPTR
 
 
-_cbm_acptr:
+_cbm_k_acptr:
        jsr     ACPTR
        ldx     #0
        rts

diff --git a/libsrc/cbm/c_ciout.s b/libsrc/cbm/c_ciout.s
index 72f42daf3b12d14e97cd4ad8fbe1af55a35a9401..fd8a48380fe2aac27e7e27d31592c4850fb14bb8 100644 (file)
--- a/libsrc/cbm/c_ciout.s
+++ b/libsrc/cbm/c_ciout.s
@@ -1,12 +1,10 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; void __fastcall__ cbm_ciout (unsigned char C);
+; void __fastcall__ cbm_k_ciout (unsigned char C);
 ;
 
-               .export         _cbm_ciout
         .import         CIOUT
-
-_cbm_ciout = CIOUT
+               .export         _cbm_k_ciout := CIOUT
 
 

diff --git a/libsrc/cbm/c_clall.s b/libsrc/cbm/c_clall.s
index e4d8646928a56b7b3849f1cd8154f3b56be58c5f..c2bb93e34d10270408e07b65f593d0d4046b18bf 100644 (file)
--- a/libsrc/cbm/c_clall.s
+++ b/libsrc/cbm/c_clall.s
@@ -1,11 +1,8 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; void cbm_clall (void);
+; void cbm_k_clall (void);
 ;
 
-               .export         _cbm_clall
         .import         CLALL
-
-
-_cbm_clall = CLALL
+               .export         _cbm_k_clall := CLALL

diff --git a/libsrc/cbm/c_iobase.s b/libsrc/cbm/c_iobase.s
index 942fd479aa02d76a365f356529de1c9fdb063144..c4dc4cb6fb5520a3ecde9ed34961926f316fd586 100644 (file)
--- a/libsrc/cbm/c_iobase.s
+++ b/libsrc/cbm/c_iobase.s
@@ -1,13 +1,13 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; unsigned cbm_iobase (void);
+; unsigned cbm_k_iobase (void);
 ;
 
-               .export         _cbm_iobase
+               .export         _cbm_k_iobase
         .import         IOBASE
 
-_cbm_iobase:
+_cbm_k_iobase:                   
        jsr     IOBASE
        txa
        pha

diff --git a/libsrc/cbm/c_listen.s b/libsrc/cbm/c_listen.s
index 9502c2d1a2645391c331f146a1db97b6a44fa211..b80813529db630a7a9e8d5bbdf35d749b4819151 100644 (file)
--- a/libsrc/cbm/c_listen.s
+++ b/libsrc/cbm/c_listen.s
@@ -1,13 +1,11 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; void __fastcall__ cbm_listen (unsigned char dev);
+; void __fastcall__ cbm_k_listen (unsigned char dev);
 ;
 
-               .export         _cbm_listen
         .import         LISTEN
-
-_cbm_listen = LISTEN
+               .export         _cbm_k_listen := LISTEN
 
 
 

diff --git a/libsrc/cbm/c_talk.s b/libsrc/cbm/c_talk.s
index 062b5e49248cd606af126ea960f2282cb74a29f6..05a1b1cba171903d9ab1da34b63cbc87f5dccadf 100644 (file)
--- a/libsrc/cbm/c_talk.s
+++ b/libsrc/cbm/c_talk.s
@@ -1,14 +1,11 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; void __fastcall__ cbm_talk (unsigned char dev);
+; void __fastcall__ cbm_k_talk (unsigned char dev);
 ;
 
-               .export         _cbm_talk
         .import         TALK
-
-
-_cbm_talk = TALK
+               .export         _cbm_k_talk := TALK
 
 
 

diff --git a/libsrc/cbm/c_unlsn.s b/libsrc/cbm/c_unlsn.s
index d93102f86c6b28d8c4c6231a6f9ea3eddffb3221..011755f39e140bb90e47767c05e3f6774013abdd 100644 (file)
--- a/libsrc/cbm/c_unlsn.s
+++ b/libsrc/cbm/c_unlsn.s
@@ -1,11 +1,8 @@
 ;
 ; Ullrich von Bassewitz, 03.06.1999
 ;
-; void cbm_unlsn (void);
+; void cbm_k_unlsn (void);
 ;
 
-               .export         _cbm_unlsn
         .import         UNLSN
-
-
-_cbm_unlsn = UNLSN
+               .export         _cbm_k_unlsn := UNLSN