Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys PR port-ia64/50719
details: https://anonhg.NetBSD.org/src/rev/82240d38391f
branches: trunk
changeset: 346837:82240d38391f
user: scole <scole%NetBSD.org@localhost>
date: Thu Aug 04 18:07:43 2016 +0000
description:
PR port-ia64/50719
Remove duplicate EFI files for ia64
diffstat:
sys/arch/ia64/include/efilib.h | 42 +
sys/arch/ia64/stand/efi/include/README | 38 -
sys/arch/ia64/stand/efi/include/efi.h | 50 -
sys/arch/ia64/stand/efi/include/efi_nii.h | 84 --
sys/arch/ia64/stand/efi/include/efiapi.h | 705 -------------------------
sys/arch/ia64/stand/efi/include/eficon.h | 300 ----------
sys/arch/ia64/stand/efi/include/efidebug.h | 106 ---
sys/arch/ia64/stand/efi/include/efidef.h | 195 ------
sys/arch/ia64/stand/efi/include/efidevp.h | 392 -------------
sys/arch/ia64/stand/efi/include/efierr.h | 62 --
sys/arch/ia64/stand/efi/include/efifpswa.h | 42 -
sys/arch/ia64/stand/efi/include/efifs.h | 118 ----
sys/arch/ia64/stand/efi/include/efilib.h | 42 -
sys/arch/ia64/stand/efi/include/efinet.h | 263 ---------
sys/arch/ia64/stand/efi/include/efipart.h | 60 --
sys/arch/ia64/stand/efi/include/efiprot.h | 553 -------------------
sys/arch/ia64/stand/efi/include/efipxebc.h | 461 ----------------
sys/arch/ia64/stand/efi/include/efiser.h | 134 ----
sys/arch/ia64/stand/efi/include/efistdarg.h | 34 -
sys/arch/ia64/stand/efi/include/ia64/efibind.h | 151 -----
sys/arch/ia64/stand/efi/include/ia64/pe.h | 600 ---------------------
sys/arch/ia64/stand/efi/libefi/bootinfo.c | 4 +-
sys/arch/ia64/stand/efi/libefi/copy.c | 3 +-
sys/arch/ia64/stand/efi/libefi/efi.c | 4 +-
sys/arch/ia64/stand/efi/libefi/efifpswa.c | 3 +-
sys/arch/ia64/stand/efi/libefi/exec.c | 4 +-
sys/arch/ia64/stand/efi/libefi/time.c | 4 +-
sys/arch/ia64/stand/ia64/Makefile.booters | 6 +-
sys/arch/ia64/stand/ia64/efi/main.c | 4 +-
sys/external/bsd/gnu-efi/dist/inc/efiapi.h | 5 +-
sys/external/bsd/gnu-efi/dist/inc/efifpswa.h | 41 +
31 files changed, 110 insertions(+), 4400 deletions(-)
diffs (truncated from 4727 to 300 lines):
diff -r d354f2dcc4f9 -r 82240d38391f sys/arch/ia64/include/efilib.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/ia64/include/efilib.h Thu Aug 04 18:07:43 2016 +0000
@@ -0,0 +1,42 @@
+/* $NetBSD: efilib.h,v 1.1 2016/08/04 18:07:43 scole Exp $ */
+
+/*-
+ * Copyright (c) 2000 Doug Rabson
+ * Copyright (c) 2006 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: releng/10.1/sys/boot/efi/include/efilib.h 271135 2014-09-04 21:01:10Z emaste $
+ */
+extern EFI_HANDLE IH;
+extern EFI_SYSTEM_TABLE *ST;
+extern EFI_BOOT_SERVICES *BS;
+extern EFI_RUNTIME_SERVICES *RS;
+
+void *efi_get_table(EFI_GUID *tbl);
+void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table);
+
+EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS);
+
+EFI_STATUS main(int argc, CHAR16 *argv[]);
+void efi_exit(EFI_STATUS status);
diff -r d354f2dcc4f9 -r 82240d38391f sys/arch/ia64/stand/efi/include/README
--- a/sys/arch/ia64/stand/efi/include/README Thu Aug 04 17:50:51 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/* $NetBSD: README,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
-/* $FreeBSD: src/sys/boot/efi/include/README,v 1.1 2001/06/09 16:49:49 dfr Exp $ */
-
-/*-
-
-Files in this directory and subdirectories are subject to the following
-copyright unless superceded or supplemented by additional specific license
-terms found in the file headers of individual files.
-
-Copyright (c) 1998-2000 Intel Corporation
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL INTEL BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE. THE EFI SPECIFICATION AND ALL
-OTHER INFORMATION ON THIS WEB SITE ARE PROVIDED "AS IS" WITH NO
-WARRANTIES, AND ARE SUBJECT TO CHANGE WITHOUT NOTICE.
-
-*/
diff -r d354f2dcc4f9 -r 82240d38391f sys/arch/ia64/stand/efi/include/efi.h
--- a/sys/arch/ia64/stand/efi/include/efi.h Thu Aug 04 17:50:51 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/* $NetBSD: efi.h,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
-/* $FreeBSD: src/sys/boot/efi/include/efi.h,v 1.3 2002/05/19 03:17:20 marcel Exp $ */
-/*++
-
-Copyright (c) 1998 Intel Corporation
-
-Module Name:
-
- efi.h
-
-Abstract:
-
- Public EFI header files
-
-
-
-Revision History
-
---*/
-
-/*
- * Build flags on input
- * EFI32
- * EFI_DEBUG - Enable debugging code
- * EFI_NT_EMULATOR - Building for running under NT
- */
-
-#ifndef _EFI_INCLUDE_
-#define _EFI_INCLUDE_
-
-#define EFI_FIRMWARE_VENDOR L"INTEL"
-#define EFI_FIRMWARE_MAJOR_REVISION 12
-#define EFI_FIRMWARE_MINOR_REVISION 33
-#define EFI_FIRMWARE_REVISION ((EFI_FIRMWARE_MAJOR_REVISION <<16) | (EFI_FIRMWARE_MINOR_REVISION))
-
-#include "efibind.h"
-#include "efidef.h"
-#include "efidevp.h"
-#include "efiprot.h"
-#include "eficon.h"
-#include "efiser.h"
-#include "efi_nii.h"
-#include "efipxebc.h"
-#include "efinet.h"
-#include "efiapi.h"
-#include "efifs.h"
-#include "efifpswa.h"
-#include "efierr.h"
-
-#endif
diff -r d354f2dcc4f9 -r 82240d38391f sys/arch/ia64/stand/efi/include/efi_nii.h
--- a/sys/arch/ia64/stand/efi/include/efi_nii.h Thu Aug 04 17:50:51 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/* $NetBSD: efi_nii.h,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
-/* $FreeBSD: src/sys/boot/efi/include/efi_nii.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */
-
-#ifndef _EFI_NII_H
-#define _EFI_NII_H
-
-/*++
-Copyright (c) 2000 Intel Corporation
-
-Module name:
- efi_nii.h
-
-Abstract:
-
-Revision history:
- 2000-Feb-18 M(f)J GUID updated.
- Structure order changed for machine word alignment.
- Added StringId[4] to structure.
-
- 2000-Feb-14 M(f)J Genesis.
---*/
-
-#define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL \
- { 0xE18541CD, 0xF755, 0x4f73, 0x92, 0x8D, 0x64, 0x3C, 0x8A, 0x79, 0xB2, 0x29 }
-
-#define EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE_REVISION 0x00010000
-
-typedef enum {
- EfiNetworkInterfaceUndi = 1
-} EFI_NETWORK_INTERFACE_TYPE;
-
-typedef struct {
-
- /* Revision of the network interface identifier protocol interface. */
- UINT64 Revision;
-
- /*
- * Address of the first byte of the identifying structure for this
- * network interface. This is set to zero if there is no structure.
- * For PXE/UNDI this is the first byte of the !PXE structure.
- */
- UINT64 ID;
-
- /*
- * Address of the UNrelocated driver/ROM image. This is set
- * to zero if there is no driver/ROM image.
- * For 16-bit UNDI, this is the first byte of the option ROM in
- * upper memory.
- * For 32/64-bit S/W UNDI, this is the first byte of the EFI ROM
- * image.
- * For H/W UNDI, this is set to zero.
- */
- UINT64 ImageAddr;
-
- /*
- * Size of the UNrelocated driver/ROM image of this network interface.
- * This is set to zero if there is no driver/ROM image.
- */
- UINT32 ImageSize;
-
- /*
- * 4 char ASCII string to go in class identifier (option 60) in DHCP
- * and Boot Server discover packets.
- * For EfiNetworkInterfaceUndi this field is "UNDI".
- * For EfiNetworkInterfaceSnp this field is "SNPN".
- */
- CHAR8 StringId[4];
-
- /*
- * Information to be placed into the PXE DHCP and Discover packets.
- * This is the network interface type and version number that will
- * be placed into DHCP option 94 (client network interface identifier).
- */
- UINT8 Type;
- UINT8 MajorVer;
- UINT8 MinorVer;
-
- BOOLEAN Ipv6Supported;
- UINT8 IfNum; /* interface number to be used with pxeid structure */
-} EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE;
-
-extern EFI_GUID NetworkInterfaceIdentifierProtocol;
-
-#endif /* _EFI_NII_H */
diff -r d354f2dcc4f9 -r 82240d38391f sys/arch/ia64/stand/efi/include/efiapi.h
--- a/sys/arch/ia64/stand/efi/include/efiapi.h Thu Aug 04 17:50:51 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,705 +0,0 @@
-/* $NetBSD: efiapi.h,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
-/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.6 2003/12/10 19:08:09 jhb Exp $ */
-#ifndef _EFI_API_H
-#define _EFI_API_H
-
-/*++
-
-Copyright (c) 1998 Intel Corporation
-
-Module Name:
-
- efiapi.h
-
-Abstract:
-
- Global EFI runtime & boot service interfaces
-
-
-
-
-Revision History
-
---*/
-
-/*
- * EFI Specification Revision
- */
-
-#define EFI_SPECIFICATION_MAJOR_REVISION 1
-#define EFI_SPECIFICATION_MINOR_REVISION 02
-
-/*
- * Declare forward referenced data structures
- */
-
-INTERFACE_DECL(_EFI_SYSTEM_TABLE);
-
-/*
- * EFI Memory
- */
-
-typedef
-EFI_STATUS
-(EFIAPI *EFI_ALLOCATE_PAGES) (
- IN EFI_ALLOCATE_TYPE Type,
- IN EFI_MEMORY_TYPE MemoryType,
- IN UINTN NoPages,
- OUT EFI_PHYSICAL_ADDRESS *Memory
- );
-
-typedef
-EFI_STATUS
-(EFIAPI *EFI_FREE_PAGES) (
- IN EFI_PHYSICAL_ADDRESS Memory,
- IN UINTN NoPages
- );
-
-typedef
-EFI_STATUS
-(EFIAPI *EFI_GET_MEMORY_MAP) (
- IN OUT UINTN *MemoryMapSize,
- IN OUT EFI_MEMORY_DESCRIPTOR *MemoryMap,
- OUT UINTN *MapKey,
- OUT UINTN *DescriptorSize,
- OUT UINT32 *DescriptorVersion
- );
Home |
Main Index |
Thread Index |
Old Index