Fixed none/crt0.s to respect none.cfg

[cc65] / include / cbm.h

diff --git a/include/cbm.h b/include/cbm.h
index d15ec53814f236015bd10b361c28bd4ab00a7148..da63375b238b5b73b3bd87256e45a9992a02c47c 100644 (file)
--- a/include/cbm.h
+++ b/include/cbm.h
@@ -75,10 +75,8 @@
 
 
 
-/* Expanding upon joystick.h */
-#define JOY_FIRE_IDX            4
-
-#define JOY_FIRE(v)             ((v) & joy_masks[JOY_FIRE_IDX])
+#define JOY_FIRE_MASK   JOY_BTN_1_MASK
+#define JOY_FIRE(v)     ((v) & JOY_FIRE_MASK)
 
 
 
@@ -160,17 +158,16 @@ struct cbm_dirent {
 unsigned char get_tv (void);
 /* Return the video mode the machine is using. */
 
-#define KBDREPEAT_CURSOR 0x00
-#define KBDREPEAT_NONE   0x40
-#define KBDREPEAT_ALL    0x80
+#define KBREPEAT_CURSOR 0x00
+#define KBREPEAT_NONE   0x40
+#define KBREPEAT_ALL    0x80
 
-unsigned char kbrepeat(unsigned char);
-unsigned char kbrepeatdelay(unsigned char);
-unsigned char kbrepeatrate(unsigned char);
+unsigned char __fastcall__ kbrepeat (unsigned char mode);
+/* Changes which keys have automatic repeat. */
 
 #if !defined(__CBM610__) && !defined(__PET__)
 void waitvsync (void);
-/* wait for the start of the next frame */
+/* Wait for the start of the next frame */
 #endif
 
 /*****************************************************************************/
@@ -212,6 +209,7 @@ void __fastcall__ cbm_k_setnam (const char* Name);
 void __fastcall__ cbm_k_talk (unsigned char dev);
 void cbm_k_udtim (void);
 void cbm_k_unlsn (void);
+void cbm_k_untlk (void);