1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
--- src/joystick/bsd/SDL_sysjoystick.c.orig Mon May 1 12:02:40 2006
+++ src/joystick/bsd/SDL_sysjoystick.c Wed Jul 5 01:11:57 2006
@@ -123,6 +123,12 @@
struct report_desc *repdesc;
struct report inreport;
int axis_map[JOYAXE_count]; /* map present JOYAXE_* to 0,1,..*/
+ int x;
+ int y;
+ int xmin;
+ int ymin;
+ int xmax;
+ int ymax;
};
static char *joynames[MAX_JOYS];
@@ -257,6 +263,12 @@
joy->hwdata = hw;
hw->fd = fd;
hw->path = strdup(path);
+ hw->x = 0;
+ hw->y = 0;
+ hw->xmin = 0xffff;
+ hw->ymin = 0xffff;
+ hw->xmax = 0;
+ hw->ymax = 0;
if (! SDL_strncmp(path, "/dev/joy", 8)) {
hw->type = BSDJOY_JOY;
joy->naxes = 2;
@@ -380,43 +392,42 @@
#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
struct joystick gameport;
- static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
if (joy->hwdata->type == BSDJOY_JOY) {
if (read(joy->hwdata->fd, &gameport, sizeof gameport) != sizeof gameport)
return;
- if (abs(x - gameport.x) > 8) {
- x = gameport.x;
- if (x < xmin) {
- xmin = x;
+ if (abs(joy->hwdata->x - gameport.x) > 8) {
+ joy->hwdata->x = gameport.x;
+ if (joy->hwdata->x < joy->hwdata->xmin) {
+ joy->hwdata->xmin = joy->hwdata->x;
}
- if (x > xmax) {
- xmax = x;
+ if (joy->hwdata->x > joy->hwdata->xmax) {
+ joy->hwdata->xmax = joy->hwdata->x;
}
- if (xmin == xmax) {
- xmin--;
- xmax++;
+ if (joy->hwdata->xmin == joy->hwdata->xmax) {
+ joy->hwdata->xmin--;
+ joy->hwdata->xmax++;
}
- v = (Sint32)x;
- v -= (xmax + xmin + 1)/2;
- v *= 32768/((xmax - xmin + 1)/2);
+ v = (Sint32)joy->hwdata->x;
+ v -= (joy->hwdata->xmax + joy->hwdata->xmin + 1)/2;
+ v *= 32768/((joy->hwdata->xmax - joy->hwdata->xmin + 1)/2);
SDL_PrivateJoystickAxis(joy, 0, v);
}
- if (abs(y - gameport.y) > 8) {
- y = gameport.y;
- if (y < ymin) {
- ymin = y;
+ if (abs(joy->hwdata->y - gameport.y) > 8) {
+ joy->hwdata->y = gameport.y;
+ if (joy->hwdata->y < joy->hwdata->ymin) {
+ joy->hwdata->ymin = joy->hwdata->y;
}
- if (y > ymax) {
- ymax = y;
+ if (joy->hwdata->y > joy->hwdata->ymax) {
+ joy->hwdata->ymax = joy->hwdata->y;
}
- if (ymin == ymax) {
- ymin--;
- ymax++;
+ if (joy->hwdata->ymin == joy->hwdata->ymax) {
+ joy->hwdata->ymin--;
+ joy->hwdata->ymax++;
}
- v = (Sint32)y;
- v -= (ymax + ymin + 1)/2;
- v *= 32768/((ymax - ymin + 1)/2);
+ v = (Sint32)joy->hwdata->y;
+ v -= (joy->hwdata->ymax + joy->hwdata->ymin + 1)/2;
+ v *= 32768/((joy->hwdata->ymax - joy->hwdata->ymin + 1)/2);
SDL_PrivateJoystickAxis(joy, 1, v);
}
if (gameport.b1 != joy->buttons[0]) {
|
