fixup conio.c some more. also includes merge of upstream/master because git is retarded.

[cc65] / include / joystick.h

diff --git a/include/joystick.h b/include/joystick.h
index 2e6a3fefe0073db47fc11807d733da8c520611bf..710d9b5a6b65852ae65101a72647a0888388f763 100644 (file)
--- a/include/joystick.h
+++ b/include/joystick.h
@@ -1,8 +1,8 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                               joystick.h                                 */
+/*                                joystick.h                                 */
 /*                                                                           */
-/*              Read the joystick on systems that support it                */
+/*               Read the joystick on systems that support it                */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
@@ -52,8 +52,8 @@
 #define JOY_ERR_NO_DEVICE       4       /* Device (hardware) not found */
 
 /* Argument for the joy_read function */
-#define JOY_1          0
-#define JOY_2          1
+#define JOY_1           0
+#define JOY_2           1
 
 /* The following codes are *indices* into the joy_masks array */
 #define JOY_UP          0
@@ -83,7 +83,7 @@ extern const void joy_static_stddrv[];
 
 
 /*****************************************************************************/
-/*                                Functions                                 */
+/*                                 Functions                                 */
 /*****************************************************************************/
 
 
@@ -99,8 +99,8 @@ unsigned char __fastcall__ joy_install (void* driver);
 
 unsigned char joy_uninstall (void);
 /* Uninstall the currently loaded driver and return an error code.
- * Note: This call does not free allocated memory.
- */
+** Note: This call does not free allocated memory.
+*/
 
 unsigned char joy_count (void);
 /* Return the number of joysticks supported by the driver */