From owner-p4-projects@FreeBSD.ORG Wed Oct 25 21:22:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9AE816A412; Wed, 25 Oct 2006 21:22:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D18C16A417 for ; Wed, 25 Oct 2006 21:22:56 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A32743D45 for ; Wed, 25 Oct 2006 21:22:56 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PLMuOZ087823 for ; Wed, 25 Oct 2006 21:22:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PLMuXC087805 for perforce@freebsd.org; Wed, 25 Oct 2006 21:22:56 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 21:22:56 GMT Message-Id: <200610252122.k9PLMuXC087805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 108441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Oct 2006 21:22:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=108441 Change 108441 by marcel@marcel_cluster on 2006/10/25 21:22:28 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efipxebc.h#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efipxebc.h#3 (text+ko) ==== @@ -4,7 +4,14 @@ /*++ -Copyright (c) 1998 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module Name: @@ -20,21 +27,20 @@ --*/ -/* - * PXE Base Code protocol - */ +// +// PXE Base Code protocol +// #define EFI_PXE_BASE_CODE_PROTOCOL \ { 0x03c4e603, 0xac28, 0x11d3, 0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } INTERFACE_DECL(_EFI_PXE_BASE_CODE); -#define DEFAULT_TTL 4 +#define DEFAULT_TTL 8 #define DEFAULT_ToS 0 - -/* - * Address definitions - */ +// +// Address definitions +// typedef union { UINT32 Addr[4]; @@ -44,9 +50,9 @@ typedef UINT16 EFI_PXE_BASE_CODE_UDP_PORT; -/* - * Packet definitions - */ +// +// Packet definitions +// typedef struct { UINT8 BootpOpcode; @@ -67,9 +73,15 @@ UINT8 DhcpOptions[56]; } EFI_PXE_BASE_CODE_DHCPV4_PACKET; +// TBD in EFI v1.1 +//typedef struct { +// UINT8 reserved; +//} EFI_PXE_BASE_CODE_DHCPV6_PACKET; + typedef union { UINT8 Raw[1472]; EFI_PXE_BASE_CODE_DHCPV4_PACKET Dhcpv4; +// EFI_PXE_BASE_CODE_DHCPV6_PACKET Dhcpv6; } EFI_PXE_BASE_CODE_PACKET; typedef struct { @@ -93,9 +105,9 @@ CHAR8 ErrorString[127]; } EFI_PXE_BASE_CODE_TFTP_ERROR; -/* - * IP Receive Filter definitions - */ +// +// IP Receive Filter definitions +// #define EFI_PXE_BASE_CODE_MAX_IPCNT 8 typedef struct { UINT8 Filters; @@ -109,9 +121,9 @@ #define EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS 0x0004 #define EFI_PXE_BASE_CODE_IP_FILTER_PROMISCUOUS_MULTICAST 0x0008 -/* - * ARP Cache definitions - */ +// +// ARP Cache definitions +// typedef struct { EFI_IP_ADDRESS IpAddr; @@ -124,9 +136,9 @@ EFI_IP_ADDRESS GwAddr; } EFI_PXE_BASE_CODE_ROUTE_ENTRY; -/* - * UDP definitions - */ +// +// UDP definitions +// #define EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_IP 0x0001 #define EFI_PXE_BASE_CODE_UDP_OPFLAGS_ANY_SRC_PORT 0x0002 @@ -135,9 +147,9 @@ #define EFI_PXE_BASE_CODE_UDP_OPFLAGS_USE_FILTER 0x0010 #define EFI_PXE_BASE_CODE_UDP_OPFLAGS_MAY_FRAGMENT 0x0020 -/* - * Discover() definitions - */ +// +// Discover() definitions +// #define EFI_PXE_BASE_CODE_BOOT_TYPE_BOOTSTRAP 0 #define EFI_PXE_BASE_CODE_BOOT_TYPE_MS_WINNT_RIS 1 @@ -156,15 +168,16 @@ #define EFI_PXE_BASE_CODE_BOOT_TYPE_REDHAT_BOOT 14 #define EFI_PXE_BASE_CODE_BOOT_TYPE_REMBO 15 #define EFI_PXE_BASE_CODE_BOOT_TYPE_BEOBOOT 16 -/* - * 17 through 32767 are reserved - * 32768 through 65279 are for vendor use - * 65280 through 65534 are reserved - */ +// +// 17 through 32767 are reserved +// 32768 through 65279 are for vendor use +// 65280 through 65534 are reserved +// #define EFI_PXE_BASE_CODE_BOOT_TYPE_PXETEST 65535 #define EFI_PXE_BASE_CODE_BOOT_LAYER_MASK 0x7FFF #define EFI_PXE_BASE_CODE_BOOT_LAYER_INITIAL 0x0000 +#define EFI_PXE_BASE_CODE_BOOT_LAYER_CREDENTIALS 0x8000 typedef struct { @@ -184,9 +197,9 @@ EFI_PXE_BASE_CODE_SRVLIST SrvList[1]; } EFI_PXE_BASE_CODE_DISCOVER_INFO; -/* - * Mtftp() definitions - */ +// +// Mtftp() definitions +// typedef enum { EFI_PXE_BASE_CODE_TFTP_FIRST, @@ -208,9 +221,9 @@ UINT16 TransmitTimeout; } EFI_PXE_BASE_CODE_MTFTP_INFO; -/* - * PXE Base Code Mode structure - */ +// +// PXE Base Code Mode structure +// #define EFI_PXE_BASE_CODE_MAX_ARP_ENTRIES 8 #define EFI_PXE_BASE_CODE_MAX_ROUTE_ENTRIES 8 @@ -252,9 +265,9 @@ EFI_PXE_BASE_CODE_TFTP_ERROR TftpError; } EFI_PXE_BASE_CODE_MODE; -/* - * PXE Base Code Interface Function definitions - */ +// +// PXE Base Code Interface Function definitions +// typedef EFI_STATUS @@ -293,7 +306,7 @@ IN EFI_PXE_BASE_CODE_TFTP_OPCODE Operation, IN OUT VOID *BufferPtr OPTIONAL, IN BOOLEAN Overwrite, - IN OUT UINTN *BufferSize, + IN OUT UINT64 *BufferSize, IN UINTN *BlockSize OPTIONAL, IN EFI_IP_ADDRESS *ServerIp, IN UINT8 *Filename, @@ -384,9 +397,9 @@ IN EFI_PXE_BASE_CODE_PACKET *NewPxeBisReply OPTIONAL ); -/* - * PXE Base Code Protocol structure - */ +// +// PXE Base Code Protocol structure +// #define EFI_PXE_BASE_CODE_INTERFACE_REVISION 0x00010000 @@ -407,16 +420,16 @@ EFI_PXE_BASE_CODE_MODE *Mode; } EFI_PXE_BASE_CODE; -/* - * Call Back Definitions - */ +// +// Call Back Definitions +// #define EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL \ { 0x245dca21, 0xfb7b, 0x11d3, 0x8f, 0x01, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } -/* - * Revision Number - */ +// +// Revision Number +// #define EFI_PXE_BASE_CODE_CALLBACK_INTERFACE_REVISION 0x00010000