Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove the JoystickPrivate.h again and move the variable_joystick structure

Browse Source 
into joystick_driver.h as it is convenient to have also on the driver side.
* Added comments explaining the data structure and use case of the structure.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41886 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2011-06-03 19:48:16 +00:00
parent ab1763688f
commit 6e0cca2f96
3 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
headers/private/device/JoystickPrivate.h
View File

@ -1,25 +0,0 @@
/*
* Copyright 2011 Michael Lotz <mmlr@mlotz.ch>
* Distributed under the terms of the MIT license.
*/
#ifndef _JOYSTICK_PRIVATE_H
#define _JOYSTICK_PRIVATE_H
#include <SupportDefs.h>
typedef struct _variable_joystick {
uint32 axis_count;
uint32 hat_count;
uint32 button_blocks;
// these pointers all point into the data section
bigtime_t * timestamp;
uint32 * buttons;
int16 * axes;
uint8 * hats;
size_t data_size;
uint8 * data;
} variable_joystick;
#endif // _JOYSTICK_PRIVATE_H

30
headers/private/device/joystick_driver.h
View File

@ -41,6 +41,36 @@ typedef struct _extended_joystick {
uint8 hats[MAX_HATS]; /* 0 through 8 (1 == N, 3 == E, 5 == S, 7 == W) */
} _PACKED extended_joystick;
// This is a helper structure to manage variably sized data. It is here to
// make storing and accessing the flat data in the "data" member easier. When
// transferring data via read/write/ioctl only the flat data in "data" is ever
// transmitted, not the whole structure.
typedef struct _variable_joystick {
uint32 axis_count;
uint32 hat_count;
uint32 button_blocks;
// count of 32 bit button bitmap blocks == (button_count + 31) / 32
// These pointers all point into the data section and are here for
// convenience. They need to be set up manually by the one who creates this
// structure.
bigtime_t * timestamp;
uint32 * buttons;
int16 * axes;
uint8 * hats;
// The data is always structured in the following way (see extended_joystick
// for data interpretation):
// bigtime_t timestamp;
// uint32 button_bitmap_blocks[button_block];
// int16 axes[axis_count];
// uint8 hats[hat_count];
size_t data_size;
uint8 * data;
} variable_joystick;
#define MAX_CONFIG_SIZE 100
enum { /* flags for joystick module info */

1
src/kits/device/Joystick.cpp
View File

@ -6,7 +6,6 @@
#include <Joystick.h>
#include <JoystickPrivate.h>
#include <JoystickTweaker.h>
#include <new>