i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Applied (cleaned up) patch by Stefano to fix bug #4742.

Browse Source 
* Note while this fixed running BeOS apps using BJoystick, it breaks all apps
  (and SDL) that have been compiled for Haiku R1/alpha1. It's really bad that
  r27171 went through unnoticed. We should really try harder next time (and
  try to get the ABI change detection script working in an automated way).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33520 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-10-11 16:40:12 +00:00
parent e0fab22f7d
commit 6e6b0851ca
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/device/Joystick.h
+10 -8
View File
@@ -5,13 +5,10 @@
#ifndef _JOYSTICK_H #ifndef _JOYSTICK_H
#define _JOYSTICK_H #define _JOYSTICK_H
#include <BeBuild.h>
#include <OS.h> #include <OS.h>
#include <SupportDefs.h> #include <SupportDefs.h>
#if DEBUG
#include <stdio.h>
#endif
class BList; class BList;
class BString; class BString;
@@ -20,6 +17,7 @@ struct entry_ref;
struct _extended_joystick; struct _extended_joystick;
struct _joystick_info; struct _joystick_info;
class BJoystick { class BJoystick {
public: public:
BJoystick(); BJoystick();
@@ -80,16 +78,20 @@ friend class _BJoystickTweaker;
status_t GatherEnhanced_info(const entry_ref* ref = NULL); status_t GatherEnhanced_info(const entry_ref* ref = NULL);
status_t SaveConfig(const entry_ref* ref = NULL); status_t SaveConfig(const entry_ref* ref = NULL);
void _ReservedJoystick1();
virtual void _ReservedJoystick2();
virtual void _ReservedJoystick3();
virtual status_t _Reserved_Joystick_4(void *, ...);
virtual status_t _Reserved_Joystick_5(void *, ...);
virtual status_t _Reserved_Joystick_6(void *, ...);
bool fBeBoxMode; bool fBeBoxMode;
bool fReservedBool; bool fReservedBool;
int ffd; int ffd;
BList* fDevices; BList* fDevices;
_joystick_info* fJoystickInfo; _joystick_info* fJoystickInfo;
char* fDevName; char* fDevName;
#if DEBUG uint32 _reserved_Joystick_[10];
public:
static FILE* sLogFile;
#endif
}; };
#endif // _JOYSTICK_H #endif // _JOYSTICK_H
src/kits/device/Joystick.cpp
+15 -1
View File
@@ -4,6 +4,7 @@
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#include <List.h> #include <List.h>
#include "Joystick.h" #include "Joystick.h"
@@ -30,8 +31,11 @@ LOG(const char *fmt, ...)
va_end(ap); va_end(ap);
fputs(buf, BJoystick::sLogFile); fflush(BJoystick::sLogFile); fputs(buf, BJoystick::sLogFile); fflush(BJoystick::sLogFile);
} }
# define LOG_ERR(text...) LOG(text) # define LOG_ERR(text...) LOG(text)
FILE *BJoystick::sLogFile = NULL;
static FILE *sLogFile = NULL;
#else #else
# define LOG(text...) # define LOG(text...)
# define LOG_ERR(text...) fprintf(stderr, text) # define LOG_ERR(text...) fprintf(stderr, text)
@@ -361,3 +365,13 @@ BJoystick::SaveConfig(const entry_ref *ref)
return B_ERROR; return B_ERROR;
} }
// #pragma mark - FBC protection
void BJoystick::_ReservedJoystick1() {}
void BJoystick::_ReservedJoystick2() {}
void BJoystick::_ReservedJoystick3() {}
status_t BJoystick::_Reserved_Joystick_4(void*, ...) { return B_ERROR; }
status_t BJoystick::_Reserved_Joystick_5(void*, ...) { return B_ERROR; }
status_t BJoystick::_Reserved_Joystick_6(void*, ...) { return B_ERROR; }