From b07eec55ce6c9ce97f0f472d3c8a9fb1db558464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=8F=E5=B0=9A=E5=AE=81?= <1750546761@qq.com> Date: Tue, 29 Jun 2021 20:10:32 +0800 Subject: [PATCH] Version 1(Type Cover Integrated) --- .../BigSurface.xcodeproj/project.pbxproj | 16 ----- BigSurface/BigSurface/Info.plist | 67 +------------------ .../SurfaceTypeCoverDriver.cpp | 8 --- .../SurfaceTypeCoverDriver.hpp | 2 +- 4 files changed, 3 insertions(+), 90 deletions(-) diff --git a/BigSurface/BigSurface.xcodeproj/project.pbxproj b/BigSurface/BigSurface.xcodeproj/project.pbxproj index 092cf8b..e4f6f9e 100644 --- a/BigSurface/BigSurface.xcodeproj/project.pbxproj +++ b/BigSurface/BigSurface.xcodeproj/project.pbxproj @@ -8,14 +8,12 @@ /* Begin PBXBuildFile section */ 258836AB260C5F6E00BD1AAC /* VoodooI2CPCIController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 258836AA260C5F6E00BD1AAC /* VoodooI2CPCIController.cpp */; }; - 25B97D77260B950E00657C76 /* SurfaceButtons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 257AD12C2609DBEA0082CA88 /* SurfaceButtons.cpp */; }; 25B97D78260B950E00657C76 /* VoodooI2CDeviceNub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC0AD4561F3842800070A642 /* VoodooI2CDeviceNub.cpp */; }; 25B97D7A260B950E00657C76 /* VoodooI2CPCILakeController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6FE8F89A25290B9600318126 /* VoodooI2CPCILakeController.cpp */; }; 25B97D7B260B950E00657C76 /* VoodooI2CControllerNub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACF810E61F3304720031A6F5 /* VoodooI2CControllerNub.cpp */; }; 25B97D7C260B950E00657C76 /* VoodooI2CController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC6268921F2F6CF1000CBF2D /* VoodooI2CController.cpp */; }; 25B97D82260B950E00657C76 /* VoodooI2CControllerDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACFCBA8E1F33644D00F9B59C /* VoodooI2CControllerDriver.cpp */; }; 25B97D89260B950E00657C76 /* libkmod.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BE66D8F258AC5DC003CA4AD /* libkmod.a */; }; - 25B97D8E260B950E00657C76 /* SurfaceButtons.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 257AD1292609DBE20082CA88 /* SurfaceButtons.hpp */; }; 25B97D90260B950E00657C76 /* VoodooI2CControllerNub.hpp in Headers */ = {isa = PBXBuildFile; fileRef = ACF810E71F3304720031A6F5 /* VoodooI2CControllerNub.hpp */; }; 25B97D91260B950E00657C76 /* VoodooI2CControllerDriver.hpp in Headers */ = {isa = PBXBuildFile; fileRef = ACFCBA8F1F33644D00F9B59C /* VoodooI2CControllerDriver.hpp */; }; 25B97D96260B950E00657C76 /* VoodooI2CDeviceNub.hpp in Headers */ = {isa = PBXBuildFile; fileRef = AC0AD4571F3842800070A642 /* VoodooI2CDeviceNub.hpp */; }; @@ -97,8 +95,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 257AD1292609DBE20082CA88 /* SurfaceButtons.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SurfaceButtons.hpp; sourceTree = ""; }; - 257AD12C2609DBEA0082CA88 /* SurfaceButtons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SurfaceButtons.cpp; sourceTree = ""; }; 258836AA260C5F6E00BD1AAC /* VoodooI2CPCIController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VoodooI2CPCIController.cpp; path = VoodooI2CController/VoodooI2CPCIController.cpp; sourceTree = ""; }; 25B97DA5260B950E00657C76 /* BigSurface.kext */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BigSurface.kext; sourceTree = BUILT_PRODUCTS_DIR; }; 25B97DB8260B971000657C76 /* VoodooGPIO.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = VoodooGPIO.xcodeproj; path = ../../../Dependencies/VoodooGPIO/VoodooGPIO.xcodeproj; sourceTree = ""; }; @@ -170,7 +166,6 @@ isa = PBXGroup; children = ( AC0955711F4ED49E0052E343 /* Dependencies */, - 25B97DB0260B95F700657C76 /* SurfaceButtons */, 25B97DAF260B95B600657C76 /* SurfaceTypeCover */, AC2603B21F2F294000CF238F /* VoodooI2C */, ); @@ -192,15 +187,6 @@ path = SurfaceTypeCover; sourceTree = ""; }; - 25B97DB0260B95F700657C76 /* SurfaceButtons */ = { - isa = PBXGroup; - children = ( - 257AD12C2609DBEA0082CA88 /* SurfaceButtons.cpp */, - 257AD1292609DBE20082CA88 /* SurfaceButtons.hpp */, - ); - path = SurfaceButtons; - sourceTree = ""; - }; 25B97DB9260B971000657C76 /* Products */ = { isa = PBXGroup; children = ( @@ -376,7 +362,6 @@ 25B97DFE260B97AD00657C76 /* MultitouchHelpers.hpp in Headers */, 25B97E2E260BA13A00657C76 /* VoodooI2CHIDTransducerWrapper.hpp in Headers */, 25B97DFF260B97AD00657C76 /* VoodooI2CCSGestureEngine.hpp in Headers */, - 25B97D8E260B950E00657C76 /* SurfaceButtons.hpp in Headers */, 25B97E1C260B9F1100657C76 /* VoodooI2CMultitouchHIDEventDriver.hpp in Headers */, 25B97DD0260B973400657C76 /* VoodooI2CACPICRSParser.hpp in Headers */, 25B97DFB260B97AD00657C76 /* VoodooI2CDigitiserStylus.hpp in Headers */, @@ -531,7 +516,6 @@ files = ( 25B97DCE260B973400657C76 /* VoodooI2CACPICRSParser.cpp in Sources */, 25B97E0B260B97AD00657C76 /* VoodooI2CMultitouchEngine.cpp in Sources */, - 25B97D77260B950E00657C76 /* SurfaceButtons.cpp in Sources */, 25B97D78260B950E00657C76 /* VoodooI2CDeviceNub.cpp in Sources */, 25B97D7A260B950E00657C76 /* VoodooI2CPCILakeController.cpp in Sources */, 25B97DFC260B97AD00657C76 /* VoodooI2CNativeEngine.cpp in Sources */, diff --git a/BigSurface/BigSurface/Info.plist b/BigSurface/BigSurface/Info.plist index 0b59b74..d3d643d 100644 --- a/BigSurface/BigSurface/Info.plist +++ b/BigSurface/BigSurface/Info.plist @@ -262,28 +262,7 @@ HIDDisallowRemappingOfPrimaryClick HIDPointerAccelerationTable - - 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 HIDPointerAccelerationType HIDTrackpadAcceleration HIDScrollAccelCurves @@ -408,34 +387,7 @@ HIDScrollAccelerationTable - - AACAAFVTQioABwAAAAAAAQABAAAAAQAAAAAgAAAQAABxOwAATOMA - AwAAAAdgAAAEwAAADoAAAAbxSgAX6V4ACVeCACMQWgALZ6EALBF7 - AA2N1AA03ToAD36aADvQuAASWKAARl01ABUAAABO2dgAF8AAAFXK - 7QAas+UAW2FQAB2QAABe0qoAIL75AGEgywAkLXsAYnXvACewAABj - Rl8AAIAAABMAAHE7AABWfwABAAAAAuAAAAIAAAAJYAAAAwAAABIA - AAAEwAAAIMAAAAaAAAAwgAAACGp5AEH9tgAK7bUAV4ZuAA0B2ABr - PTkADv1/AIEEcAAQy5gAkdRWABJouQCe3VAAE+c/AKikCgAXAucA - tn2SABot3ADARE4AHVjQAMX4OgAg35IAytuYACQ4bgDO7mUAJ6CX - ANIwowAAsAAAFAAAcTsAAGFOAADAAAABwAAAAQAAAANgAAACAAAA - DCAAAAMAAAAW4AAABMAAACnAAAAGQAAAOsAAAAfOggBP7OcACgWA - AGo8rgAL658AhMCkAA2RCwCfR+EADzjIALWDbwAQ/k8AxqbEABLN - UQDUeCMAFepmAOTKxwAZoVYA8qFmAB1CvwD7fXwAIQuCAQFpdAAk - S20BBVKIACegAAEIK4wAAOAAABQAAHE7AABtdwAAwAAAAeAAAAEA - AAAD4AAAAgAAAA6AAAADAAAAHEAAAATAAAA0AAAABgAAAEdAAAAH - N4wAXL7hAAkAAACAwAAACoAAAKGAAAALz7IAvU7UAA01yQDadikA - DvtPAPKF4gARLu4BCSWiABUlDwEfV8QAGT9oASzRKgAdChkBNQrG - ACDz5QE6cR4AJEARAT3XdgAnn1YBQMHWAABQAAATAABxOwAAS7AA - AQAAAAJgAAACAAAABuAAAAMAAAAMYAAABMAAABcAAAAGwAAAJAAA - AAkAAAAyAAAACz1uAEFngAANcE8AUMGhAA+sTQBgSTMAEagdAG5N - TAATT9YAd9WQABTQfgB+26MAF3odAIbYXQAagocAjp+lAB2J6QCT - vnkAIN/yAJdcWwAkO0IAmYu9ACegOACacdcAAQAAABUAAHE7AABW - fwAAwAAAAiAAAAEAAAAEgAAAAYAAAAqAAAACAAAAEaAAAAMAAAAh - gAAABMAAAD6AAAAFwAAAVEAAAAbAAABrAAAACAAAAIxAAAAJAAAA - qYAAAApAAADKwAAAC8AAAPTAAAANwAABJAAAABAAAAFEn9IAFEAA - AV49zAAZAAABbrsYABzQAAFz78AAIOAAAXhvwAAkIAABem/AACeg - AAF8JGg= - + AACAAFVTQioABwAAAAAAAQABAAAAAQAAAAAgAAAQAABxOwAATOMAAwAAAAdgAAAEwAAADoAAAAbxSgAX6V4ACVeCACMQWgALZ6EALBF7AA2N1AA03ToAD36aADvQuAASWKAARl01ABUAAABO2dgAF8AAAFXK7QAas+UAW2FQAB2QAABe0qoAIL75AGEgywAkLXsAYnXvACewAABjRl8AAIAAABMAAHE7AABWfwABAAAAAuAAAAIAAAAJYAAAAwAAABIAAAAEwAAAIMAAAAaAAAAwgAAACGp5AEH9tgAK7bUAV4ZuAA0B2ABrPTkADv1/AIEEcAAQy5gAkdRWABJouQCe3VAAE+c/AKikCgAXAucAtn2SABot3ADARE4AHVjQAMX4OgAg35IAytuYACQ4bgDO7mUAJ6CXANIwowAAsAAAFAAAcTsAAGFOAADAAAABwAAAAQAAAANgAAACAAAADCAAAAMAAAAW4AAABMAAACnAAAAGQAAAOsAAAAfOggBP7OcACgWAAGo8rgAL658AhMCkAA2RCwCfR+EADzjIALWDbwAQ/k8AxqbEABLNUQDUeCMAFepmAOTKxwAZoVYA8qFmAB1CvwD7fXwAIQuCAQFpdAAkS20BBVKIACegAAEIK4wAAOAAABQAAHE7AABtdwAAwAAAAeAAAAEAAAAD4AAAAgAAAA6AAAADAAAAHEAAAATAAAA0AAAABgAAAEdAAAAHN4wAXL7hAAkAAACAwAAACoAAAKGAAAALz7IAvU7UAA01yQDadikADvtPAPKF4gARLu4BCSWiABUlDwEfV8QAGT9oASzRKgAdChkBNQrGACDz5QE6cR4AJEARAT3XdgAnn1YBQMHWAABQAAATAABxOwAAS7AAAQAAAAJgAAACAAAABuAAAAMAAAAMYAAABMAAABcAAAAGwAAAJAAAAAkAAAAyAAAACz1uAEFngAANcE8AUMGhAA+sTQBgSTMAEagdAG5NTAATT9YAd9WQABTQfgB+26MAF3odAIbYXQAagocAjp+lAB2J6QCTvnkAIN/yAJdcWwAkO0IAmYu9ACegOACacdcAAQAAABUAAHE7AABWfwAAwAAAAiAAAAEAAAAEgAAAAYAAAAqAAAACAAAAEaAAAAMAAAAhgAAABMAAAD6AAAAFwAAAVEAAAAbAAABrAAAACAAAAIxAAAAJAAAAqYAAAApAAADKwAAAC8AAAPTAAAANwAABJAAAABAAAAFEn9IAFEAAAV49zAAZAAABbrsYABzQAAFz78AAIOAAAXhvwAAkIAABem/AACegAAF8JGg= HIDScrollAccelerationType HIDTrackpadScrollAcceleration HIDScrollResolution @@ -473,21 +425,6 @@ IOProviderClass VoodooI2CMultitouchInterface - Surface Buttons - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - IOClass - SurfaceButtons - IOMatchCategory - IODefaultMatchCategory - IONameMatch - MSHW0040 - IOProbeScore - 400 - IOProviderClass - IOACPIPlatformDevice - Surface Type Cover Driver CFBundleIdentifier diff --git a/BigSurface/BigSurface/SurfaceTypeCover/SurfaceTypeCoverDriver.cpp b/BigSurface/BigSurface/SurfaceTypeCover/SurfaceTypeCoverDriver.cpp index a53d578..6f90ccb 100644 --- a/BigSurface/BigSurface/SurfaceTypeCover/SurfaceTypeCoverDriver.cpp +++ b/BigSurface/BigSurface/SurfaceTypeCover/SurfaceTypeCoverDriver.cpp @@ -1,11 +1,3 @@ -// -// VoodooI2CPrecisionTouchpadHIDEventDriver.cpp -// VoodooI2CHID -// -// Created by Xia Shangning on 21/04/2021. -// Copyright © 2021 Xia Shangning. All rights reserved. -// - #include "SurfaceTypeCoverDriver.hpp" #include diff --git a/BigSurface/BigSurface/SurfaceTypeCover/SurfaceTypeCoverDriver.hpp b/BigSurface/BigSurface/SurfaceTypeCover/SurfaceTypeCoverDriver.hpp index 76f36f6..07b82a2 100644 --- a/BigSurface/BigSurface/SurfaceTypeCover/SurfaceTypeCoverDriver.hpp +++ b/BigSurface/BigSurface/SurfaceTypeCover/SurfaceTypeCoverDriver.hpp @@ -2,7 +2,7 @@ // SurfaceTypeCoverDriver.hpp // BigSurface // -// Created by Xia Shangning on 21/04/2021. +// Created by Xia on 21/04/2021. // Copyright © 2021 Xia Shangning. All rights reserved. //