Add reset code (#110)

* Add reset handling for resume/uncommanded resets
VoodooSMBus · Apr 7, 2021 · 7b64f34 · 7b64f34
1 parent f949a20
commit 7b64f34
Show file tree

Hide file tree

Showing 17 changed files with 244 additions and 129 deletions.
diff --git a/VoodooRMI.xcodeproj/project.pbxproj b/VoodooRMI.xcodeproj/project.pbxproj
@@ -148,8 +148,8 @@
 			isa = PBXGroup;
 			children = (
 				286587D824C13D9600E74848 /* Info.plist */,
-				A4560F0B247F406F0009CBE0 /* RMISMBus.cpp */,
 				286587AE24C13D0B00E74848 /* RMISMBus.hpp */,
+				A4560F0B247F406F0009CBE0 /* RMISMBus.cpp */,
 			);
 			path = SMBus;
 			sourceTree = "<group>";

diff --git a/VoodooRMI/Functions/F01.cpp b/VoodooRMI/Functions/F01.cpp
@@ -449,20 +449,22 @@ void F01::rmi_f01_attention()
 
 IOReturn F01::message(UInt32 type, IOService *provider, void *argument)
 {
-    int error;
+    int error = 0;
     switch (type) {
-        case kHandleRMISuspend:
+        case kHandleRMISleep:
             error = rmi_f01_suspend();
-            if (error) return kIOReturnError;
             break;
         case kHandleRMIResume:
             error = rmi_f01_resume();
-            if (error) return kIOReturnError;
             break;
         case kHandleRMIAttention:
             rmi_f01_attention();
             break;
+        case kHandleRMIConfig:
+            error = rmi_f01_config();
+            break;
     }
 
+    if (error) return kIOReturnError;
     return kIOReturnSuccess;
 }
diff --git a/VoodooRMI/Functions/F03.hpp b/VoodooRMI/Functions/F03.hpp
@@ -158,15 +158,15 @@ class F03 : public RMIFunction {
 
     IOWorkLoop* getWorkLoop();
 
-    int rmi_f03_pt_write (unsigned char val);
+    int rmi_f03_pt_write(unsigned char val);
     int ps2DoSendbyteGated(u8 byte, uint64_t timeout);
     int ps2CommandGated(u8 *param, unsigned int *command);
     int ps2Command(u8 *param, unsigned int command);
     void handleByte(u8);
     void initPS2();
-    void initPS2Interrupt (OSObject *owner, IOTimerEventSource *timer);
+    void initPS2Interrupt(OSObject *owner, IOTimerEventSource *timer);
     // TODO: Move to math file as long as with abs in rmi_driver.h
-    int signum (int value);
+    int signum(int value);
 
     void handlePacket(u8 *packet);
 };

diff --git a/VoodooRMI/Functions/F11.cpp b/VoodooRMI/Functions/F11.cpp
@@ -54,13 +54,10 @@ bool F11::start(IOService *provider)
     if (!super::start(provider))
         return false;
 
-    int rc;
-
-    rc = f11_write_control_regs(&sens_query, &dev_controls,
-                                fn_descriptor->query_base_addr);
+    int rc = rmi_f11_config();
 
     if (rc < 0)
-        return !rc;
+        return false;
 
     registerService();
 
@@ -97,6 +94,9 @@ IOReturn F11::message(UInt32 type, IOService *provider, void *argument)
         case kHandleRMIClickpadSet:
         case kHandleRMITrackpoint:
             return messageClient(type, sensor, argument);
+        case kHandleRMIConfig:
+            rmi_f11_config();
+            break;
     }
 
     return kIOReturnSuccess;
@@ -168,6 +168,12 @@ bool F11::getReport()
     return true;
 }
 
+int F11::rmi_f11_config()
+{
+    return f11_write_control_regs(&sens_query, &dev_controls,
+                                fn_descriptor->query_base_addr);
+}
+
 int F11::f11_read_control_regs(f11_2d_ctrl *ctrl, u16 ctrl_base_addr)
 {
     int error = 0;

diff --git a/VoodooRMI/Functions/F11.hpp b/VoodooRMI/Functions/F11.hpp
@@ -540,6 +540,7 @@ class F11 : public RMIFunction {
     unsigned long *rel_mask;
 
     bool getReport();
+    int rmi_f11_config();
     int rmi_f11_initialize();
     int rmi_f11_get_query_parameters(f11_2d_sensor_queries *sensor_query,
                                       u16 query_base_addr);

diff --git a/VoodooRMI/Functions/F12.cpp b/VoodooRMI/Functions/F12.cpp
@@ -145,6 +145,54 @@ bool F12::attach(IOService *provider)
 }
 
 bool F12::start(IOService *provider)
+{
+    int ret = rmi_f12_config();
+    if (ret < 0)
+        return false;
+
+    registerService();
+
+    if (!sensor->attach(this))
+        return false;
+
+    if (!sensor->start(this))
+        return false;
+
+    return super::start(provider);
+}
+
+void F12::stop(IOService *provider)
+{
+    sensor->detach(this);
+    sensor->stop(this);
+    super::stop(provider);
+}
+
+void F12::free()
+{
+    clearDesc();
+    OSSafeReleaseNULL(sensor);
+    super::free();
+}
+
+IOReturn F12::message(UInt32 type, IOService *provider, void *argument)
+{
+    switch (type)
+    {
+        case kHandleRMIAttention:
+            getReport();
+            break;
+        case kHandleRMIClickpadSet:
+        case kHandleRMITrackpoint:
+            return messageClient(type, sensor, argument);
+        case kHandleRMIConfig:
+            return rmi_f12_config();
+    }
+
+    return kIOReturnSuccess;
+}
+
+int F12::rmi_f12_config()
 {
     const struct rmi_register_desc_item *item;
     unsigned long control_size;
@@ -191,43 +239,6 @@ bool F12::start(IOService *provider)
         }
     }
 
-    registerService();
-
-    if (!sensor->attach(this))
-        return false;
-
-    if (!sensor->start(this))
-        return false;
-
-    return super::start(provider);
-}
-
-void F12::stop(IOService *provider)
-{
-    sensor->detach(this);
-    sensor->stop(this);
-    super::stop(provider);
-}
-
-void F12::free()
-{
-    clearDesc();
-    OSSafeReleaseNULL(sensor);
-    super::free();
-}
-
-IOReturn F12::message(UInt32 type, IOService *provider, void *argument)
-{
-    switch (type)
-    {
-        case kHandleRMIAttention:
-            getReport();
-            break;
-        case kHandleRMIClickpadSet:
-        case kHandleRMITrackpoint:
-            return messageClient(type, sensor, argument);
-    }
-
     return kIOReturnSuccess;
 }
 

diff --git a/VoodooRMI/Functions/F12.hpp b/VoodooRMI/Functions/F12.hpp
@@ -72,6 +72,8 @@ class F12 : public RMIFunction {
     static bool rmi_register_desc_has_subpacket(const rmi_register_desc_item *item,
                                                 u8 subpacket);
 
+    int rmi_f12_config();
+
     /* F12 Data */
     RMI2DSensor *sensor;
     struct rmi_2d_sensor_platform_data sensor_pdata;

diff --git a/VoodooRMI/Functions/F30.cpp b/VoodooRMI/Functions/F30.cpp
@@ -34,14 +34,8 @@ bool F30::start(IOService *provider)
     if (!super::start(provider))
         return false;
 
-    int error = rmiBus->blockWrite(fn_descriptor->control_base_addr,
-                                   ctrl_regs, ctrl_regs_size);
-
-    if (error) {
-        IOLogError("%s: Could not write control registers at 0x%x: 0x%x",
-                   __func__, fn_descriptor->control_base_addr, error);
-        return false;;
-    }
+    int ret = rmi_f30_config();
+    if (ret < 0) return false;
 
     voodooTrackpointInstance = rmiBus->getVoodooInput();
 
@@ -62,9 +56,10 @@ void F30::free()
 
 IOReturn F30::message(UInt32 type, IOService *provider, void *argument)
 {
+    int error;
     switch (type) {
         case kHandleRMIAttention:
-            int error = rmiBus->readBlock(fn_descriptor->data_base_addr,
+            error = rmiBus->readBlock(fn_descriptor->data_base_addr,
                                           data_regs, register_count);
 
             if (error < 0) {
@@ -76,11 +71,25 @@ IOReturn F30::message(UInt32 type, IOService *provider, void *argument)
 
             rmi_f30_report_button();
             break;
+        case kHandleRMIConfig:
+            return rmi_f30_config();
     }
 
     return kIOReturnSuccess;
 }
 
+int F30::rmi_f30_config()
+{
+    int error = rmiBus->blockWrite(fn_descriptor->control_base_addr,
+                                   ctrl_regs, ctrl_regs_size);
+
+    if (error) {
+        IOLogError("%s: Could not write control registers at 0x%x: 0x%x",
+                   __func__, fn_descriptor->control_base_addr, error);
+    }
+    return error;
+}
+
 int F30::rmi_f30_initialize()
 {
     u8 *ctrl_reg = ctrl_regs;

diff --git a/VoodooRMI/Functions/F30.hpp b/VoodooRMI/Functions/F30.hpp
@@ -97,6 +97,7 @@ class F30 : public RMIFunction {
     bool hasTrackpointButtons;
 
     int rmi_f30_initialize();
+    int rmi_f30_config();
     void rmi_f30_set_ctrl_data(rmi_f30_ctrl_data *ctrl,
                                int *ctrl_addr, int len, u8 **reg);
     int rmi_f30_read_control_parameters();