1. Sync Tcp4 protocol definitions to match UEFI 2.1

2. Clean up codes.
3. Remove struct definition content for big-endian, because UEFI 2.1 declare only little-endian supported.

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

diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.c b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.c
index b1c4c6369a0d19fcf5aae2947cfd28546ad8ae7d..8a183f48417b3782debb93c1bf0030b3011a0c9d 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.c
@@ -36,8 +36,6 @@ EFI_DRIVER_BINDING_PROTOCOL gPciVgaMiniPortDriverBinding = {
 //
 // Driver Entry Point
 //
-//@MT: EFI_DRIVER_ENTRY_POINT (PciVgaMiniPortDriverEntryPoint)
-
 EFI_STATUS
 EFIAPI
 PciVgaMiniPortDriverEntryPoint (

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
index 2e3edfd8311cd5c058bcd1f4311a877a362eb5fc..0eaa9cce5dec3e0aa9b843f79a6d37002d72b043 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
@@ -1271,8 +1271,6 @@ EhcAsyncIsochronousTransfer (
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-//@MT: EFI_DRIVER_ENTRY_POINT (EhcDriverEntryPoint)\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 EhcDriverEntryPoint (\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
index 8cda00fbda9f106cdc140ecf48ab8ab6f98b7e7d..28d9b63d9d242cfbedd2155c7da7f3d403d1334e 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
@@ -1828,8 +1828,6 @@ Uhci2AsyncIsochronousTransfer (
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-//@MT: EFI_DRIVER_ENTRY_POINT (UhciDriverEntryPoint)\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 UhciDriverEntryPoint (\r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
index f551c0a93bf5e7b794e3588475b96a84f5ca34ff..55cf88c0cc6e9a443e7fad4be3ad58c4e1dc690b 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c
@@ -113,8 +113,6 @@ EFI_DRIVER_BINDING_PROTOCOL gUsbKeyboardDriverBinding = {
   NULL\r
 };\r
 \r
-//@MT: EFI_DRIVER_ENTRY_POINT (USBKeyboardDriverBindingEntryPoint)\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 USBKeyboardDriverBindingEntryPoint (\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
index 33c3755c9768c2b1af3e71710244c96b1c9a51a9..bae04a2361165ef73d512688c9f0e905539590db 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
@@ -594,8 +594,6 @@ EFI_DRIVER_BINDING_PROTOCOL gUSBMassDriverBinding = {
   NULL\r
 };\r
 \r
-//@MT: EFI_DRIVER_ENTRY_POINT (USBMassStorageEntryPoint)\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 USBMassStorageEntryPoint (\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
index 446e8eb443166f417914a78f9841f00c110801bb..4d9aed937d1155edf70eb86030a94d540de07910 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c
@@ -24,19 +24,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <IndustryStandard/Usb.h>\r
 \r
 \r
-//\r
-// Driver Consumed Protocol Prototypes\r
-//\r
-//@MT:#include EFI_PROTOCOL_DEFINITION (DriverBinding)\r
-//@MT:#include EFI_PROTOCOL_DEFINITION (UsbIo)\r
-\r
-//\r
-// Driver Produced Protocol Prototypes\r
-//\r
-//@MT:#include EFI_PROTOCOL_DEFINITION (SimplePointer)\r
-\r
-//@MT:#include "UsbDxeLib.h"\r
-//@MT:#include "hid.h"\r
 #include "usbmouse.h"\r
 #include "mousehid.h"\r
 \r
@@ -147,8 +134,6 @@ UsbMouseReset (
 //\r
 // Driver start here\r
 //\r
-//@MT: EFI_DRIVER_ENTRY_POINT (USBMouseDriverBindingEntryPoint)\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 USBMouseDriverBindingEntryPoint (\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/receive.c b/MdeModulePkg/Universal/Network/SnpDxe/receive.c
index 64ca2565d99182decebf1c6c3a9f1d8890d4e8ef..58bfa34f90fbcdeeff1b169611899cdb8399ee0d 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/receive.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/receive.c
@@ -115,7 +115,7 @@ pxe_receive (
   //\r
   // Issue UNDI command and check result.\r
   //\r
-  DEBUG ((EFI_D_INFO, "\nsnp->undi.receive ()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.receive ()  "));\r
 \r
   (*snp->issue_undi32_command) ((UINT64)(UINTN) &snp->cdb);\r
 \r
@@ -125,7 +125,7 @@ pxe_receive (
 \r
   case PXE_STATCODE_NO_DATA:\r
     DEBUG (\r
-      (EFI_D_INFO,\r
+      (EFI_D_NET,\r
       "\nsnp->undi.receive ()  %xh:%xh\n",\r
       snp->cdb.StatFlags,\r
       snp->cdb.StatCode)\r

diff --git a/MdePkg/Include/Protocol/IP4.h b/MdePkg/Include/Protocol/IP4.h
index b70e81e73769ca391056fbcb01e58c4eb2ac18d2..99885496458d945a4f3053e2ac9cc57ea4685fd4 100644 (file)
--- a/MdePkg/Include/Protocol/IP4.h
+++ b/MdePkg/Include/Protocol/IP4.h
@@ -83,13 +83,8 @@ typedef struct {
 #pragma pack(1)\r
 \r
 typedef struct {\r
-#ifdef EFI_NET_LITTLE_ENDIAN\r
   UINT8                   HeaderLength:4;\r
   UINT8                   Version:4;\r
-#else \r
-  UINT8                   Version:4;\r
-  UINT8                   HeaderLength:4;\r
-#endif\r
   UINT8                   TypeOfService;\r
   UINT16                  TotalLength;\r
   UINT16                  Identification;\r

diff --git a/MdePkg/Include/Protocol/Tcp4.h b/MdePkg/Include/Protocol/Tcp4.h
index d5483fcc3d6cbb79abc4d26696603ac9f665fa9b..e093388851655d11c2f628cb561e0df6741e7268 100644 (file)
--- a/MdePkg/Include/Protocol/Tcp4.h
+++ b/MdePkg/Include/Protocol/Tcp4.h
@@ -1,17 +1,17 @@
 /** @file\r
   EFI TCPv4 Protocol Definition\r
   The EFI TCPv4 Service Binding Protocol is used to locate EFI TCPv4 Protocol drivers to create\r
-  and destroy child of the driver to communicate with other host using TCP protocol.      \r
-  The EFI TCPv4 Protocol provides services to send and receive data stream.     \r
+  and destroy child of the driver to communicate with other host using TCP protocol.\r
+  The EFI TCPv4 Protocol provides services to send and receive data stream.\r
 \r
-  Copyright (c) 2006, Intel Corporation                                                         \r
-  All rights reserved. This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2006, Intel Corporation\r
+  All rights reserved. This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
 \r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 \r
@@ -57,16 +57,16 @@ typedef struct {
 } EFI_TCP4_ACCESS_POINT;\r
 \r
 typedef struct {\r
-  UINTN                   ReceiveBufferSize;\r
-  UINTN                   SendBufferSize;\r
-  UINTN                   MaxSynBackLog;\r
-  UINTN                   ConnectionTimeout;\r
-  UINTN                   DataRetries;\r
-  UINTN                   FinTimeout;\r
-  UINTN                   TimeWaitTimeout;\r
-  UINTN                   KeepAliveProbes;\r
-  UINTN                   KeepAliveTime;\r
-  UINTN                   KeepAliveInterval;\r
+  UINT32                  ReceiveBufferSize;\r
+  UINT32                  SendBufferSize;\r
+  UINT32                  MaxSynBackLog;\r
+  UINT32                  ConnectionTimeout;\r
+  UINT32                  DataRetries;\r
+  UINT32                  FinTimeout;\r
+  UINT32                  TimeWaitTimeout;\r
+  UINT32                  KeepAliveProbes;\r
+  UINT32                  KeepAliveTime;\r
+  UINT32                  KeepAliveInterval;\r
   BOOLEAN                 EnableNagle;\r
   BOOLEAN                 EnableTimeStamp;\r
   BOOLEAN                 EnableWindowScaling;\r
@@ -85,10 +85,10 @@ typedef struct {
   // Access Point\r
   //\r
   EFI_TCP4_ACCESS_POINT   AccessPoint;\r
-                          \r
-  //                      \r
-  // TCP Control Options  \r
-  //                      \r
+\r
+  //\r
+  // TCP Control Options\r
+  //\r
   EFI_TCP4_OPTION         *ControlOption;\r
 } EFI_TCP4_CONFIG_DATA;\r
 \r
@@ -121,22 +121,22 @@ typedef struct {
 } EFI_TCP4_LISTEN_TOKEN;\r
 \r
 typedef struct {\r
-  UINTN FragmentLength;\r
-  VOID  *FragmentBuffer;\r
+  UINT32 FragmentLength;\r
+  VOID   *FragmentBuffer;\r
 } EFI_TCP4_FRAGMENT_DATA;\r
 \r
 typedef struct {\r
   BOOLEAN                   UrgentFlag;\r
-  IN OUT UINTN              DataLength;\r
-  UINTN                     FragmentCount;\r
+  UINT32                    DataLength;\r
+  UINT32                    FragmentCount;\r
   EFI_TCP4_FRAGMENT_DATA    FragmentTable[1];\r
-} EFI_TCP4_RECEIVE_DATA;    \r
+} EFI_TCP4_RECEIVE_DATA;\r
 \r
-typedef struct {            \r
+typedef struct {\r
   BOOLEAN                   Push;\r
   BOOLEAN                   Urgent;\r
-  UINTN                     DataLength;\r
-  UINTN                     FragmentCount;\r
+  UINT32                    DataLength;\r
+  UINT32                    FragmentCount;\r
   EFI_TCP4_FRAGMENT_DATA    FragmentTable[1];\r
 } EFI_TCP4_TRANSMIT_DATA;\r
 \r
@@ -187,7 +187,7 @@ EFI_STATUS
   OUT       EFI_SIMPLE_NETWORK_MODE            *SnpModeData    OPTIONAL\r
   )\r
 ;\r
-  \r
+\r
 /**\r
   Initialize or brutally reset the operational parameters for this EFI TCPv4 instance.\r
 \r
@@ -215,7 +215,7 @@ EFI_STATUS
   IN EFI_TCP4_CONFIG_DATA                *TcpConfigData OPTIONAL\r
   )\r
 ;\r
-    \r
+\r
 \r
 /**\r
   Add or delete a route entry to the route table\r
@@ -259,7 +259,7 @@ EFI_STATUS
   IN EFI_IPv4_ADDRESS                    *SubnetMask,\r
   IN EFI_IPv4_ADDRESS                    *GatewayAddress\r
   )\r
-;  \r
+;\r
 \r
 /**\r
   Initiate a nonblocking TCP connection request for an active TCP instance.\r
@@ -267,7 +267,7 @@ EFI_STATUS
   @param  This                  Pointer to the EFI_TCP4_PROTOCOL instance.\r
   @param  ConnectionToken       Pointer to the connection token to return when the TCP three\r
                                 way handshake finishes.\r
-                                 \r
+\r
   @retval EFI_SUCCESS           The connection request is successfully initiated and the state\r
                                 - of this TCPv4 instance has been changed to\r
                                 - Tcp4StateSynSent.\r
@@ -289,8 +289,8 @@ EFI_STATUS
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_CONNECTION_TOKEN           *ConnectionToken\r
   )\r
-;  \r
-  \r
+;\r
+\r
 \r
 /**\r
   Listen on the passive instance to accept an incoming connection request. This is a nonblocking operation.\r
@@ -319,7 +319,7 @@ EFI_STATUS
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_LISTEN_TOKEN               *ListenToken\r
   )\r
-;    \r
+;\r
 \r
 /**\r
   Queues outgoing data into the transmit queue.\r
@@ -358,7 +358,7 @@ EFI_STATUS
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_IO_TOKEN                   *Token\r
   )\r
-;      \r
+;\r
 \r
 \r
 /**\r
@@ -402,11 +402,11 @@ EFI_STATUS
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_IO_TOKEN                   *Token\r
   )\r
-;       \r
-   \r
+;\r
+\r
 /**\r
   Disconnecting a TCP connection gracefully or reset a TCP connection. This function is a\r
-  nonblocking operation.                                                                                                                                                                        \r
+  nonblocking operation.\r
 \r
   @param  This       Pointer to the EFI_TCP4_PROTOCOL instance.\r
   @param  CloseToken Pointer to the close token to return when operation finishes.\r
@@ -433,7 +433,7 @@ EFI_STATUS
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_CLOSE_TOKEN                *CloseToken\r
   )\r
-;      \r
+;\r
 \r
 /**\r
   Abort an asynchronous connection, listen, transmission or receive request.\r
@@ -462,7 +462,7 @@ EFI_STATUS
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_COMPLETION_TOKEN           *Token OPTIONAL\r
   )\r
-;      \r
+;\r
 \r
 \r
 /**\r
@@ -483,7 +483,7 @@ EFI_STATUS
 (EFIAPI *EFI_TCP4_POLL) (\r
   IN EFI_TCP4_PROTOCOL                   *This\r
   )\r
-;      \r
+;\r
 \r
 struct _EFI_TCP4_PROTOCOL {\r
   EFI_TCP4_GET_MODE_DATA                 GetModeData;\r