Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修复睡眠唤醒后初始化失败的问题 #18

Merged
merged 3 commits into from
Feb 9, 2021
Merged

修复睡眠唤醒后初始化失败的问题 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07ce683
Fixed sleep wake in 0x522710EC
Jan 26, 2021
9b60e99
Fixed sleep wake in 0x522710EC
Jan 26, 2021
bcd7ee8
Fixed failure to initialize after sleep awakening.
Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
16 changes: 11 additions & 5 deletions Sinetek-rtsx.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
9E9EED9F1E4C65AD00E640DB /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1150;
LastUpgradeCheck = 1240;
ORGANIZATIONNAME = sinetek;
TargetAttributes = {
9E9EEDA71E4C65AD00E640DB = {
Expand Down Expand Up @@ -360,6 +360,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -391,10 +392,10 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MACOSX_DEPLOYMENT_TARGET = 10.14;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx10.13;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/Sinetek-rtsx";
};
name = Debug;
Expand Down Expand Up @@ -424,6 +425,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand All @@ -447,16 +449,19 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MACOSX_DEPLOYMENT_TARGET = 10.14;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx10.13;
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/Sinetek-rtsx";
};
name = Release;
};
9E9EEDB31E4C65AD00E640DB /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_DEADCODE_DEADSTORES = NO;
CLANG_ANALYZER_DIVIDE_BY_ZERO = NO;
CLANG_ANALYZER_NULL_DEREFERENCE = NO;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 7;
Expand All @@ -466,6 +471,7 @@
MODULE_VERSION = 2.3.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.sinet3k.Sinetek-rtsx";
PRODUCT_NAME = "$(TARGET_NAME)";
RUN_CLANG_STATIC_ANALYZER = YES;
WRAPPER_EXTENSION = kext;
};
name = Debug;
Expand Down
28 changes: 27 additions & 1 deletion Sinetek-rtsx/Sinetek_rtsx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,20 +319,46 @@ IOReturn Sinetek_rtsx::setPowerState(unsigned long powerStateOrdinal, IOService

switch (powerStateOrdinal) {
case kPowerStateSleep:
IOSleep(1000);
// save state
rtsx_activate(&rtsx_softc_original_->sc_dev, DVACT_SUSPEND);
IOSleep(1000);
break;
case kPowerStateNormal:
IOSleep(1000);
// re-initialize chip
rtsx_init(rtsx_softc_original_, 1);

IOSleep(1000);
// restore state
rtsx_activate(&rtsx_softc_original_->sc_dev, DVACT_RESUME);
break;
default:
UTL_DEBUG_DEF("Ignoring unknown power state (%lu)", powerStateOrdinal);
break;
}
//Power management also needs some optimizations, for example, the system enters a locked state after a long sleep, the card reader cannot automatically detect and mount the card reader after waking up, and manual unplugging is required.
//You need to add a parameter to the Sinetek_rtsx::setPowerState to get the system state so that the device can be restored when the user is logged in。
/*
If version
//Determine whether the POWER state is Sleep
if(powerStateOrdinal == kPowerStateSleep){
IOSleep(1000);
// save state
rtsx_activate(&rtsx_softc_original_->sc_dev, DVACT_SUSPEND);
IOSleep(1000);
}
//Determine whether the POWER status is Normal
else if(powerStateOrdinal == kPowerStateNormal){
IOSleep(1000);
// re-initialize chip
rtsx_init(rtsx_softc_original_, 1);
IOSleep(1000);
// restore state
rtsx_activate(&rtsx_softc_original_->sc_dev, DVACT_RESUME);
}
else{
UTL_DEBUG_DEF("Ignoring unknown power state (%lu)", powerStateOrdinal);
}*/
UTL_DEBUG_FUN("END");
return IOPMAckImplied;
}
Expand Down