X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Finclude%2Ftpl_drv_joystick.h;h=06cdb23cb28caf6d0469601daae0aa8ecd2c3136;hb=f737fb47a583fca5c922604d419ab744609308df;hp=888d4ac13bfa91dce6f66008628a9d10eabff50c;hpb=1bd380e56add4d1487232b1051ac19ec142f63f1;p=tpg%2Facess2.git

diff --git a/Kernel/include/tpl_drv_joystick.h b/Kernel/include/tpl_drv_joystick.h
index 888d4ac1..06cdb23c 100644
--- a/Kernel/include/tpl_drv_joystick.h
+++ b/Kernel/include/tpl_drv_joystick.h
@@ -113,16 +113,23 @@ struct sJoystick_FileHeader
  * \brief Axis Definition in file data
  *
  * Describes the current state of an axis on the joystick.
- * \a MinValue and \a MaxValue describe the valid range for \a CurValue
- * While \a CurState is between zero and the current limit set by the
- * JOY_IOCTL_GETSETAXISLIMIT IOCtl.
+ * \a CursorPos is between zero and the current limit set by the
+ * JOY_IOCTL_GETSETAXISLIMIT IOCtl, while \a CurValue indicates the
+ * current position of the joystick axis. This is defined to be between
+ * \a MinValue and \a MaxValue.
  */
 struct sJoystick_Axis
 {
 	Sint16	MinValue;	//!< Minumum value for \a CurValue
 	Sint16	MaxValue;	//!< Maximum value for \a CurValue
 	Sint16	CurValue;	//!< Current value (joystick position)
-	Uint16	CurState;	//!< Current state (cursor position)
+	Uint16	CursorPos;	//!< Current state (cursor position)
 };
 
+#define JOY_INFOSTRUCT(_naxies, _nbuttons) struct { \
+	Uint16	NAxies, NButtons;\
+	tJoystick_Axis	Axies[_naxies];\
+	Uint16	Buttons[_nbuttons];\
+	}
+
 #endif