kylefang/OS-X-Voodoo-PS2-Controller
1
0
Fork 0
mirror of https://github.com/zhigang1992/OS-X-Voodoo-PS2-Controller.git synced 2026-01-12 17:32:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

update xcode 4.61; cleanup static analyzer issues

Browse Source
This commit is contained in:
RehabMan
2013-03-14 18:37:12 +00:00
parent f9a6064058
commit e0696bbb4e
14 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -17,7 +17,7 @@ https://code.google.com/p/os-x-voodoo-ps2-controller/downloads/list
### Build Environment
My build environment is currently Xcode 4.52, using SDK 10.7, targeting OS X 10.6.
My build environment is currently Xcode 4.61, using SDK 10.7, targeting OS X 10.6.
No other build environment is supported.

10
VoodooPS2Controller.xcodeproj/project.pbxproj
View File

@@ -560,7 +560,7 @@
84167808161B55B2002C60E6 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0450;
LastUpgradeCheck = 0460;
ORGANIZATIONNAME = rehabman;
};
buildConfigurationList = 8416780B161B55B2002C60E6 /* Build configuration list for PBXProject "VoodooPS2Controller" */;
@@ -794,7 +794,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.8.0;
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
@@ -829,7 +828,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.8.0;
DEPLOYMENT_POSTPROCESSING = YES;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
@@ -971,7 +969,6 @@
84C337A11698B693009B8177 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -980,7 +977,6 @@
84C337A21698B693009B8177 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
@@ -989,7 +985,6 @@
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
GCC_ENABLE_OBJC_GC = supported;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "VoodooPS2synapticsPane/VoodooPS2synapticsPane-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
@@ -1004,7 +999,6 @@
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
GCC_ENABLE_OBJC_GC = supported;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "VoodooPS2synapticsPane/VoodooPS2synapticsPane-Prefix.pch";
INFOPLIST_FILE = "VoodooPS2synapticsPane/VoodooPS2synapticsPane-Info.plist";
@@ -1017,7 +1011,6 @@
84F42503161B5A4900777765 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -1026,7 +1019,6 @@
84F42504161B5A4900777765 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;

2
VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/All Kext.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/All.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Controller.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Daemon.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Keyboard.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Mouse.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Trackpad.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2synapticsPane.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/synapticsconfigload.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

4
VoodooPS2Controller/AppleACPIPS2Nub.cpp
View File

@@ -127,10 +127,6 @@ IOService *AppleACPIPS2Nub::findMouseDevice()
void AppleACPIPS2Nub::mergeInterruptProperties(IOService *pnpProvider, long)
{
/* Make sure we're called from within start() where these i-vars are valid */
if(m_interruptControllers == NULL || m_interruptSpecifiers == NULL)
return;
/* Get the interrupt controllers/specifiers arrays from the provider, and make sure they
* exist and contain at least one entry. We assume they contain exactly one entry.
*/

6
VoodooPS2Controller/VoodooPS2Controller.cpp
View File

@@ -1756,8 +1756,9 @@ void ApplePS2Controller::setPowerStateCallout( thread_call_param_t param0,
thread_call_param_t param1 )
{
ApplePS2Controller * me = (ApplePS2Controller *) param0;
assert(me);
if ( me && me->_workLoop )
if (me->_workLoop)
{
me->_workLoop->runAction( /* Action */ setPowerStateAction,
/* target */ me,
@@ -2115,6 +2116,9 @@ OSDictionary* ApplePS2Controller::getConfigurationNode(OSDictionary* list, OSStr
EXPORT OSDictionary* ApplePS2Controller::makeConfigurationNode(OSDictionary* list, OSString* model)
{
if (!list)
return NULL;
OSDictionary* result = 0;
OSDictionary* defaultNode = _getConfigurationNode(list, kDefault);
OSDictionary* platformNode = getConfigurationNode(list, model);

6
VoodooPS2Daemon/main.cpp
View File

@@ -122,10 +122,10 @@ static void DeviceAdded(void *refCon, io_iterator_t iter1)
++g_MouseCount;
DEBUG_LOG("mouse count is now: %d\n", g_MouseCount);
}
kr = IOObjectRelease(temp);
IOObjectRelease(temp);
}
kr = IOObjectRelease(iter2);
kr = IOObjectRelease(service);
IOObjectRelease(iter2);
IOObjectRelease(service);
}
if (oldMouseCount != g_MouseCount)
SendMouseCount(g_MouseCount);