From d01c093a582c001ae3817706b3d664e9ea3d00ba Mon Sep 17 00:00:00 2001 From: vanjeff Date: Mon, 27 Aug 2007 07:02:05 +0000 Subject: [PATCH 1/1] 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 --- .../Bus/Pci/VgaMiniPortDxe/VgaMiniPort.c | 2 - MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c | 2 - MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c | 2 - MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c | 2 - .../Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c | 2 - MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c | 15 ---- .../Universal/Network/SnpDxe/receive.c | 4 +- MdePkg/Include/Protocol/IP4.h | 5 -- MdePkg/Include/Protocol/Tcp4.h | 90 +++++++++---------- 9 files changed, 47 insertions(+), 77 deletions(-) diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.c b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPort.c index b1c4c6369a..8a183f4841 100644 --- 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 2e3edfd831..0eaa9cce5d 100644 --- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c +++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c @@ -1271,8 +1271,6 @@ EhcAsyncIsochronousTransfer ( return EFI_UNSUPPORTED; } -//@MT: EFI_DRIVER_ENTRY_POINT (EhcDriverEntryPoint) - EFI_STATUS EFIAPI EhcDriverEntryPoint ( diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c index 8cda00fbda..28d9b63d9d 100644 --- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c +++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c @@ -1828,8 +1828,6 @@ Uhci2AsyncIsochronousTransfer ( return EFI_UNSUPPORTED; } -//@MT: EFI_DRIVER_ENTRY_POINT (UhciDriverEntryPoint) - EFI_STATUS EFIAPI UhciDriverEntryPoint ( diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c index f551c0a93b..55cf88c0cc 100644 --- a/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c +++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/efikey.c @@ -113,8 +113,6 @@ EFI_DRIVER_BINDING_PROTOCOL gUsbKeyboardDriverBinding = { NULL }; -//@MT: EFI_DRIVER_ENTRY_POINT (USBKeyboardDriverBindingEntryPoint) - EFI_STATUS EFIAPI USBKeyboardDriverBindingEntryPoint ( diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c index 33c3755c97..bae04a2361 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c @@ -594,8 +594,6 @@ EFI_DRIVER_BINDING_PROTOCOL gUSBMassDriverBinding = { NULL }; -//@MT: EFI_DRIVER_ENTRY_POINT (USBMassStorageEntryPoint) - EFI_STATUS EFIAPI USBMassStorageEntryPoint ( diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/usbmouse.c index 446e8eb443..4d9aed937d 100644 --- 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 -// -// Driver Consumed Protocol Prototypes -// -//@MT:#include EFI_PROTOCOL_DEFINITION (DriverBinding) -//@MT:#include EFI_PROTOCOL_DEFINITION (UsbIo) - -// -// Driver Produced Protocol Prototypes -// -//@MT:#include EFI_PROTOCOL_DEFINITION (SimplePointer) - -//@MT:#include "UsbDxeLib.h" -//@MT:#include "hid.h" #include "usbmouse.h" #include "mousehid.h" @@ -147,8 +134,6 @@ UsbMouseReset ( // // Driver start here // -//@MT: EFI_DRIVER_ENTRY_POINT (USBMouseDriverBindingEntryPoint) - EFI_STATUS EFIAPI USBMouseDriverBindingEntryPoint ( diff --git a/MdeModulePkg/Universal/Network/SnpDxe/receive.c b/MdeModulePkg/Universal/Network/SnpDxe/receive.c index 64ca2565d9..58bfa34f90 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/receive.c +++ b/MdeModulePkg/Universal/Network/SnpDxe/receive.c @@ -115,7 +115,7 @@ pxe_receive ( // // Issue UNDI command and check result. // - DEBUG ((EFI_D_INFO, "\nsnp->undi.receive () ")); + DEBUG ((EFI_D_NET, "\nsnp->undi.receive () ")); (*snp->issue_undi32_command) ((UINT64)(UINTN) &snp->cdb); @@ -125,7 +125,7 @@ pxe_receive ( case PXE_STATCODE_NO_DATA: DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "\nsnp->undi.receive () %xh:%xh\n", snp->cdb.StatFlags, snp->cdb.StatCode) diff --git a/MdePkg/Include/Protocol/IP4.h b/MdePkg/Include/Protocol/IP4.h index b70e81e737..9988549645 100644 --- a/MdePkg/Include/Protocol/IP4.h +++ b/MdePkg/Include/Protocol/IP4.h @@ -83,13 +83,8 @@ typedef struct { #pragma pack(1) typedef struct { -#ifdef EFI_NET_LITTLE_ENDIAN UINT8 HeaderLength:4; UINT8 Version:4; -#else - UINT8 Version:4; - UINT8 HeaderLength:4; -#endif UINT8 TypeOfService; UINT16 TotalLength; UINT16 Identification; diff --git a/MdePkg/Include/Protocol/Tcp4.h b/MdePkg/Include/Protocol/Tcp4.h index d5483fcc3d..e093388851 100644 --- a/MdePkg/Include/Protocol/Tcp4.h +++ b/MdePkg/Include/Protocol/Tcp4.h @@ -1,17 +1,17 @@ /** @file EFI TCPv4 Protocol Definition The EFI TCPv4 Service Binding Protocol is used to locate EFI TCPv4 Protocol drivers to create - and destroy child of the driver to communicate with other host using TCP protocol. - The EFI TCPv4 Protocol provides services to send and receive data stream. + and destroy child of the driver to communicate with other host using TCP protocol. + The EFI TCPv4 Protocol provides services to send and receive data stream. - Copyright (c) 2006, Intel Corporation - 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 + Copyright (c) 2006, Intel Corporation + 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. + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -57,16 +57,16 @@ typedef struct { } EFI_TCP4_ACCESS_POINT; typedef struct { - UINTN ReceiveBufferSize; - UINTN SendBufferSize; - UINTN MaxSynBackLog; - UINTN ConnectionTimeout; - UINTN DataRetries; - UINTN FinTimeout; - UINTN TimeWaitTimeout; - UINTN KeepAliveProbes; - UINTN KeepAliveTime; - UINTN KeepAliveInterval; + UINT32 ReceiveBufferSize; + UINT32 SendBufferSize; + UINT32 MaxSynBackLog; + UINT32 ConnectionTimeout; + UINT32 DataRetries; + UINT32 FinTimeout; + UINT32 TimeWaitTimeout; + UINT32 KeepAliveProbes; + UINT32 KeepAliveTime; + UINT32 KeepAliveInterval; BOOLEAN EnableNagle; BOOLEAN EnableTimeStamp; BOOLEAN EnableWindowScaling; @@ -85,10 +85,10 @@ typedef struct { // Access Point // EFI_TCP4_ACCESS_POINT AccessPoint; - - // - // TCP Control Options - // + + // + // TCP Control Options + // EFI_TCP4_OPTION *ControlOption; } EFI_TCP4_CONFIG_DATA; @@ -121,22 +121,22 @@ typedef struct { } EFI_TCP4_LISTEN_TOKEN; typedef struct { - UINTN FragmentLength; - VOID *FragmentBuffer; + UINT32 FragmentLength; + VOID *FragmentBuffer; } EFI_TCP4_FRAGMENT_DATA; typedef struct { BOOLEAN UrgentFlag; - IN OUT UINTN DataLength; - UINTN FragmentCount; + UINT32 DataLength; + UINT32 FragmentCount; EFI_TCP4_FRAGMENT_DATA FragmentTable[1]; -} EFI_TCP4_RECEIVE_DATA; +} EFI_TCP4_RECEIVE_DATA; -typedef struct { +typedef struct { BOOLEAN Push; BOOLEAN Urgent; - UINTN DataLength; - UINTN FragmentCount; + UINT32 DataLength; + UINT32 FragmentCount; EFI_TCP4_FRAGMENT_DATA FragmentTable[1]; } EFI_TCP4_TRANSMIT_DATA; @@ -187,7 +187,7 @@ EFI_STATUS OUT EFI_SIMPLE_NETWORK_MODE *SnpModeData OPTIONAL ) ; - + /** Initialize or brutally reset the operational parameters for this EFI TCPv4 instance. @@ -215,7 +215,7 @@ EFI_STATUS IN EFI_TCP4_CONFIG_DATA *TcpConfigData OPTIONAL ) ; - + /** Add or delete a route entry to the route table @@ -259,7 +259,7 @@ EFI_STATUS IN EFI_IPv4_ADDRESS *SubnetMask, IN EFI_IPv4_ADDRESS *GatewayAddress ) -; +; /** Initiate a nonblocking TCP connection request for an active TCP instance. @@ -267,7 +267,7 @@ EFI_STATUS @param This Pointer to the EFI_TCP4_PROTOCOL instance. @param ConnectionToken Pointer to the connection token to return when the TCP three way handshake finishes. - + @retval EFI_SUCCESS The connection request is successfully initiated and the state - of this TCPv4 instance has been changed to - Tcp4StateSynSent. @@ -289,8 +289,8 @@ EFI_STATUS IN EFI_TCP4_PROTOCOL *This, IN EFI_TCP4_CONNECTION_TOKEN *ConnectionToken ) -; - +; + /** Listen on the passive instance to accept an incoming connection request. This is a nonblocking operation. @@ -319,7 +319,7 @@ EFI_STATUS IN EFI_TCP4_PROTOCOL *This, IN EFI_TCP4_LISTEN_TOKEN *ListenToken ) -; +; /** Queues outgoing data into the transmit queue. @@ -358,7 +358,7 @@ EFI_STATUS IN EFI_TCP4_PROTOCOL *This, IN EFI_TCP4_IO_TOKEN *Token ) -; +; /** @@ -402,11 +402,11 @@ EFI_STATUS IN EFI_TCP4_PROTOCOL *This, IN EFI_TCP4_IO_TOKEN *Token ) -; - +; + /** Disconnecting a TCP connection gracefully or reset a TCP connection. This function is a - nonblocking operation. + nonblocking operation. @param This Pointer to the EFI_TCP4_PROTOCOL instance. @param CloseToken Pointer to the close token to return when operation finishes. @@ -433,7 +433,7 @@ EFI_STATUS IN EFI_TCP4_PROTOCOL *This, IN EFI_TCP4_CLOSE_TOKEN *CloseToken ) -; +; /** Abort an asynchronous connection, listen, transmission or receive request. @@ -462,7 +462,7 @@ EFI_STATUS IN EFI_TCP4_PROTOCOL *This, IN EFI_TCP4_COMPLETION_TOKEN *Token OPTIONAL ) -; +; /** @@ -483,7 +483,7 @@ EFI_STATUS (EFIAPI *EFI_TCP4_POLL) ( IN EFI_TCP4_PROTOCOL *This ) -; +; struct _EFI_TCP4_PROTOCOL { EFI_TCP4_GET_MODE_DATA GetModeData; -- 2.39.2