From 99a4b9db65e3d40ddd355996a23071a9fcee52d9 Mon Sep 17 00:00:00 2001
From: raywu <raywu@aaeon.com.tw>
Date: Thu, 17 Jan 2019 14:35:48 +0800
Subject: DW01 - Fixed COM Port will not be disable normally (still appeared
 under Windows Device Management)

---
 Board/IO/F81216/F81216DXE.C | 6 +++---
 Board/IO/F81866/F81866.ASL  | 6 ++++--
 Board/IO/F81866/F81866DXE.C | 6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Board/IO/F81216/F81216DXE.C b/Board/IO/F81216/F81216DXE.C
index 4963c1b..a33944a 100644
--- a/Board/IO/F81216/F81216DXE.C
+++ b/Board/IO/F81216/F81216DXE.C
@@ -421,10 +421,10 @@ static EFI_STATUS COM_Init(
     {
         case isGetSetupData:
  //           // Disable IODecode?
- //           if((!dev->DeviceInfo->Implemented) || (!dev->NvData.DevEnable)) {
+            if((!dev->DeviceInfo->Implemented) || (!dev->NvData.DevEnable)) {
  //                LoopCspIoDecodeListInit(NULL,AmiSio); 
- //                ClearDevResource(dev);
- //           }
+                 ClearDevResource(dev);
+            }
         break;
     
         case isPrsSelect:
diff --git a/Board/IO/F81866/F81866.ASL b/Board/IO/F81866/F81866.ASL
index ae13582..3459f4d 100644
--- a/Board/IO/F81866/F81866.ASL
+++ b/Board/IO/F81866/F81866.ASL
@@ -348,6 +348,7 @@ Device(SIO1) {
 
         ENFG(CGLD(Arg0))    //Enter Config Mode, Select LDN
         Store(ACTR, Local0)
+        Or(ShiftLeft(IOAH, 8),IOAL,Local1)
         EXFG()                //Exit Config Mode
 
         If(LEqual(Local0, 0xFF)) {Return(0x0)}    //LDN's not decoded, Device not present.
@@ -371,10 +372,11 @@ Device(SIO1) {
                 Else{ Return(0x00)}  // Device not present
             }
             Else{//by Base1 & Base2 check
-                Or(ShiftLeft(IOAH, 8),IOAL,Local0)
-                If(Local0) { Return(0x0D)}  // Device Detected & Not Active
+//                Or(ShiftLeft(IOAH, 8),IOAL,Local0)
+//                If(Local0) { Return(0x0D)}  // Device Detected & Not Active
 //                Or(ShiftLeft(IOH2, 8),IOL2,Local0)    
 //                If(Local0) { Return(0x0D)}  // Device Detected & Not Active
+                If(Local1) { Return(0x0D)}  // Device Detected & Not Active
                 Return(0x00) // Device not present
             }
         }               //Exit Config Mode
diff --git a/Board/IO/F81866/F81866DXE.C b/Board/IO/F81866/F81866DXE.C
index d1ce887..ed434f5 100644
--- a/Board/IO/F81866/F81866DXE.C
+++ b/Board/IO/F81866/F81866DXE.C
@@ -627,10 +627,10 @@ static EFI_STATUS COM_Init(
     switch (InitStep)
     {
         case isGetSetupData:
-//            if((!dev->DeviceInfo->Implemented) || (!dev->NvData.DevEnable)) {
+            if((!dev->DeviceInfo->Implemented) || (!dev->NvData.DevEnable)) {
 //                 LoopCspIoDecodeListInit(NULL,AmiSio); 
-//                 ClearDevResource(dev);
-//            }
+                 ClearDevResource(dev);
+            }
         break;
     
         case isPrsSelect:
-- 
cgit v1.2.3