git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel - Fixed up a lack of const-ness
[tpg/acess2.git]
/
Kernel
/
include
/
tpl_drv_joystick.h
diff --git
a/Kernel/include/tpl_drv_joystick.h
b/Kernel/include/tpl_drv_joystick.h
index
3ba441a
..
06cdb23
100644
(file)
--- a/
Kernel/include/tpl_drv_joystick.h
+++ b/
Kernel/include/tpl_drv_joystick.h
@@
-63,6
+63,7
@@
enum eTplJoystick_IOCtl {
* ioctl(..., tJoystickNumValue *)
\r
* \brief Set axis flags
\r
* \note If \a Value is equal to -1 (all bits set), the value is not changed
\r
* ioctl(..., tJoystickNumValue *)
\r
* \brief Set axis flags
\r
* \note If \a Value is equal to -1 (all bits set), the value is not changed
\r
+ * \todo Define flag values
\r
*/
\r
JOY_IOCTL_GETSETAXISFLAGS,
\r
\r
*/
\r
JOY_IOCTL_GETSETAXISFLAGS,
\r
\r
@@
-70,6
+71,7
@@
enum eTplJoystick_IOCtl {
* ioctl(..., tJoystickNumValue *)
\r
* \brief Set Button Flags
\r
* \note If \a Value is equal to -1 (all bits set), the value is not changed
\r
* ioctl(..., tJoystickNumValue *)
\r
* \brief Set Button Flags
\r
* \note If \a Value is equal to -1 (all bits set), the value is not changed
\r
+ * \todo Define flag values
\r
*/
\r
JOY_IOCTL_GETSETBUTTONFLAGS,
\r
};
\r
*/
\r
JOY_IOCTL_GETSETBUTTONFLAGS,
\r
};
\r
@@
-111,16
+113,23
@@
struct sJoystick_FileHeader
* \brief Axis Definition in file data
\r
*
\r
* Describes the current state of an axis on the joystick.
\r
* \brief Axis Definition in file data
\r
*
\r
* Describes the current state of an axis on the joystick.
\r
- * \a MinValue and \a MaxValue describe the valid range for \a CurValue
\r
- * While \a CurState is between zero and the current limit set by the
\r
- * JOY_IOCTL_GETSETAXISLIMIT IOCtl.
\r
+ * \a CursorPos is between zero and the current limit set by the
\r
+ * JOY_IOCTL_GETSETAXISLIMIT IOCtl, while \a CurValue indicates the
\r
+ * current position of the joystick axis. This is defined to be between
\r
+ * \a MinValue and \a MaxValue.
\r
*/
\r
struct sJoystick_Axis
\r
{
\r
Sint16 MinValue; //!< Minumum value for \a CurValue
\r
Sint16 MaxValue; //!< Maximum value for \a CurValue
\r
Sint16 CurValue; //!< Current value (joystick position)
\r
*/
\r
struct sJoystick_Axis
\r
{
\r
Sint16 MinValue; //!< Minumum value for \a CurValue
\r
Sint16 MaxValue; //!< Maximum value for \a CurValue
\r
Sint16 CurValue; //!< Current value (joystick position)
\r
- Uint16 Cur
State;
//!< Current state (cursor position)
\r
+ Uint16 Cur
sorPos;
//!< Current state (cursor position)
\r
};
\r
\r
};
\r
\r
+#define JOY_INFOSTRUCT(_naxies, _nbuttons) struct { \
\r
+ Uint16 NAxies, NButtons;\
\r
+ tJoystick_Axis Axies[_naxies];\
\r
+ Uint16 Buttons[_nbuttons];\
\r
+ }
\r
+
\r
#endif
\r
#endif
\r
UCC
git Repository :: git.ucc.asn.au