Add emulated serialIo device driver for EdkUnixPkg

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2605 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 34 insertions, 28 deletions

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c
index efa66abeeb..b8611f66d2 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c
@@ -122,6 +122,7 @@ static UNIX_PCD_ENTRY  mPcdEnvironment[] = {
   {PcdToken(PcdUnixConsole),       &gEfiUnixConsoleGuid},

   {PcdToken(PcdUnixUga),           &gEfiUnixUgaGuid},

   {PcdToken(PcdUnixFileSystem),    &gEfiUnixFileSystemGuid},

+  {PcdToken(PcdUnixSerialPort),    &gEfiUnixSerialPortGuid},

   {PcdToken(PcdUnixVirtualDisk),   &gEfiUnixVirtualDisksGuid},

   {PcdToken(PcdUnixPhysicalDisk),  &gEfiUnixPhysicalDisksGuid},

   {PcdToken(PcdUnixCpuModel),      &gEfiUnixCPUModelGuid},

@@ -293,10 +294,10 @@ Returns:
 {

   EFI_STATUS                      Status;

   EFI_STATUS                      InstallStatus;

-  EFI_UNIX_THUNK_PROTOCOL       *UnixThunk;

+  EFI_UNIX_THUNK_PROTOCOL         *UnixThunk;

   EFI_DEVICE_PATH_PROTOCOL        *ParentDevicePath;

-  UNIX_BUS_DEVICE               *UnixBusDevice;

-  UNIX_IO_DEVICE                *UnixDevice;

+  UNIX_BUS_DEVICE                 *UnixBusDevice;

+  UNIX_IO_DEVICE                  *UnixDevice;

   UINTN                           Index;

   CHAR16                          *StartString;

   CHAR16                          *SubString;

@@ -428,7 +429,6 @@ Returns:
       }

 

       if (CreateDevice) {

-

         //

         // Allocate instance structure, and fill in parent information.

         //

@@ -441,7 +441,7 @@ Returns:
         UnixDevice->ControllerHandle   = ControllerHandle;

         UnixDevice->ParentDevicePath   = ParentDevicePath;

 

-        UnixDevice->UnixIo.UnixThunk = UnixThunk;

+        UnixDevice->UnixIo.UnixThunk   = UnixThunk;

 

         //

         // Plus 2 to account for the NULL at the end of the Unicode string

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.msa b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.msa
index b64a8216de..6422c062f5 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.msa
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.msa
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>UnixBusDriver</ModuleName>

     <ModuleType>UEFI_DRIVER</ModuleType>

     <GuidValue>f320d656-8985-11db-90e0-0040d02b1835</GuidValue>

     <Version>1.0</Version>

     <Abstract>Unix Bus driver</Abstract>

-    <Description>

-      This following section documents the envirnoment variables for the Win NT

-      build.  These variables are used to define the (virtual) hardware

-      configuration of the NT environment

-    </Description>

+    <Description>This following section documents the envirnoment variables for the Win NT
+      build.  These variables are used to define the (virtual) hardware
+      configuration of the NT environment</Description>

     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

-    <License>All rights reserved. This program and the accompanying materials

-      are licensed and made available under the terms and conditions of the BSD License

-      which accompanies this distribution.  The full text of the license may be found at

-      http://opensource.org/licenses/bsd-license.php

-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

@@ -106,6 +104,9 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">

       <GuidCName>gEfiUnixCPUSpeedGuid</GuidCName>

     </GuidCNames>

+    <GuidCNames Usage="ALWAYS_CONSUMED">

+      <GuidCName>gEfiUnixSerialPortGuid</GuidCName>

+    </GuidCNames>

   </Guids>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

@@ -119,41 +120,41 @@
     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdUnixConsole</C_Name>

       <TokenSpaceGuidCName>gEfiEdkUnixPkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD declares the title string of the text console window.

-        such as "My EFI Console".

+      <HelpText>This PCD declares the title string of the text console window.
+        such as "My EFI Console".
         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdUnixUga</C_Name>

       <TokenSpaceGuidCName>gEfiEdkUnixPkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD declares the resolutions for the UGA windows.

+      <HelpText>This PCD declares the resolutions for the UGA windows.
         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdUnixFileSystem</C_Name>

       <TokenSpaceGuidCName>gEfiEdkUnixPkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD defines the unix directory who will be mounted as

-        harddisk in simulator.

+      <HelpText>This PCD defines the unix directory who will be mounted as
+        harddisk in simulator.
         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdUnixVirtualDisk</C_Name>

       <TokenSpaceGuidCName>gEfiEdkUnixPkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD defines the devices which use a file to emulate a hard disk or

-        removable media device

+      <HelpText>This PCD defines the devices which use a file to emulate a hard disk or
+        removable media device
         The item type if this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdUnixPhysicalDisk</C_Name>

       <TokenSpaceGuidCName>gEfiEdkUnixPkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD defines physical disk which will be simualted as a

-        harddisk in simulator.

+      <HelpText>This PCD defines physical disk which will be simualted as a
+        harddisk in simulator.
         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdUnixCpuModel</C_Name>

       <TokenSpaceGuidCName>gEfiEdkUnixPkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD defines simulated CPU model string.

+      <HelpText>This PCD defines simulated CPU model string.
         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

@@ -164,8 +165,13 @@
     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdUnixMemorySize</C_Name>

       <TokenSpaceGuidCName>gEfiEdkUnixPkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD defines the size of simulated memory size.

+      <HelpText>This PCD defines the size of simulated memory size.
         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">

+      <C_Name>PcdUnixSerialPort</C_Name>

+      <TokenSpaceGuidCName>gEfiEdkUnixPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>Simulation serial IO port</HelpText>

+    </PcdEntry>

   </PcdCoded>

-</ModuleSurfaceArea>
+</ModuleSurfaceArea>
\ No newline at end of file