Adjust IRQ Assignment

20 files changed, 187 insertions, 172 deletions

diff --git a/Board/IO/F81216/ACPI/Uart1.ASL b/Board/IO/F81216/ACPI/Uart1.ASL
index 9ceeb2c..c97323e 100644
--- a/Board/IO/F81216/ACPI/Uart1.ASL
+++ b/Board/IO/F81216/ACPI/Uart1.ASL
@@ -61,30 +61,30 @@ Device(UR11) {
 //-----------------------------------------------------------------------
 	Name(_PRS, ResourceTemplate() {
 		StartDependentFn(0, 0) {
-			IO(Decode16, 0x260, 0x260, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {11}
+			IO(Decode16, 0x2C8, 0x2C8, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x260, 0x260, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
+			IO(Decode16, 0x2C8, 0x2C8, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x268, 0x268, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x270, 0x270, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x278, 0x278, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
+			IO(Decode16, 0x2C0, 0x268, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x270, 0x270, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x278, 0x278, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
 		EndDependentFn()
 	})
 
diff --git a/Board/IO/F81216/ACPI/Uart2.ASL b/Board/IO/F81216/ACPI/Uart2.ASL
index b53f515..d69544a 100644
--- a/Board/IO/F81216/ACPI/Uart2.ASL
+++ b/Board/IO/F81216/ACPI/Uart2.ASL
@@ -57,30 +57,30 @@ Device(UR12) {
 //-----------------------------------------------------------------------
 	Name(_PRS, ResourceTemplate() {
 		StartDependentFn(0, 0) {
-			IO(Decode16, 0x268, 0x268, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {11}
+			IO(Decode16, 0x2C0, 0x2C0, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x260, 0x260, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
+			IO(Decode16, 0x2C8, 0x2C8, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x268, 0x268, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x270, 0x270, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x278, 0x278, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
+			IO(Decode16, 0x2C0, 0x2C0, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x270, 0x270, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x278, 0x278, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
 		EndDependentFn()
 	})
 /*
diff --git a/Board/IO/F81216/ACPI/Uart3.ASL b/Board/IO/F81216/ACPI/Uart3.ASL
index ffbbb90..ca7c5a5 100644
--- a/Board/IO/F81216/ACPI/Uart3.ASL
+++ b/Board/IO/F81216/ACPI/Uart3.ASL
@@ -57,30 +57,30 @@ Device(UR13) {
 //-----------------------------------------------------------------------
 	Name(_PRS, ResourceTemplate() {
 		StartDependentFn(0, 0) {
-			IO(Decode16, 0x270, 0x270, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {11}
+			IO(Decode16, 0x2D8, 0x2D8, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x260, 0x260, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
+			IO(Decode16, 0x2D8, 0x2D8, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x268, 0x268, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x270, 0x270, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x278, 0x278, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
+			IO(Decode16, 0x2D0, 0x2D0, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x270, 0x270, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x278, 0x278, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
 		EndDependentFn()
 	})
 
diff --git a/Board/IO/F81216/ACPI/Uart4.ASL b/Board/IO/F81216/ACPI/Uart4.ASL
index b96d81c..e012c26 100644
--- a/Board/IO/F81216/ACPI/Uart4.ASL
+++ b/Board/IO/F81216/ACPI/Uart4.ASL
@@ -57,30 +57,30 @@ Device(UR14) {
 //-----------------------------------------------------------------------
 	Name(_PRS, ResourceTemplate() {
 		StartDependentFn(0, 0) {
-			IO(Decode16, 0x278, 0x278, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {11}
+			IO(Decode16, 0x2D0, 0x2D0, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x260, 0x260, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
+			IO(Decode16, 0x2D8, 0x2D8, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x268, 0x268, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x270, 0x270, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x278, 0x278, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {10,11,12}
+			IO(Decode16, 0x2D0, 0x2D0, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {5}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x270, 0x270, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x278, 0x278, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
 		EndDependentFn()
 	})
 
diff --git a/Board/IO/F81216/F81216.SD b/Board/IO/F81216/F81216.SD
index 1cdeee7..37ffad0 100644
--- a/Board/IO/F81216/F81216.SD
+++ b/Board/IO/F81216/F81216.SD
@@ -224,12 +224,13 @@ endform;//SIO Form
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL0_SETTINGS1), value = 1, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS2), value = 2, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS3), value = 3, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
             endoneof;
         endif;    // suppressif SIO_SETUP_VAR.COMA2Enable == 0x00;
 
-        suppressif ideqval COMA2_NV_DATA.DevEnable == 0x00;
+//        suppressif ideqval COMA2_NV_DATA.DevEnable == 0x00;
+        suppressif TRUE;
             oneof varid = COMA2_NV_DATA.DevMode,
                 prompt      = STRING_TOKEN(STR_SELECT_MODE),
                 help        = STRING_TOKEN(STR_F81216SEC_SERIAL_MODE_HELP),
@@ -277,8 +278,8 @@ endform;//SIO Form
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL1_SETTINGS1), value = 1, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS2), value = 2, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS3), value = 3, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
             endoneof;
         endif;    // suppressif SIO_SETUP_VAR.COMB2Enable == 0x00;
     
@@ -319,8 +320,8 @@ endform;//SIO Form
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL2_SETTINGS1), value = 1, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS2), value = 2, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS3), value = 3, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
             endoneof;
         endif;    // suppressif SIO_SETUP_VAR.COMC2Enable == 0x00;
     
@@ -361,8 +362,8 @@ endform;//SIO Form
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL3_SETTINGS1), value = 1, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS2), value = 2, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS3), value = 3, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81216SEC_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
             endoneof;
         endif;    // suppressif SIO_SETUP_VAR.COMD2Enable == 0x00;
     
diff --git a/Board/IO/F81866/ACPI/Uart1.ASL b/Board/IO/F81866/ACPI/Uart1.ASL
index 5aa0ed1..22b5318 100644
--- a/Board/IO/F81866/ACPI/Uart1.ASL
+++ b/Board/IO/F81866/ACPI/Uart1.ASL
@@ -84,24 +84,24 @@ Device(UAR1) {
 		}
 		StartDependentFnNoPri() {
 			IO(Decode16, 0x3F8, 0x3F8, 1, 8)
-			IRQNoFlags() {3,4,5,6,7,10,11,12}
+			IRQNoFlags() {4}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
 			IO(Decode16, 0x2F8, 0x2F8, 1, 8)
-			IRQNoFlags() {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x3E8, 0x3E8, 1, 8)
-			IRQNoFlags() {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x2E8, 0x2E8, 1, 8)
-			IRQNoFlags() {3,4,5,6,7,10,11,12}
+			IRQNoFlags() {3}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x3E8, 0x3E8, 1, 8)
+//			IRQNoFlags() {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x2E8, 0x2E8, 1, 8)
+//			IRQNoFlags() {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
 		EndDependentFn()
 	})
 } // End Of UAR1
diff --git a/Board/IO/F81866/ACPI/Uart2.ASL b/Board/IO/F81866/ACPI/Uart2.ASL
index d80ef3f..70dfd1d 100644
--- a/Board/IO/F81866/ACPI/Uart2.ASL
+++ b/Board/IO/F81866/ACPI/Uart2.ASL
@@ -84,24 +84,24 @@ Device(UAR2) {
 		}
 		StartDependentFnNoPri() {
 			IO(Decode16, 0x3F8, 0x3F8, 1, 8)
-			IRQNoFlags() {3,4,5,6,7,10,11,12}
+			IRQNoFlags() {4}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
 			IO(Decode16, 0x2F8, 0x2F8, 1, 8)
-			IRQNoFlags() {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x3E8, 0x3E8, 1, 8)
-			IRQNoFlags() {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-		StartDependentFnNoPri() {
-			IO(Decode16, 0x2E8, 0x2E8, 1, 8)
-			IRQNoFlags() {3,4,5,6,7,10,11,12}
+			IRQNoFlags() {3}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x3E8, 0x3E8, 1, 8)
+//			IRQNoFlags() {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
+//		StartDependentFnNoPri() {
+//			IO(Decode16, 0x2E8, 0x2E8, 1, 8)
+//			IRQNoFlags() {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
 		EndDependentFn()
 	})
 
diff --git a/Board/IO/F81866/ACPI/Uart3.ASL b/Board/IO/F81866/ACPI/Uart3.ASL
index 70b5f1c..0e2a97f 100644
--- a/Board/IO/F81866/ACPI/Uart3.ASL
+++ b/Board/IO/F81866/ACPI/Uart3.ASL
@@ -80,29 +80,29 @@ Device(UAR3) {
 	Name(_PRS, ResourceTemplate() {
 		StartDependentFn(0, 0) {
 			IO(Decode16, 0x3E8, 0x3E8, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {7}
+			IRQ(Level,ActiveLow,Shared) {11}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
 			IO(Decode16, 0x3E8, 0x3E8, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+			IRQ(Level,ActiveLow,Shared) {11}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
 			IO(Decode16, 0x2E8, 0x2E8, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-        StartDependentFnNoPri() {
-			IO(Decode16, 0x2F0, 0x2F0, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-        StartDependentFnNoPri() {
-			IO(Decode16, 0x2E0, 0x2E0, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+			IRQ(Level,ActiveLow,Shared) {11}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
+//        StartDependentFnNoPri() {
+//			IO(Decode16, 0x2F0, 0x2F0, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
+//        StartDependentFnNoPri() {
+//			IO(Decode16, 0x2E0, 0x2E0, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
 		EndDependentFn()
 	})
 
diff --git a/Board/IO/F81866/ACPI/Uart4.ASL b/Board/IO/F81866/ACPI/Uart4.ASL
index b7655c0..eb1307f 100644
--- a/Board/IO/F81866/ACPI/Uart4.ASL
+++ b/Board/IO/F81866/ACPI/Uart4.ASL
@@ -74,29 +74,29 @@ Device(UAR4) {
 	Name(_PRS, ResourceTemplate() {
 		StartDependentFn(0, 0) {
 			IO(Decode16, 0x2E8, 0x2E8, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {7}
+			IRQ(Level,ActiveLow,Shared) {11}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
 			IO(Decode16, 0x3E8, 0x3E8, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+			IRQ(Level,ActiveLow,Shared) {11}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
 			IO(Decode16, 0x2E8, 0x2E8, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-        StartDependentFnNoPri() {
-			IO(Decode16, 0x2F0, 0x2F0, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-        StartDependentFnNoPri() {
-			IO(Decode16, 0x2E0, 0x2E0, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+			IRQ(Level,ActiveLow,Shared) {11}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
+//        StartDependentFnNoPri() {
+//			IO(Decode16, 0x2F0, 0x2F0, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
+//        StartDependentFnNoPri() {
+//			IO(Decode16, 0x2E0, 0x2E0, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
 		EndDependentFn()
 	})
 
diff --git a/Board/IO/F81866/ACPI/Uart5.ASL b/Board/IO/F81866/ACPI/Uart5.ASL
index 8493c6a..76fd3a3 100644
--- a/Board/IO/F81866/ACPI/Uart5.ASL
+++ b/Board/IO/F81866/ACPI/Uart5.ASL
@@ -73,30 +73,30 @@ Device(UAR5) {
 //-----------------------------------------------------------------------
 	Name(_PRS, ResourceTemplate() {
 		StartDependentFn(0, 0) {
-			IO(Decode16, 0x2F0, 0x2F0, 1, 8)
+			IO(Decode16, 0x278, 0x278, 1, 8)
 			IRQ(Level,ActiveLow,Shared) {10}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x3E8, 0x3E8, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+			IO(Decode16, 0x278, 0x278, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {10}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x2E8, 0x2E8, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-        StartDependentFnNoPri() {
-			IO(Decode16, 0x2F0, 0x2F0, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-        StartDependentFnNoPri() {
-			IO(Decode16, 0x2E0, 0x2E0, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+			IO(Decode16, 0x270, 0x270, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {10}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
+//        StartDependentFnNoPri() {
+//			IO(Decode16, 0x2F0, 0x2F0, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
+//        StartDependentFnNoPri() {
+//			IO(Decode16, 0x2E0, 0x2E0, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
 		EndDependentFn()
 	})
 
diff --git a/Board/IO/F81866/ACPI/Uart6.ASL b/Board/IO/F81866/ACPI/Uart6.ASL
index fbe96dc..fca3c09 100644
--- a/Board/IO/F81866/ACPI/Uart6.ASL
+++ b/Board/IO/F81866/ACPI/Uart6.ASL
@@ -73,30 +73,30 @@ Device(UAR6) {
 //-----------------------------------------------------------------------
 	Name(_PRS, ResourceTemplate() {
 		StartDependentFn(0, 0) {
-			IO(Decode16, 0x2E0, 0x2E0, 1, 8)
+			IO(Decode16, 0x270, 0x270, 1, 8)
 			IRQ(Level,ActiveLow,Shared) {10}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x3E8, 0x3E8, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+			IO(Decode16, 0x278, 0x278, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {10}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
 		StartDependentFnNoPri() {
-			IO(Decode16, 0x2E8, 0x2E8, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-        StartDependentFnNoPri() {
-			IO(Decode16, 0x2F0, 0x2F0, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
-			DMA(Compatibility, NotBusMaster, Transfer8) {}
-		}
-        StartDependentFnNoPri() {
-			IO(Decode16, 0x2E0, 0x2E0, 1, 8)
-			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+			IO(Decode16, 0x270, 0x270, 1, 8)
+			IRQ(Level,ActiveLow,Shared) {10}
 			DMA(Compatibility, NotBusMaster, Transfer8) {}
 		}
+//        StartDependentFnNoPri() {
+//			IO(Decode16, 0x2F0, 0x2F0, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
+//        StartDependentFnNoPri() {
+//			IO(Decode16, 0x2E0, 0x2E0, 1, 8)
+//			IRQ(Level,ActiveLow,Shared) {3,4,5,6,7,10,11,12}
+//			DMA(Compatibility, NotBusMaster, Transfer8) {}
+//		}
 		EndDependentFn()
 	})
 
diff --git a/Board/IO/F81866/F81866.SD b/Board/IO/F81866/F81866.SD
index 27016d5..ba1ca45 100644
--- a/Board/IO/F81866/F81866.SD
+++ b/Board/IO/F81866/F81866.SD
@@ -1291,8 +1291,8 @@
                 option text = STRING_TOKEN(STR_F81866_SERIAL0_SETTINGS1), value = 1, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS2), value = 2, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS3), value = 3, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
             endoneof;
         endif;    // suppressif SIO_SETUP_VAR.ComAEnable == 0x00;
 
@@ -1332,8 +1332,8 @@
                 option text = STRING_TOKEN(STR_F81866_SERIAL1_SETTINGS1), value = 1, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS2), value = 2, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS3), value = 3, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS4), value = 4, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS5), value = 5, flags = RESET_REQUIRED;
             endoneof;
         endif;    // suppressif SIO_SETUP_VAR.ComBEnable == 0x00;
 
@@ -1373,8 +1373,8 @@
                 option text = STRING_TOKEN(STR_F81866_SERIAL2_SETTINGS1), value = 1, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS4), value = 2, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS5), value = 3, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS6), value = 4, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS7), value = 5, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS6), value = 4, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS7), value = 5, flags = RESET_REQUIRED;
             endoneof;
         endif;    // suppressif SIO_SETUP_VAR.ComCEnable == 0x00;
 
@@ -1414,8 +1414,8 @@
                 option text = STRING_TOKEN(STR_F81866_SERIAL3_SETTINGS1), value = 1, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS4), value = 2, flags = RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS5), value = 3, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS6), value = 4, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS7), value = 5, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS6), value = 4, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS7), value = 5, flags = RESET_REQUIRED;
             endoneof;
         endif;    // suppressif SIO_SETUP_VAR.ComDEnable == 0x00;
 
@@ -1453,10 +1453,10 @@
                 help        = STRING_TOKEN(STR_SETTINGS_HELP),
                 option text = STRING_TOKEN(STR_AUTO), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81866_SERIAL4_SETTINGS1), value = 1, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS4), value = 2, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS5), value = 3, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS6), value = 4, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS7), value = 5, flags = RESET_REQUIRED;
+                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS6), value = 2, flags = RESET_REQUIRED;
+                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS7), value = 3, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS6), value = 4, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS7), value = 5, flags = RESET_REQUIRED;
             endoneof;
         endif;    // suppressif SIO_SETUP_VAR.ComEEnable == 0x00;
 
@@ -1494,14 +1494,15 @@
                 help        = STRING_TOKEN(STR_SETTINGS_HELP),
                 option text = STRING_TOKEN(STR_AUTO), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
                 option text = STRING_TOKEN(STR_F81866_SERIAL5_SETTINGS1), value = 1, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS4), value = 2, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS5), value = 3, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS6), value = 4, flags = RESET_REQUIRED;
-                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS7), value = 5, flags = RESET_REQUIRED;
+                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS6), value = 2, flags = RESET_REQUIRED;
+                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS7), value = 3, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS6), value = 4, flags = RESET_REQUIRED;
+//                option text = STRING_TOKEN(STR_F81866_SERIAL_SETTINGS7), value = 5, flags = RESET_REQUIRED;
             endoneof;
         endif;    // suppressif SIO_SETUP_VAR.ComFEnable == 0x00;
     
-        suppressif ideqval COMF_NV_DATA.DevEnable == 0x00;
+//        suppressif ideqval COMF_NV_DATA.DevEnable == 0x00;
+        suppressif TRUE;
             oneof varid = COMF_NV_DATA.DevMode,
                 prompt      = STRING_TOKEN(STR_SELECT_MODE),
                 help        = STRING_TOKEN(STR_F81866_SERIAL_MODE_HELP),
diff --git a/Board/IO/F81866/F81866.UNI b/Board/IO/F81866/F81866.UNI
index 07924ab..427b94a 100644
--- a/Board/IO/F81866/F81866.UNI
+++ b/Board/IO/F81866/F81866.UNI
diff --git a/CRB/CSP.sdl b/CRB/CSP.sdl
index fac0d89..441eef6 100644
--- a/CRB/CSP.sdl
+++ b/CRB/CSP.sdl
@@ -637,6 +637,15 @@ TOKEN
 	Help  = "This flag enables/disables all firmware beeps"
 	TokenType = Boolean
 End
+TOKEN
+	Name  = "ISA_IRQ_MASK"
+	Value  = "0x2305"
+	Help  = "This is an IRQ mask which may be used by ISA devices\ If BIT == 0 IRQ Available BIT == 1 IRQ Used.\DEFAULT VALUE == 0xE305."
+	TokenType = Integer
+	TargetH = Yes
+	Range  = "0...0FFFFh"
+End
+
 
 ## ReferenceCode\ME\ActiveManagement\ActiveManagement.sdl
 TOKEN
diff --git a/Core/EM/CSM/PciInterrupts.c b/Core/EM/CSM/PciInterrupts.c
index 057315d..95a0709 100644
--- a/Core/EM/CSM/PciInterrupts.c
+++ b/Core/EM/CSM/PciInterrupts.c
@@ -237,7 +237,8 @@ extern  UINTN                           RbCount;
 
 UINT8   SBGen_GetPIRQIndex (UINT8);
 
-UINT8   irq_priority_map[] = {11, 10, 9, 15, 5, 3, 7, 4, 14};
+//UINT8   irq_priority_map[] = {11, 10, 9, 15, 5, 3, 7, 4, 14};
+UINT8   irq_priority_map[] = {15, 7, 14, 6, 11, 10, 9, 5, 3, 4};
 UINT8   irq_allocated_count[sizeof(irq_priority_map)] = {0};
 UINT16  IsaIrqMask;
 
diff --git a/Discuss_20180619.docx b/Discuss_20180619.docx
new file mode 100644
index 0000000..4d583e8
--- /dev/null
+++ b/Discuss_20180619.docx
diff --git a/ReleaseHistory.xlsx b/ReleaseHistory.xlsx
index ac93ef9..0f2d9a7 100644
--- a/ReleaseHistory.xlsx
+++ b/ReleaseHistory.xlsx
diff --git a/RomImage/FitcBuild.bat b/RomImage/FitcBuild.bat
index 92ed954..7cbd4a3 100644
--- a/RomImage/FitcBuild.bat
+++ b/RomImage/FitcBuild.bat
@@ -103,6 +103,7 @@ GOTO ImageOutput
 
 :ImageOutput
 IF EXIST %DestDir%\OutImage.bin ECHO Rom_%RomSize%%RomSkue%.bin && move /Y %DestDir%\OutImage.bin Rom_%RomSize%%RomSkue%.bin
+IF EXIST Rom_%RomSize%%RomSkue%.bin move /Y Rom_%RomSize%%RomSkue%.bin SZPRJM01.bin
 IF EXIST %DestDir%\OutImage_1.bin ECHO Rom00%RomSkue%.bin && move /Y %DestDir%\OutImage_1.bin Rom00%RomSkue%.bin
 IF EXIST %DestDir%\OutImage_2.bin ECHO Rom01%RomSkue%.bin && move /Y %DestDir%\OutImage_2.bin Rom01%RomSkue%.bin
 echo Rom_%RomSize%%RomSkue%.bin>ForPfatName.txt
diff --git a/SharkBayDT.veb b/SharkBayDT.veb
index fc20dc0..992b215 100644
--- a/SharkBayDT.veb
+++ b/SharkBayDT.veb
@@ -2,7 +2,6 @@
 	version = 1
 	Build = "build.bat"
 	BuildAll = "build.bat rebuild"
-	SourceControl = "SS: Alaska;$/Alaska/Projects/Intel/Haswell/LynxPoint_SharkBay-DT_Crb_1AQQW/;"
 	BoardFlavor = "SharkBayDT"
 	CleanCmd = "build.bat clean"
 
diff --git a/actionitems.txt b/actionitems.txt
index e109e76..add84da 100644
--- a/actionitems.txt
+++ b/actionitems.txt
@@ -1,3 +1,6 @@
+2018/06/19
+	F81866 H/W Monitor
+	AUDIO CODEC
 2018/06/16
 	LAN EEPROM
 2018/06/15