diff options
author | raywu <raywu@aaeon.com> | 2018-06-19 08:13:12 +0800 |
---|---|---|
committer | raywu <raywu@aaeon.com> | 2018-06-19 08:13:12 +0800 |
commit | 5759e2929cee86e113c0f906660412515933d451 (patch) | |
tree | 15626289a650d7a61e478e89423a966bb84508a6 /Board/IO/F81216 | |
parent | 12e3acf6a1de13ad8f9c94e16c7dc633b7b6613e (diff) | |
download | zprj-5759e2929cee86e113c0f906660412515933d451.tar.xz |
SIO Function Porting
1. LPC Decode
2. UART Porting
Diffstat (limited to 'Board/IO/F81216')
-rw-r--r-- | Board/IO/F81216/ACPI/Uart1.ASL | 10 | ||||
-rw-r--r-- | Board/IO/F81216/ACPI/Uart2.ASL | 8 | ||||
-rw-r--r-- | Board/IO/F81216/ACPI/Uart3.ASL | 8 | ||||
-rw-r--r-- | Board/IO/F81216/ACPI/Uart4.ASL | 8 | ||||
-rw-r--r-- | Board/IO/F81216/F81216.ASL | 8 | ||||
-rw-r--r-- | Board/IO/F81216/F81216DXE.C | 70 | ||||
-rw-r--r-- | Board/IO/F81216/F81216PEI.C | 2 |
7 files changed, 57 insertions, 57 deletions
diff --git a/Board/IO/F81216/ACPI/Uart1.ASL b/Board/IO/F81216/ACPI/Uart1.ASL index ce9eb04..9ceeb2c 100644 --- a/Board/IO/F81216/ACPI/Uart1.ASL +++ b/Board/IO/F81216/ACPI/Uart1.ASL @@ -47,12 +47,12 @@ Device(UR11) { Name(_UID, 0x11) //Generic ID for COMC Name(_DDN, "COM7") - Method(_HID, 0) {Return(^^SIO2.UHID(0x11))} //PnP Device ID - Method(_STA, 0) {Return(^^SIO2.DSTA(0x11))} //Get UART status - Method(_DIS, 0) {^^SIO2.DCNT(0x11, 0)} //Disable UART + Method(_HID, 0) {Return(^^SIO2.UHID(0x08))} //PnP Device ID + Method(_STA, 0) {Return(^^SIO2.DSTA(0x08))} //Get UART status + Method(_DIS, 0) {^^SIO2.DCNT(0x08, 0)} //Disable UART //Default is share mode - Method(_CRS, 0) {Return(^^SIO2.DCR3(0x11, 0))} //Get UART current resources - Method(_SRS, 1) {^^SIO2.DSR3(Arg0, 0x11)} //Set UART recources + Method(_CRS, 0) {Return(^^SIO2.DCR3(0x08, 0))} //Get UART current resources + Method(_SRS, 1) {^^SIO2.DSR3(Arg0, 0x08)} //Set UART recources //----------------------------------------------------------------------- // UART1 Possible Resources //----------------------------------------------------------------------- diff --git a/Board/IO/F81216/ACPI/Uart2.ASL b/Board/IO/F81216/ACPI/Uart2.ASL index 5f861fb..b53f515 100644 --- a/Board/IO/F81216/ACPI/Uart2.ASL +++ b/Board/IO/F81216/ACPI/Uart2.ASL @@ -43,11 +43,11 @@ Device(UR12) { Name(_DDN, "COM8") //Generic ID for COMD // Method(_HID, 0) {Return(^^SIO2.UHID(0x12))} //PnP Device ID - Method(_STA, 0) {Return(^^SIO2.DSTA(0x12))} //Get UART status - Method(_DIS, 0) {^^SIO2.DCNT(0x12, 0)} //Disable UART + Method(_STA, 0) {Return(^^SIO2.DSTA(0x09))} //Get UART status + Method(_DIS, 0) {^^SIO2.DCNT(0x09, 0)} //Disable UART //Default is share mode - Method(_CRS, 0) {Return(^^SIO2.DCR3(0x12, 0))} //Get UART current resources - Method(_SRS, 1) {^^SIO2.DSR3(Arg0, 0x12)} //Set UART recources + Method(_CRS, 0) {Return(^^SIO2.DCR3(0x09, 0))} //Get UART current resources + Method(_SRS, 1) {^^SIO2.DSR3(Arg0, 0x09)} //Set UART recources //----------------------------------------------------------------------- // UART2 Possible Resources diff --git a/Board/IO/F81216/ACPI/Uart3.ASL b/Board/IO/F81216/ACPI/Uart3.ASL index f1ed8fe..ffbbb90 100644 --- a/Board/IO/F81216/ACPI/Uart3.ASL +++ b/Board/IO/F81216/ACPI/Uart3.ASL @@ -43,11 +43,11 @@ Device(UR13) { Name(_DDN, "COM9") // Method(_HID, 0) {Return(^^SIO2.UHID(0x13))} //PnP Device ID - Method(_STA, 0) {Return(^^SIO2.DSTA(0x13))} //Get UART status - Method(_DIS, 0) {^^SIO2.DCNT(0x13, 0)} //Disable UART + Method(_STA, 0) {Return(^^SIO2.DSTA(0x0C))} //Get UART status + Method(_DIS, 0) {^^SIO2.DCNT(0x0C, 0)} //Disable UART //Default is share mode - Method(_CRS, 0) {Return(^^SIO2.DCR3(0x13, 0))} //Get UART current resources - Method(_SRS, 1) {^^SIO2.DSR3(Arg0, 0x13)} //Set UART recources + Method(_CRS, 0) {Return(^^SIO2.DCR3(0x0C, 0))} //Get UART current resources + Method(_SRS, 1) {^^SIO2.DSR3(Arg0, 0x0C)} //Set UART recources //----------------------------------------------------------------------- // UART3 Possible Resources diff --git a/Board/IO/F81216/ACPI/Uart4.ASL b/Board/IO/F81216/ACPI/Uart4.ASL index baa4e55..b96d81c 100644 --- a/Board/IO/F81216/ACPI/Uart4.ASL +++ b/Board/IO/F81216/ACPI/Uart4.ASL @@ -43,11 +43,11 @@ Device(UR14) { Name(_DDN, "COM10") // Method(_HID, 0) {Return(^^SIO2.UHID(0x14))} //PnP Device ID - Method(_STA, 0) {Return(^^SIO2.DSTA(0x14))} //Get UART status - Method(_DIS, 0) {^^SIO2.DCNT(0x14, 0)} //Disable UART + Method(_STA, 0) {Return(^^SIO2.DSTA(0x0D))} //Get UART status + Method(_DIS, 0) {^^SIO2.DCNT(0x0D, 0)} //Disable UART //Default is share mode - Method(_CRS, 0) {Return(^^SIO2.DCR3(0x14, 0))} //Get UART current resources - Method(_SRS, 1) {^^SIO2.DSR3(Arg0, 0x14)} //Set UART recources + Method(_CRS, 0) {Return(^^SIO2.DCR3(0x0D, 0))} //Get UART current resources + Method(_SRS, 1) {^^SIO2.DSR3(Arg0, 0x0D)} //Set UART recources //----------------------------------------------------------------------- // UART4 Possible Resources diff --git a/Board/IO/F81216/F81216.ASL b/Board/IO/F81216/F81216.ASL index ebc950f..24e0493 100644 --- a/Board/IO/F81216/F81216.ASL +++ b/Board/IO/F81216/F81216.ASL @@ -136,12 +136,12 @@ Device(SIO2) { 0xFF, // 05 - MIDI 0xFF, // 06 - MSS Audio 0xFF, // 07 - AdLib sound (FM synth) - 0xFF, // 08 - Game port #1 - 0xFF, // 09 - Game port #2 + 0x00, // 08 - Game port #1 + 0x01, // 09 - Game port #2 0xFF, // 0A - KBC 60 & 64 0xFF, // 0B - EC 62 & 66 - 0xFF, // 0C - Reserved - 0xFF, // 0D - Reserved + 0x02, // 0C - Reserved + 0x03, // 0D - Reserved 0xFF, // 0E - PS/2 Mouse 0xFF, // 0F - Reserved //----add your other device below,if no,please cut and modify Package number----------// diff --git a/Board/IO/F81216/F81216DXE.C b/Board/IO/F81216/F81216DXE.C index e68bb69..03160b4 100644 --- a/Board/IO/F81216/F81216DXE.C +++ b/Board/IO/F81216/F81216DXE.C @@ -420,11 +420,11 @@ static EFI_STATUS COM_Init( switch (InitStep) { case isGetSetupData: - // Disable IODecode? - if((!dev->DeviceInfo->Implemented) || (!dev->NvData.DevEnable)) { - LoopCspIoDecodeListInit(NULL,AmiSio); - ClearDevResource(dev); - } + // // Disable IODecode? + // if((!dev->DeviceInfo->Implemented) || (!dev->NvData.DevEnable)) { + // LoopCspIoDecodeListInit(NULL,AmiSio); + // ClearDevResource(dev); + // } break; case isPrsSelect: @@ -434,36 +434,36 @@ static EFI_STATUS COM_Init( //Programm Device Mode register here(if NEEDED)use AmiSioProtocol //make serial port 0 as IR port funtion only - if(dev->DeviceInfo->UID == 0x10) - { - //Programm Device Mode register here(if NEEDED)use AmiSioProtocol - Status=AmiSio->Access(AmiSio,FALSE,FALSE,0xF1,&rv); - ASSERT_EFI_ERROR(Status); - if(EFI_ERROR(Status)) return Status; - - rv &= 0xE3; - - switch (dev->NvData.DevMode) - { - case 0: //Bit4 = 0, Serial Port Function Mode - break; - case 1: - rv|=0x10; //Bit4 = 1 Bit3,Bit2 = 00 , IR Mode,Pusle 1.6us,Full Duplex - break; - case 2: - rv|=0x14; //Bit4 = 1 Bit3,Bit2 = 01 , IR Mode,Pusle 1.6us,Half Duplex - break; - case 3: - rv|=0x18; //Bit4 = 1 Bit3,Bit2 = 10 , IR Mode,Pusle 3/16 Bit Time,Full Duplex - break; - case 4: - rv|=0x1C; //Bit4 = 1 Bit3,Bit2 = 11 , IR Mode,Pusle 3/16 Bit Time,Half Duplex - break; - default: return EFI_INVALID_PARAMETER; - } - Status=AmiSio->Access(AmiSio,TRUE,FALSE,0xF1,&rv); - ASSERT_EFI_ERROR(Status); - } +// if(dev->DeviceInfo->UID == 0x10) +// { +// //Programm Device Mode register here(if NEEDED)use AmiSioProtocol +// Status=AmiSio->Access(AmiSio,FALSE,FALSE,0xF1,&rv); +// ASSERT_EFI_ERROR(Status); +// if(EFI_ERROR(Status)) return Status; +// +// rv &= 0xE3; +// +// switch (dev->NvData.DevMode) +// { +// case 0: //Bit4 = 0, Serial Port Function Mode +// break; +// case 1: +// rv|=0x10; //Bit4 = 1 Bit3,Bit2 = 00 , IR Mode,Pusle 1.6us,Full Duplex +// break; +// case 2: +// rv|=0x14; //Bit4 = 1 Bit3,Bit2 = 01 , IR Mode,Pusle 1.6us,Half Duplex +// break; +// case 3: +// rv|=0x18; //Bit4 = 1 Bit3,Bit2 = 10 , IR Mode,Pusle 3/16 Bit Time,Full Duplex +// break; +// case 4: +// rv|=0x1C; //Bit4 = 1 Bit3,Bit2 = 11 , IR Mode,Pusle 3/16 Bit Time,Half Duplex +// break; +// default: return EFI_INVALID_PARAMETER; +// } +// Status=AmiSio->Access(AmiSio,TRUE,FALSE,0xF1,&rv); +// ASSERT_EFI_ERROR(Status); +// } //Programm Serial_X IRQ Share register. if((dev->DeviceInfo->Flags & SIO_SHR_IRQ1) && dev->ResOwner) { //enter cfgmode diff --git a/Board/IO/F81216/F81216PEI.C b/Board/IO/F81216/F81216PEI.C index 8e0d564..a1737a1 100644 --- a/Board/IO/F81216/F81216PEI.C +++ b/Board/IO/F81216/F81216PEI.C @@ -139,7 +139,7 @@ VOID F81216SEC_INIT(VOID) UINTN i; // Decode neccessary IO resource in PEI phase - PeiSetLpcDeviceDecoding(); +// PeiSetLpcDeviceDecoding(); // Step through table and initialize the Serial Port for(i=0; i<(sizeof(F81216SEC_PEI_Init_Table))/(sizeof(SIO_DATA));i++) { |