From b06cc7b74aee095a1c8e810f0f93e2cae626f820 Mon Sep 17 00:00:00 2001 From: raywu Date: Tue, 19 Jun 2018 18:32:59 +0800 Subject: Adjust IRQ Assignment --- Board/IO/F81216/ACPI/Uart1.ASL | 32 ++++++++++++++++---------------- Board/IO/F81216/ACPI/Uart2.ASL | 32 ++++++++++++++++---------------- Board/IO/F81216/ACPI/Uart3.ASL | 32 ++++++++++++++++---------------- Board/IO/F81216/ACPI/Uart4.ASL | 32 ++++++++++++++++---------------- Board/IO/F81216/F81216.SD | 19 ++++++++++--------- Board/IO/F81866/ACPI/Uart1.ASL | 24 ++++++++++++------------ Board/IO/F81866/ACPI/Uart2.ASL | 24 ++++++++++++------------ Board/IO/F81866/ACPI/Uart3.ASL | 26 +++++++++++++------------- Board/IO/F81866/ACPI/Uart4.ASL | 26 +++++++++++++------------- Board/IO/F81866/ACPI/Uart5.ASL | 30 +++++++++++++++--------------- Board/IO/F81866/ACPI/Uart6.ASL | 30 +++++++++++++++--------------- Board/IO/F81866/F81866.SD | 35 ++++++++++++++++++----------------- Board/IO/F81866/F81866.UNI | Bin 35594 -> 35402 bytes 13 files changed, 172 insertions(+), 170 deletions(-) (limited to 'Board') 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 Binary files a/Board/IO/F81866/F81866.UNI and b/Board/IO/F81866/F81866.UNI differ -- cgit v1.2.3