Fix the definition differences issue of termios.h in different version of kernel...

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

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/SerialIo/UnixSerialIo.h b/EdkUnixPkg/Dxe/UnixThunk/Bus/SerialIo/UnixSerialIo.h
index 30109e2529d2b11b0689729faff528826286e387..dad704c966f234810a3ca7b141f368972cefc44c 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/SerialIo/UnixSerialIo.h
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/SerialIo/UnixSerialIo.h
@@ -132,6 +132,54 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gUnixSerialIoComponentName;
 //\r
 #define SERIAL_PORT_MAX_BAUD_RATE 115400  \r
 \r
 //\r
 #define SERIAL_PORT_MAX_BAUD_RATE 115400  \r
 \r

+//\r
+// Fix the differences issue of linux header files termios.h \r
+// \r
+#ifndef B460800\r
+#define B460800 0010004\r
+#endif\r
+#ifndef B500000\r
+#define   B500000 0010005\r
+#endif\r
+#ifndef B576000\r
+#define   B576000 0010006\r
+#endif\r
+#ifndef B921600\r
+#define   B921600 0010007\r
+#endif\r
+#ifndef B1000000\r
+#define  B1000000 0010010\r
+#endif\r
+#ifndef B1152000\r
+#define  B1152000 0010011\r
+#endif\r
+#ifndef B1500000\r
+#define  B1500000 0010012\r
+#endif\r
+#ifndef B2000000\r
+#define  B2000000 0010013\r
+#endif\r
+#ifndef B2500000\r
+#define  B2500000 0010014\r
+#endif\r
+#ifndef B3000000\r
+#define  B3000000 0010015\r
+#endif\r
+#ifndef B3500000\r
+#define  B3500000 0010016\r
+#endif\r
+#ifndef B4000000\r
+#define  B4000000 0010017\r
+#endif\r
+#ifndef __MAX_BAUD\r
+#define __MAX_BAUD B4000000\r
+#endif\r
+#ifndef CMSPAR\r
+#define CMSPAR   010000000000          /* mark or space (stick) parity */\r
+#endif\r
+#ifndef FIONREAD\r
+#define FIONREAD       0x541B\r
+#endif\r

 //\r
 // Function Prototypes\r
 //\r
 //\r
 // Function Prototypes\r
 //\r

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c b/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c
index 9166a8a0a29948e62c890815588859d69bc5f48f..af27d7baa1c592c742a40df47276d7de85c8a4c6 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c
@@ -651,7 +651,7 @@ Returns:
       //\r
       // Initialize strings to HII database\r
       //\r
       //\r
       // Initialize strings to HII database\r
       //\r

-      PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, STRING_ARRAY_NAME);\r
+      PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, CpuStrings);\r

 \r
       Status      = Hii->NewPack (Hii, PackageList, &StringHandle);\r
       ASSERT (!EFI_ERROR (Status));\r
 \r
       Status      = Hii->NewPack (Hii, PackageList, &StringHandle);\r
       ASSERT (!EFI_ERROR (Status));\r

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Cpu/CpuDriver.h b/EdkUnixPkg/Dxe/UnixThunk/Cpu/CpuDriver.h
index d7254203d5b6540b31bafa6638718b59a321fc5f..254e62652e03a38e8bde3f770869b374faa1a787 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixThunk/Cpu/CpuDriver.h
+++ b/EdkUnixPkg/Dxe/UnixThunk/Cpu/CpuDriver.h
@@ -24,7 +24,7 @@ Abstract:
 \r
 \r
 \r
 \r
 \r
 \r

-extern UINT8  STRING_ARRAY_NAME[];\r
+extern UINT8  CpuStrings[];\r

 \r
 //\r
 // Internal Data Structures\r
 \r
 //\r
 // Internal Data Structures\r

diff --git a/EdkUnixPkg/Sec/UnixThunk.c b/EdkUnixPkg/Sec/UnixThunk.c
index fcf290ddbb218d7d10d03ef1ec31d93b2cbefadc..cce14e50cdea5bf3582188c126cceec1866bbfcc 100644 (file)
--- a/EdkUnixPkg/Sec/UnixThunk.c
+++ b/EdkUnixPkg/Sec/UnixThunk.c
@@ -40,6 +40,8 @@ Abstract:
 #include <stdlib.h>
 #include <termio.h>
 
 #include <stdlib.h>
 #include <termio.h>
 

+extern ioctl (int fd, unsigned long int __request, ...);
+

 static int settimer_initialized;
 static struct timeval settimer_timeval;
 static void (*settimer_callback)(UINT64 delta);
 static int settimer_initialized;
 static struct timeval settimer_timeval;
 static void (*settimer_callback)(UINT64 delta);