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 ++++++++++--------- 5 files changed, 74 insertions(+), 73 deletions(-) (limited to 'Board/IO/F81216') 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; -- cgit v1.2.3