projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
via-velocity: velocity_init_{rd/tx}_ring use kcalloc(..., GFP_KERNEL).
[cascardo/linux.git]
/
include
/
linux
/
joystick.h
diff --git
a/include/linux/joystick.h
b/include/linux/joystick.h
index
5fd20dd
..
b5e0512
100644
(file)
--- a/
include/linux/joystick.h
+++ b/
include/linux/joystick.h
@@
-2,8
+2,6
@@
#define _LINUX_JOYSTICK_H
/*
#define _LINUX_JOYSTICK_H
/*
- * $Id: joystick.h,v 1.3 2000/11/30 11:07:05 vojtech Exp $
- *
* Copyright (C) 1996-2000 Vojtech Pavlik
*
* Sponsored by SuSE
* Copyright (C) 1996-2000 Vojtech Pavlik
*
* Sponsored by SuSE
@@
-111,25
+109,25
@@
struct js_corr {
#define JS_SET_ALL 8
struct JS_DATA_TYPE {
#define JS_SET_ALL 8
struct JS_DATA_TYPE {
-
int32_t
buttons;
-
int32_t
x;
-
int32_t
y;
+
__s32
buttons;
+
__s32
x;
+
__s32
y;
};
struct JS_DATA_SAVE_TYPE_32 {
};
struct JS_DATA_SAVE_TYPE_32 {
-
int32_t
JS_TIMEOUT;
-
int32_t
BUSY;
-
int32_t
JS_EXPIRETIME;
-
int32_t
JS_TIMELIMIT;
+
__s32
JS_TIMEOUT;
+
__s32
BUSY;
+
__s32
JS_EXPIRETIME;
+
__s32
JS_TIMELIMIT;
struct JS_DATA_TYPE JS_SAVE;
struct JS_DATA_TYPE JS_CORR;
};
struct JS_DATA_SAVE_TYPE_64 {
struct JS_DATA_TYPE JS_SAVE;
struct JS_DATA_TYPE JS_CORR;
};
struct JS_DATA_SAVE_TYPE_64 {
-
int32_t
JS_TIMEOUT;
-
int32_t
BUSY;
-
int64_t
JS_EXPIRETIME;
-
int64_t
JS_TIMELIMIT;
+
__s32
JS_TIMEOUT;
+
__s32
BUSY;
+
__s64
JS_EXPIRETIME;
+
__s64
JS_TIMELIMIT;
struct JS_DATA_TYPE JS_SAVE;
struct JS_DATA_TYPE JS_CORR;
};
struct JS_DATA_TYPE JS_SAVE;
struct JS_DATA_TYPE JS_CORR;
};