Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 548 → Rev 549

/shark/trunk/drivers/input/shark/shark_joy.c
43,8 → 43,6
/* Functions */
extern int joystick_get(int *type, int *number, int *value);
 
extern int input_installed;
 
#define JS_EVENT_BUTTON 0x01 /* button pressed/released */
#define JS_EVENT_AXIS 0x02 /* joystick moved */
#define JS_EVENT_INIT 0x80 /* initial state of device */
129,11 → 127,15
 
 
/* Init the Linux Joystick Driver */
int JOY26_init() {
int JOY26_installed(void) {
return joystick_installed;
}
 
int JOY26_init(void) {
 
int ret;
 
if (input_installed == FALSE)
if (INPUT26_installed() == FALSE)
if (INPUT26_init()) {
printk(KERN_ERR "Unable to open Input SubSystem.\n");
return -1;
167,7 → 169,7
return 0;
}
 
int JOY26_close() {
int JOY26_close(void) {
if (!joystick_installed)
return -1;