Merge branch 'master' of https://github.com/jedeoric/cc65

[cc65] / include / apple2.h

diff --git a/include/apple2.h b/include/apple2.h
index 51475e2348a3761ea310dbc0c0c62ca206b87868..421b5db6c9caa4a44886dc9a6399493480d44f5a 100644 (file)
--- a/include/apple2.h
+++ b/include/apple2.h
@@ -42,6 +42,7 @@
 #endif
 
 
+#include <apple2_filetype.h>
 
 /*****************************************************************************/
 /*                                   Data                                    */
@@ -90,6 +91,14 @@
 #define CH_RTEE      '+'
 #define CH_CROSS     '+'
 
+/* Masks for joy_read */
+#define JOY_UP_MASK     0x10
+#define JOY_DOWN_MASK   0x20
+#define JOY_LEFT_MASK   0x04
+#define JOY_RIGHT_MASK  0x08
+#define JOY_BTN_1_MASK  0x40
+#define JOY_BTN_2_MASK  0x80
+
 /* Return codes for get_ostype */
 #define APPLE_UNKNOWN  0x00
 #define APPLE_II       0x10  /* Apple ][                    */
@@ -109,23 +118,23 @@
 
 extern unsigned char _dos_type;
 /* Valid _dos_type values:
- *
- * AppleDOS 3.3   - 0x00
- * ProDOS 8 1.0.1 - 0x10
- * ProDOS 8 1.0.2 - 0x10
- * ProDOS 8 1.1.1 - 0x11
- * ProDOS 8 1.2   - 0x12
- * ProDOS 8 1.3   - 0x13
- * ProDOS 8 1.4   - 0x14
- * ProDOS 8 1.5   - 0x15
- * ProDOS 8 1.6   - 0x16
- * ProDOS 8 1.7   - 0x17
- * ProDOS 8 1.8   - 0x18
- * ProDOS 8 1.9   - 0x18 (!)
- * ProDOS 8 2.0.1 - 0x21
- * ProDOS 8 2.0.2 - 0x22
- * ProDOS 8 2.0.3 - 0x23
- */
+**
+** AppleDOS 3.3   - 0x00
+** ProDOS 8 1.0.1 - 0x10
+** ProDOS 8 1.0.2 - 0x10
+** ProDOS 8 1.1.1 - 0x11
+** ProDOS 8 1.2   - 0x12
+** ProDOS 8 1.3   - 0x13
+** ProDOS 8 1.4   - 0x14
+** ProDOS 8 1.5   - 0x15
+** ProDOS 8 1.6   - 0x16
+** ProDOS 8 1.7   - 0x17
+** ProDOS 8 1.8   - 0x18
+** ProDOS 8 1.9   - 0x18 (!)
+** ProDOS 8 2.0.1 - 0x21
+** ProDOS 8 2.0.2 - 0x22
+** ProDOS 8 2.0.3 - 0x23
+*/
 
 
 
@@ -136,10 +145,9 @@ extern unsigned char _dos_type;
 
 
 /* The file stream implementation and the POSIX I/O functions will use the
- * following variables to determine the file type and the aux type to use.
- */
-extern unsigned char _filetype;  /* Default: 6 */
-extern unsigned int _auxtype;    /* Default: 0 */
+** following struct to set the date and time stamp on files. This specificially
+** applies to the open and fopen functions.
+*/
 extern struct {
     struct {
         unsigned day  :5;
@@ -178,18 +186,18 @@ void rebootafterexit (void);
 
 #define ser_apple2_slot(num)  ser_ioctl (0, (void*) (num))
 /* Select a slot number from 1 to 7 prior to ser_open.
- * The default slot number is 2.
- */
+** The default slot number is 2.
+*/
 
 #define tgi_apple2_mix(onoff)  tgi_ioctl (0, (void*) (onoff))
 /* If onoff is 1, graphics/text mixed mode is enabled.
- * If onoff is 0, graphics/text mixed mode is disabled.
- */
+** If onoff is 0, graphics/text mixed mode is disabled.
+*/
 
 /* The following #defines will cause the matching functions calls in conio.h
- * to be overlaid by macros with the same names, saving the function call
- * overhead.
- */
+** to be overlaid by macros with the same names, saving the function call
+** overhead.
+*/
 #define _textcolor(color)    COLOR_WHITE
 #define _bgcolor(color)      COLOR_BLACK
 #define _bordercolor(color)  COLOR_BLACK