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
This commit is contained in:
vanjeff 2007-08-27 07:02:05 +00:00
parent fa9f28be56
commit d01c093a58
9 changed files with 47 additions and 77 deletions

View File

@ -36,8 +36,6 @@ EFI_DRIVER_BINDING_PROTOCOL gPciVgaMiniPortDriverBinding = {
// //
// Driver Entry Point // Driver Entry Point
// //
//@MT: EFI_DRIVER_ENTRY_POINT (PciVgaMiniPortDriverEntryPoint)
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PciVgaMiniPortDriverEntryPoint ( PciVgaMiniPortDriverEntryPoint (

View File

@ -1271,8 +1271,6 @@ EhcAsyncIsochronousTransfer (
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
//@MT: EFI_DRIVER_ENTRY_POINT (EhcDriverEntryPoint)
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
EhcDriverEntryPoint ( EhcDriverEntryPoint (

View File

@ -1828,8 +1828,6 @@ Uhci2AsyncIsochronousTransfer (
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
//@MT: EFI_DRIVER_ENTRY_POINT (UhciDriverEntryPoint)
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
UhciDriverEntryPoint ( UhciDriverEntryPoint (

View File

@ -113,8 +113,6 @@ EFI_DRIVER_BINDING_PROTOCOL gUsbKeyboardDriverBinding = {
NULL NULL
}; };
//@MT: EFI_DRIVER_ENTRY_POINT (USBKeyboardDriverBindingEntryPoint)
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
USBKeyboardDriverBindingEntryPoint ( USBKeyboardDriverBindingEntryPoint (

View File

@ -594,8 +594,6 @@ EFI_DRIVER_BINDING_PROTOCOL gUSBMassDriverBinding = {
NULL NULL
}; };
//@MT: EFI_DRIVER_ENTRY_POINT (USBMassStorageEntryPoint)
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
USBMassStorageEntryPoint ( USBMassStorageEntryPoint (

View File

@ -24,19 +24,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <IndustryStandard/Usb.h> #include <IndustryStandard/Usb.h>
//
// 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 "usbmouse.h"
#include "mousehid.h" #include "mousehid.h"
@ -147,8 +134,6 @@ UsbMouseReset (
// //
// Driver start here // Driver start here
// //
//@MT: EFI_DRIVER_ENTRY_POINT (USBMouseDriverBindingEntryPoint)
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
USBMouseDriverBindingEntryPoint ( USBMouseDriverBindingEntryPoint (

View File

@ -115,7 +115,7 @@ pxe_receive (
// //
// Issue UNDI command and check result. // 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); (*snp->issue_undi32_command) ((UINT64)(UINTN) &snp->cdb);
@ -125,7 +125,7 @@ pxe_receive (
case PXE_STATCODE_NO_DATA: case PXE_STATCODE_NO_DATA:
DEBUG ( DEBUG (
(EFI_D_INFO, (EFI_D_NET,
"\nsnp->undi.receive () %xh:%xh\n", "\nsnp->undi.receive () %xh:%xh\n",
snp->cdb.StatFlags, snp->cdb.StatFlags,
snp->cdb.StatCode) snp->cdb.StatCode)

View File

@ -83,13 +83,8 @@ typedef struct {
#pragma pack(1) #pragma pack(1)
typedef struct { typedef struct {
#ifdef EFI_NET_LITTLE_ENDIAN
UINT8 HeaderLength:4; UINT8 HeaderLength:4;
UINT8 Version:4; UINT8 Version:4;
#else
UINT8 Version:4;
UINT8 HeaderLength:4;
#endif
UINT8 TypeOfService; UINT8 TypeOfService;
UINT16 TotalLength; UINT16 TotalLength;
UINT16 Identification; UINT16 Identification;

View File

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