diff options
author | Jordan Justen <jordan.l.justen@intel.com> | 2013-07-29 21:09:55 +0000 |
---|---|---|
committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-07-29 21:09:55 +0000 |
commit | 5d71a30480bdf7081f72485d6bf48361c244c4d7 (patch) | |
tree | eaa76ec905c5a488d86edb9dcc5c4c7a79958258 /UnixPkg/Include | |
parent | bf6ee6c7c33cf280cdfb2fd0e6b66a712b7aa4a1 (diff) | |
download | edk2-platforms-5d71a30480bdf7081f72485d6bf48361c244c4d7.tar.xz |
UnixPkg: Remove UnixPkg files (It is replaced by EmulatorPkg)
For now the UnixPkg/Deprecated.txt file is retained to indicate
that EmulatorPkg should be used instead.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14518 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'UnixPkg/Include')
-rw-r--r-- | UnixPkg/Include/Common/UnixInclude.h | 183 | ||||
-rw-r--r-- | UnixPkg/Include/FlashLayout.h | 64 | ||||
-rw-r--r-- | UnixPkg/Include/Guid/UnixSystemConfig.h | 36 | ||||
-rw-r--r-- | UnixPkg/Include/Library/SecDispatchTableLib.h | 57 | ||||
-rw-r--r-- | UnixPkg/Include/Library/UnixLib.h | 27 | ||||
-rw-r--r-- | UnixPkg/Include/Ppi/UnixAutoScan.h | 66 | ||||
-rw-r--r-- | UnixPkg/Include/Ppi/UnixFwh.h | 64 | ||||
-rw-r--r-- | UnixPkg/Include/Ppi/UnixPeiLoadFile.h | 65 | ||||
-rw-r--r-- | UnixPkg/Include/Ppi/UnixThunk.h | 56 | ||||
-rw-r--r-- | UnixPkg/Include/Protocol/UnixIo.h | 154 | ||||
-rw-r--r-- | UnixPkg/Include/Protocol/UnixThunk.h | 346 | ||||
-rw-r--r-- | UnixPkg/Include/Protocol/UnixUgaIo.h | 139 | ||||
-rw-r--r-- | UnixPkg/Include/UnixDxe.h | 36 | ||||
-rw-r--r-- | UnixPkg/Include/UnixPeim.h | 30 |
14 files changed, 0 insertions, 1323 deletions
diff --git a/UnixPkg/Include/Common/UnixInclude.h b/UnixPkg/Include/Common/UnixInclude.h deleted file mode 100644 index 3dbe09d8a2..0000000000 --- a/UnixPkg/Include/Common/UnixInclude.h +++ /dev/null @@ -1,183 +0,0 @@ -/*++
-
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
-Portions copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
-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.
-
-Module Name:
- UnixInclude.h
-
-Abstract:
- Public include file for the Unix Library
-
---*/
-
-#ifndef __UNIX_INCLUDE_H__
-#define __UNIX_INCLUDE_H__
-
-// #include <sys/poll.h>
-// #include <dirent.h>
-
-//
-// Name mangle to prevent build errors. I.e conflicts between EFI and OS
-//
-#define NTOHL _UNIX_EFI_NAME_MANGLE_NTOHL_
-#define HTONL _UNIX_EFI_NAME_MANGLE_HTONL_
-#define NTOHS _UNIX_EFI_NAME_MANGLE_NTOHS_
-#define HTONS _UNIX_EFI_NAME_MANGLE_HTOHS_
-#define B0 _UNIX_EFI_NAME_MANGLE_B0_
-
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/termios.h>
-#include <sys/time.h>
-
-#if __CYGWIN__
-#include <sys/dirent.h>
-#else
-#include <sys/dir.h>
-#endif
-
-#include <unistd.h>
-#include <poll.h>
-#include <fcntl.h>
-#include <time.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <ifaddrs.h>
-
-#ifdef __APPLE__
-#include <net/if_dl.h>
-#include <net/bpf.h>
-#include <sys/param.h>
-#include <sys/mount.h>
-#define _XOPEN_SOURCE
-#ifndef _Bool
- #define _Bool char // for clang debug
-#endif
-#else
-#include <termio.h>
-#include <sys/vfs.h>
-#endif
-
-#include <utime.h>
-
-#if __APPLE__
-//
-// EFI packing is not compatible witht he default OS packing for struct stat.
-// st_size is 64-bit but starts on a 32-bit offset in the structure. The compiler
-// flags used to produce compatible EFI images, break struct stat
-//
-#ifdef MDE_CPU_IA32
-#pragma pack(4)
-#endif
-
-#if defined(__DARWIN_64_BIT_INO_T)
-
-
-typedef struct {
- UINTN tv_sec; /* seconds */
- UINTN tv_nsec; /* and nanoseconds */
-} EFI_timespec;
-
-
-
-typedef struct stat_fix { \
- dev_t st_dev; /* [XSI] ID of device containing file */
- mode_t st_mode; /* [XSI] Mode of file (see below) */
- nlink_t st_nlink; /* [XSI] Number of hard links */
- __darwin_ino64_t st_ino; /* [XSI] File serial number */
- uid_t st_uid; /* [XSI] User ID of the file */
- gid_t st_gid; /* [XSI] Group ID of the file */
- dev_t st_rdev; /* [XSI] Device ID */
-
- // clang for X64 ABI follows Windows and a long is 32-bits
- // this breaks system inlcude files so that is why we need
- // to redefine timespec as EFI_timespec
- EFI_timespec st_atimespec;
- EFI_timespec st_mtimespec;
- EFI_timespec st_ctimespec;
- EFI_timespec st_birthtimespec;
-
- off_t st_size; /* [XSI] file size, in bytes */
- blkcnt_t st_blocks; /* [XSI] blocks allocated for file */
- blksize_t st_blksize; /* [XSI] optimal blocksize for I/O */
- __uint32_t st_flags; /* user defined flags for file */
- __uint32_t st_gen; /* file generation number */
- __int32_t st_lspare; /* RESERVED: DO NOT USE! */
- __int64_t st_qspare[2]; /* RESERVED: DO NOT USE! */
-} STAT_FIX;
-
-#else /* !__DARWIN_64_BIT_INO_T */
-
-typedef struct stat_fix {
- dev_t st_dev; /* [XSI] ID of device containing file */
- ino_t st_ino; /* [XSI] File serial number */
- mode_t st_mode; /* [XSI] Mode of file (see below) */
- nlink_t st_nlink; /* [XSI] Number of hard links */
- uid_t st_uid; /* [XSI] User ID of the file */
- gid_t st_gid; /* [XSI] Group ID of the file */
- dev_t st_rdev; /* [XSI] Device ID */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
- struct timespec st_atimespec; /* time of last access */
- struct timespec st_mtimespec; /* time of last data modification */
- struct timespec st_ctimespec; /* time of last status change */
-#else
- time_t st_atime; /* [XSI] Time of last access */
- long st_atimensec; /* nsec of last access */
- time_t st_mtime; /* [XSI] Last data modification time */
- long st_mtimensec; /* last data modification nsec */
- time_t st_ctime; /* [XSI] Time of last status change */
- long st_ctimensec; /* nsec of last status change */
-#endif
- off_t st_size; /* [XSI] file size, in bytes */
- blkcnt_t st_blocks; /* [XSI] blocks allocated for file */
- blksize_t st_blksize; /* [XSI] optimal blocksize for I/O */
- __uint32_t st_flags; /* user defined flags for file */
- __uint32_t st_gen; /* file generation number */
- __int32_t st_lspare; /* RESERVED: DO NOT USE! */
- __int64_t st_qspare[2]; /* RESERVED: DO NOT USE! */
-} STAT_FIX;
-
-#endif
-
-#ifdef MDE_CPU_IA32
-#pragma pack(4)
-#endif
-
-#else
-
- typedef struct stat STAT_FIX;
-
-#endif
-
-//
-// Undo name mangling
-//
-#undef NTOHL
-#undef HTONL
-#undef NTOHS
-#undef HTONS
-#undef B0
-
-
-#endif
-
diff --git a/UnixPkg/Include/FlashLayout.h b/UnixPkg/Include/FlashLayout.h deleted file mode 100644 index 5fa197b8fc..0000000000 --- a/UnixPkg/Include/FlashLayout.h +++ /dev/null @@ -1,64 +0,0 @@ -/*++
-
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
-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.
-
-Module Name:
-
- FlashLayout.h
-
-Abstract:
-
- Platform specific flash layout
-
- BugBug: We need a better way
-
---*/
-
-#ifndef __EFI_FLASH_LAYOUT__
-#define __EFI_FLASH_LAYOUT__
-
-//
-// Firmware Volume Information for Nt32
-// adding one working block before FFS FV,
-// and another one for spare block behind FFS FV
-//
-//
-// Note: When block number is changed in .dsc file,
-// this value should be changed accordingly!!!
-//
-#define FIRMWARE_BLOCK_NUMBER 0x28
-
-#define EFI_WINNT_FIRMWARE_OFFSET 0x0
-#define EFI_WINNT_FIRMWARE_LENGTH (0x10000 * FIRMWARE_BLOCK_NUMBER)
-
-#define EFI_WINNT_RUNTIME_UPDATABLE_OFFSET (EFI_WINNT_FIRMWARE_OFFSET + EFI_WINNT_FIRMWARE_LENGTH)
-
-#define EFI_WINNT_RUNTIME_UPDATABLE_LENGTH 0x10000
-
-#define EFI_WINNT_FTW_SPARE_BLOCK_OFFSET (EFI_WINNT_RUNTIME_UPDATABLE_OFFSET + EFI_WINNT_RUNTIME_UPDATABLE_LENGTH)
-
-#define EFI_WINNT_FTW_SPARE_BLOCK_LENGTH 0x10000
-
-#define EFI_WINNT_RUNTIME_UPDATABLE_FV_HEADER_LENGTH 0x48
-
-#define EFI_VARIABLE_STORE_OFFSET EFI_WINNT_RUNTIME_UPDATABLE_OFFSET
-
-#define EFI_VARIABLE_STORE_LENGTH 0x00C000
-
-#define EFI_EVENT_LOG_OFFSET (EFI_VARIABLE_STORE_OFFSET + EFI_VARIABLE_STORE_LENGTH)
-
-#define EFI_EVENT_LOG_LENGTH 0x002000
-
-#define EFI_FTW_WORKING_OFFSET (EFI_EVENT_LOG_OFFSET + EFI_EVENT_LOG_LENGTH)
-
-#define EFI_FTW_WORKING_LENGTH 0x002000
-
-#endif
-
diff --git a/UnixPkg/Include/Guid/UnixSystemConfig.h b/UnixPkg/Include/Guid/UnixSystemConfig.h deleted file mode 100644 index dc56bebdb4..0000000000 --- a/UnixPkg/Include/Guid/UnixSystemConfig.h +++ /dev/null @@ -1,36 +0,0 @@ -/**@file
- Setup Variable data structure for Unix platform.
-
-Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
-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.
-
-
-**/
-
-#ifndef __UNIX_SYSTEM_CONFIGUE_H__
-#define __UNIX_SYSTEM_CONFIGUE_H__
-
-#define EFI_UXIX_SYSTEM_CONFIG_GUID \
- {0x375ea976, 0x3ccd, 0x4e74, {0xa8, 0x45, 0x26, 0xb9, 0xb3, 0x24, 0xb1, 0x3c}}
-
-
-#pragma pack(1)
-typedef struct {
- //
- // Console output mode
- //
- UINT32 ConOutColumn;
- UINT32 ConOutRow;
-} UNIX_SYSTEM_CONFIGURATION;
-#pragma pack()
-
-
-extern EFI_GUID gEfiUnixSystemConfigGuid;
-
-#endif
diff --git a/UnixPkg/Include/Library/SecDispatchTableLib.h b/UnixPkg/Include/Library/SecDispatchTableLib.h deleted file mode 100644 index 9e220073f4..0000000000 --- a/UnixPkg/Include/Library/SecDispatchTableLib.h +++ /dev/null @@ -1,57 +0,0 @@ -/** @file - Allows an override of the SEC SEC PPI Dispatch Table. This allows - customized PPIs to be passed into the PEI Core. - -Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> -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. - -**/ - - -#ifndef __SEC_DISPATCH_TABLE_LIB_H__ -#define __SEC_DISPATCH_TABLE_LIB_H__ - - -/** - Return the number of bytes that OverrideDispatchTable() will append to - the dispatch table. - - @return Size of table in bytes OverrideDispatchTable() will return - -**/ -UINTN -EFIAPI -OverrideDispatchTableExtraSize ( - VOID - ); - - -/** - Allow an override of the Sec PPI Dispatch Table. This table contains PPIs passed - up from SEC to PEI. - - @param OriginalTable SECs default PPI dispatch table - @param OriginalTableSize Size of SECs default PPI dispatch table - @param NewTable New dispatch table - @param NewTableSize Size of of the NewTable in bytes - - @return EFI_SUCCESS table was copied - -**/ -EFI_STATUS -EFIAPI -OverrideDispatchTable ( - IN CONST EFI_PEI_PPI_DESCRIPTOR *OriginalTable, - IN UINTN OriginalTableSize, - IN OUT EFI_PEI_PPI_DESCRIPTOR *NewTable, - IN UINTN NewTableSize - ); - - -#endif diff --git a/UnixPkg/Include/Library/UnixLib.h b/UnixPkg/Include/Library/UnixLib.h deleted file mode 100644 index 32ed2e5100..0000000000 --- a/UnixPkg/Include/Library/UnixLib.h +++ /dev/null @@ -1,27 +0,0 @@ -/*++ - -Copyright (c) 2006, Intel Corporation. All rights reserved.<BR> -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. - -Module Name: - - UnixLib.h - -Abstract: - - Public include file for the Unix Library - ---*/ - -#ifndef __UNIX_LIB_H__ -#define __UNIX_LIB_H__ - -extern EFI_UNIX_THUNK_PROTOCOL *gUnix; - -#endif diff --git a/UnixPkg/Include/Ppi/UnixAutoScan.h b/UnixPkg/Include/Ppi/UnixAutoScan.h deleted file mode 100644 index 577fd719e8..0000000000 --- a/UnixPkg/Include/Ppi/UnixAutoScan.h +++ /dev/null @@ -1,66 +0,0 @@ -/*++
-
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
-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.
-
-Module Name:
-
- UnixAutoscan.h
-
-Abstract:
-
-Unix Autoscan PPI
-
---*/
-
-#ifndef __UNIX_PEI_AUTOSCAN_H__
-#define __UNIX_PEI_AUTOSCAN_H__
-
-#include <UnixDxe.h>
-
-#define PEI_UNIX_AUTOSCAN_PPI_GUID \
- { \
- 0xf2ed3d14, 0x8985, 0x11db, {0xb0, 0x57, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-typedef
-EFI_STATUS
-(EFIAPI *PEI_UNIX_AUTOSCAN) (
- IN UINTN Index,
- OUT EFI_PHYSICAL_ADDRESS *MemoryBase,
- OUT UINT64 *MemorySize
- );
-
-/*++
-
-Routine Description:
- This service is called from Index == 0 until it returns EFI_UNSUPPORTED.
- It allows discontiguous memory regions to be supported by the emulator.
- It uses gSystemMemory[] and gSystemMemoryCount that were created by
- parsing the host environment variable EFI_MEMORY_SIZE.
- The size comes from the varaible and the address comes from the call to
- WinNtOpenFile.
-
-Arguments:
- Index - Which memory region to use
- MemoryBase - Return Base address of memory region
- MemorySize - Return size in bytes of the memory region
-
-Returns:
- EFI_SUCCESS - If memory region was mapped
- EFI_UNSUPPORTED - If Index is not supported
-
---*/
-typedef struct {
- PEI_UNIX_AUTOSCAN UnixAutoScan;
-} PEI_UNIX_AUTOSCAN_PPI;
-
-extern EFI_GUID gPeiUnixAutoScanPpiGuid;
-
-#endif
diff --git a/UnixPkg/Include/Ppi/UnixFwh.h b/UnixPkg/Include/Ppi/UnixFwh.h deleted file mode 100644 index 1befccf250..0000000000 --- a/UnixPkg/Include/Ppi/UnixFwh.h +++ /dev/null @@ -1,64 +0,0 @@ -/*++
-
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
-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.
-
-Module Name:
-
- UnixFwh.h
-
-Abstract:
-
- Unix FWH PPI as defined in Tiano
-
---*/
-
-#ifndef __UNIX_PEI_FWH_H__
-#define __UNIX_PEI_FWH_H__
-
-#include <UnixDxe.h>
-
-#define UNIX_FWH_PPI_GUID \
- { \
- 0xf2f0dc30, 0x8985, 0x11db, {0xa1, 0x5b, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-typedef
-EFI_STATUS
-(EFIAPI *UNIX_FWH_INFORMATION) (
- IN UINTN Index,
- IN OUT EFI_PHYSICAL_ADDRESS *FdBase,
- IN OUT UINT64 *FdSize,
- IN OUT EFI_PHYSICAL_ADDRESS *FixUp
- );
-
-/*++
-
-Routine Description:
- Return the FD Size and base address. Since the FD is loaded from a
- file into host memory only the SEC will know it's address.
-
-Arguments:
- Index - Which FD, starts at zero.
- FdSize - Size of the FD in bytes
- FdBase - Start address of the FD. Assume it points to an FV Header
- FixUp - Difference between actual FD address and build address
-
-Returns:
- EFI_SUCCESS - Return the Base address and size of the FV
- EFI_UNSUPPORTED - Index does nto map to an FD in the system
-
---*/
-typedef struct {
- UNIX_FWH_INFORMATION UnixFwh;
-} UNIX_FWH_PPI;
-
-extern EFI_GUID gUnixFwhPpiGuid;
-
-#endif
diff --git a/UnixPkg/Include/Ppi/UnixPeiLoadFile.h b/UnixPkg/Include/Ppi/UnixPeiLoadFile.h deleted file mode 100644 index f1de509dea..0000000000 --- a/UnixPkg/Include/Ppi/UnixPeiLoadFile.h +++ /dev/null @@ -1,65 +0,0 @@ -/*++
-
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
-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.
-
-Module Name:
-
- UnixPeiLoadFile.h
-
-Abstract:
-
- Unix Load File PPI.
-
- When the PEI core is done it calls the DXE IPL via PPI
-
---*/
-
-#ifndef __UNIX_PEI_LOAD_FILE_H__
-#define __UNIX_PEI_LOAD_FILE_H__
-
-#include <UnixDxe.h>
-
-#define UNIX_PEI_LOAD_FILE_GUID \
- { \
- 0xf2f48768, 0x8985, 0x11db, {0xb8, 0xda, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-typedef
-EFI_STATUS
-(EFIAPI *UNIX_PEI_LOAD_FILE) (
- VOID *Pe32Data,
- EFI_PHYSICAL_ADDRESS *ImageAddress,
- UINT64 *ImageSize,
- EFI_PHYSICAL_ADDRESS *EntryPoint
- );
-
-/*++
-
-Routine Description:
- Loads and relocates a PE/COFF image into memory.
-
-Arguments:
- Pe32Data - The base address of the PE/COFF file that is to be loaded and relocated
- ImageAddress - The base address of the relocated PE/COFF image
- ImageSize - The size of the relocated PE/COFF image
- EntryPoint - The entry point of the relocated PE/COFF image
-
-Returns:
- EFI_SUCCESS - The file was loaded and relocated
- EFI_OUT_OF_RESOURCES - There was not enough memory to load and relocate the PE/COFF file
-
---*/
-typedef struct {
- UNIX_PEI_LOAD_FILE PeiLoadFileService;
-} UNIX_PEI_LOAD_FILE_PPI;
-
-extern EFI_GUID gUnixPeiLoadFilePpiGuid;
-
-#endif
diff --git a/UnixPkg/Include/Ppi/UnixThunk.h b/UnixPkg/Include/Ppi/UnixThunk.h deleted file mode 100644 index 96076a3eab..0000000000 --- a/UnixPkg/Include/Ppi/UnixThunk.h +++ /dev/null @@ -1,56 +0,0 @@ -/*++
-
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
-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.
-
-Module Name:
-
- UnixThunk.h
-
-Abstract:
-
- Unix Thunk interface PPI
-
---*/
-
-#ifndef __UNIX_PEI_UNIX_THUNK_H__
-#define __UNIX_PEI_UNIX_THUNK_H__
-
-#include <UnixDxe.h>
-
-#define PEI_UNIX_THUNK_PPI_GUID \
- { \
- 0xf2f830f2, 0x8985, 0x11db, {0x80, 0x6b, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-typedef
-VOID *
-(EFIAPI *PEI_UNIX_THUNK_INTERFACE) (
- VOID
- );
-
-/*++
-
-Routine Description:
- Export of EFI_UNIX_THUNK_PROTOCOL from the Unix SEC.
-
-Arguments:
- InterfaceBase - Address of the EFI_UNIX_THUNK_PROTOCOL
-
-Returns:
- EFI_SUCCESS - Data returned
-
---*/
-typedef struct {
- PEI_UNIX_THUNK_INTERFACE UnixThunk;
-} PEI_UNIX_THUNK_PPI;
-
-extern EFI_GUID gPeiUnixThunkPpiGuid;
-
-#endif
diff --git a/UnixPkg/Include/Protocol/UnixIo.h b/UnixPkg/Include/Protocol/UnixIo.h deleted file mode 100644 index c9b91ef366..0000000000 --- a/UnixPkg/Include/Protocol/UnixIo.h +++ /dev/null @@ -1,154 +0,0 @@ -/*++
-
-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>
-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.
-
-Module Name:
-
- UnixIo.h
-
-Abstract:
-
---*/
-
-#ifndef _UNIX_IO_H_
-#define _UNIX_IO_H_
-
-#include <Protocol/UnixThunk.h>
-
-#define EFI_UNIX_IO_PROTOCOL_GUID \
- { \
- 0xf2e23f54, 0x8985, 0x11db, {0xac, 0x79, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-typedef struct {
- EFI_UNIX_THUNK_PROTOCOL *UnixThunk;
- EFI_GUID *TypeGuid;
- UINT16 *EnvString;
- UINT16 InstanceNumber;
-} EFI_UNIX_IO_PROTOCOL;
-
-extern EFI_GUID gEfiUnixIoProtocolGuid;
-
-//
-// The following GUIDs are used in EFI_UNIX_IO_PROTOCOL_GUID
-// Device paths. They map 1:1 with UNIX envirnment variables. The variables
-// define what virtual hardware the emulator/UnixBusDriver will produce.
-//
-//
-// EFI_UNIX_VIRTUAL_DISKS
-//
-#define EFI_UNIX_VIRTUAL_DISKS_GUID \
- { \
- 0xf2ba331a, 0x8985, 0x11db, {0xa4, 0x06, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-extern EFI_GUID gEfiUnixVirtualDisksGuid;
-
-//
-// EFI_UNIX_PHYSICAL_DISKS
-//
-#define EFI_UNIX_PHYSICAL_DISKS_GUID \
- { \
- 0xf2bdcc96, 0x8985, 0x11db, {0x87, 0x19, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-extern EFI_GUID gEfiUnixPhysicalDisksGuid;
-
-//
-// EFI_UNIX_FILE_SYSTEM
-//
-#define EFI_UNIX_FILE_SYSTEM_GUID \
- { \
- 0xf2c16b9e, 0x8985, 0x11db, {0x92, 0xc8, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-extern EFI_GUID gEfiUnixFileSystemGuid;
-
-//
-// EFI_WIN_NT_SERIAL_PORT
-//
-#define EFI_UNIX_SERIAL_PORT_GUID \
- { \
- 0x6d3a727d, 0x66c8, 0x4d19, {0x87, 0xe6, 0x2, 0x15, 0x86, 0x14, 0x90, 0xf3} \
- }
-
-extern EFI_GUID gEfiUnixSerialPortGuid;
-
-//
-// EFI_UNIX_UGA
-//
-#define EFI_UNIX_UGA_GUID \
- { \
- 0xf2c8b80e, 0x8985, 0x11db, {0x93, 0xf1, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-extern EFI_GUID gEfiUnixUgaGuid;
-
-//
-// EFI_UNIX_GOP
-//
-#define EFI_UNIX_GOP_GUID \
- { \
- 0xbace07c2, 0x8987, 0x11db, {0xa5, 0x9a, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-extern EFI_GUID gEfiUnixGopGuid;
-
-//
-// EFI_UNIX_CONSOLE
-//
-#define EFI_UNIX_CONSOLE_GUID \
- { \
- 0xf2cc5d06, 0x8985, 0x11db, {0xbb, 0x19, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-extern EFI_GUID gEfiUnixConsoleGuid;
-
-//
-// EFI_UNIX_MEMORY
-//
-#define EFI_UNIX_MEMORY_GUID \
- { \
- 0xf2d006cc, 0x8985, 0x11db, {0xa4, 0x72, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-extern EFI_GUID gEfiUnixMemoryGuid;
-
-//
-// EFI_UNIX_CPU_MODEL
-//
-#define EFI_UNIX_CPU_MODEL_GUID \
- { \
- 0xf2d3b330, 0x8985, 0x11db, {0x8a, 0xa3, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-extern EFI_GUID gEfiUnixCPUModelGuid;
-
-//
-// EFI_UNIX_CPU_SPEED
-//
-#define EFI_UNIX_CPU_SPEED_GUID \
- { \
- 0xf2d74e5a, 0x8985, 0x11db, {0x97, 0x05, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
- }
-
-extern EFI_GUID gEfiUnixCPUSpeedGuid;
-
-//
-// EFI_UNIX_NETWORK
-//
-#define EFI_UNIX_NETWORK_GUID \
- { \
- 0x081603B4, 0x0F1D, 0x4022, {0xB6, 0xFD, 0x4C, 0xE3, 0x5E, 0x09, 0xA1, 0xA6 } \
- }
-
-extern EFI_GUID gEfiUnixNetworkGuid;
-
-#endif
diff --git a/UnixPkg/Include/Protocol/UnixThunk.h b/UnixPkg/Include/Protocol/UnixThunk.h deleted file mode 100644 index 476dcc659f..0000000000 --- a/UnixPkg/Include/Protocol/UnixThunk.h +++ /dev/null @@ -1,346 +0,0 @@ -/*++ - -Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR> -Portions copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> -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. - -Module Name: - - UnixThunk.h - -Abstract: - - This protocol allows an EFI driver in the Unix emulation environment - to make Posix calls. - - NEVER make an Unix call directly, always make the call via this protocol. - - There are no This pointers on the protocol member functions as they map - exactly into Unix system calls. - ---*/ - -#ifndef _UNIX_THUNK_H_ -#define _UNIX_THUNK_H_ - -#include <Common/UnixInclude.h> - -#include <Base.h> -#include <Library/PeCoffLib.h> - - - -#define EFI_UNIX_THUNK_PROTOCOL_GUID \ - { \ - 0xf2e98868, 0x8985, 0x11db, {0x9a, 0x59, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \ - } - -typedef -VOID -(EFIAPI *UnixSleep) ( - unsigned long Milliseconds - ); - -typedef -VOID -(EFIAPI *UnixExit) ( - int status // exit code for all threads - ); - -typedef -VOID -(EFIAPI *UnixSetTimer) ( - UINT64 PeriodMs, - VOID (EFIAPI *CallBack)(UINT64 DeltaMs) - ); - -typedef -VOID -(EFIAPI *UnixGetLocalTime) ( - EFI_TIME *Time - ); - -typedef -struct tm * -(EFIAPI *UnixGmTime)( - const time_t *timep - ); - -typedef -long -(EFIAPI *UnixGetTimeZone)( - void - ); - -typedef -int -(EFIAPI *UnixGetDayLight)( - void - ); - -typedef -int -(EFIAPI *UnixPoll)( - struct pollfd *pfd, - unsigned int nfds, - int timeout - ); - -typedef -long -(EFIAPI *UnixRead) ( - int fd, - void *buf, - int count - ); - -typedef -long -(EFIAPI *UnixWrite) ( - int fd, - const void *buf, - int count - ); - -typedef -char * -(EFIAPI *UnixGetenv) (const char *var); - -typedef -int -(EFIAPI *UnixOpen) (const char *name, int flags, int mode); - -typedef -off_t -(EFIAPI *UnixSeek) (int fd, off_t off, int whence); - -typedef -int -(EFIAPI *UnixFtruncate) (int fd, long int len); - -typedef -int -(EFIAPI *UnixClose) (int fd); - -typedef -int -(EFIAPI *UnixMkdir)(const char *pathname, mode_t mode); - -typedef -int -(EFIAPI *UnixRmDir)(const char *pathname); - -typedef -int -(EFIAPI *UnixUnLink)(const char *pathname); - -typedef -int -(EFIAPI *UnixGetErrno)(VOID); - -typedef -DIR * -(EFIAPI *UnixOpenDir)(const char *pathname); - -typedef -void -(EFIAPI *UnixRewindDir)(DIR *dir); - -typedef -struct dirent * -(EFIAPI *UnixReadDir)(DIR *dir); - -typedef -int -(EFIAPI *UnixCloseDir)(DIR *dir); - -typedef -int -(EFIAPI *UnixStat)(const char *path, STAT_FIX *buf); - -typedef -int -(EFIAPI *UnixStatFs)(const char *path, struct statfs *buf); - -typedef -int -(EFIAPI *UnixRename)(const char *oldpath, const char *newpath); - -typedef -time_t -(EFIAPI *UnixMkTime)(struct tm *tm); - -typedef -int -(EFIAPI *UnixFSync)(int fd); - -typedef -int -(EFIAPI *UnixChmod)(const char *path, mode_t mode); - -typedef -int -(EFIAPI *UnixUTime)(const char *filename, const struct utimbuf *buf); - -struct _EFI_UNIX_UGA_IO_PROTOCOL; -typedef -EFI_STATUS -(EFIAPI *UnixUgaCreate)(struct _EFI_UNIX_UGA_IO_PROTOCOL **UgaIo, - CONST CHAR16 *Title); - -typedef -int -(EFIAPI *UnixTcflush) (int fildes, int queue_selector); - -typedef -void -(EFIAPI *UnixPerror) (__const char *__s); - -typedef -int -#if __CYGWIN__ -(EFIAPI *UnixIoCtl) (int fd, int __request, UINTN Arg); -#else -(EFIAPI *UnixIoCtl) (int fd, unsigned long int __request, void *Arg); -#endif - -typedef -int -(EFIAPI *UnixFcntl) (int __fd, int __cmd, void *Arg); - -typedef -int -(EFIAPI *UnixCfsetispeed) (struct termios *__termios_p, speed_t __speed); - -typedef -int -(EFIAPI *UnixCfsetospeed) (struct termios *__termios_p, speed_t __speed); - -typedef -int -(EFIAPI *UnixTcgetattr) (int __fd, struct termios *__termios_p); - -typedef -int -(EFIAPI *UnixTcsetattr) (int __fd, int __optional_actions, - __const struct termios *__termios_p); - - -// -// Worker functions to enable source level debug in the emulator -// - -typedef -RETURN_STATUS -(EFIAPI *UnixPeCoffGetEntryPoint) ( - IN VOID *Pe32Data, - IN OUT VOID **EntryPoint - ); - -typedef -VOID -(EFIAPI *UnixPeCoffRelocateImageExtraAction) ( - IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext - ); - -typedef -VOID -(EFIAPI *UnixPeCoffLoaderUnloadImageExtraAction) ( - IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext - ); - -typedef -int -(EFIAPI *UnixGetIfAddrs) ( - struct ifaddrs **ifap - ); - -typedef -void -(EFIAPI *UnixFreeIfAddrs) ( - struct ifaddrs *ifap - ); - -typedef -int -(EFIAPI *UnixSocket) ( - int domain, - int type, - int protocol - ); - -typedef -void -(EFIAPI *UnixDisableInterruptEmulation) (void); - -typedef -void -(EFIAPI *UnixEnableInterruptEmulation) (void); - - - - -#define EFI_UNIX_THUNK_PROTOCOL_SIGNATURE SIGNATURE_32 ('L', 'N', 'X', 'T') - -typedef struct _EFI_UNIX_THUNK_PROTOCOL { - UINT64 Signature; - - UnixSleep Sleep; - UnixExit Exit; - UnixSetTimer SetTimer; - UnixGetLocalTime GetLocalTime; - UnixGmTime GmTime; - UnixGetTimeZone GetTimeZone; - UnixGetDayLight GetDayLight; - UnixPoll Poll; - UnixRead Read; - UnixWrite Write; - UnixGetenv Getenv; - UnixOpen Open; - UnixSeek Lseek; - UnixFtruncate FTruncate; - UnixClose Close; - UnixMkdir MkDir; - UnixRmDir RmDir; - UnixUnLink UnLink; - UnixGetErrno GetErrno; - UnixOpenDir OpenDir; - UnixRewindDir RewindDir; - UnixReadDir ReadDir; - UnixCloseDir CloseDir; - UnixStat Stat; - UnixStatFs StatFs; - UnixRename Rename; - UnixMkTime MkTime; - UnixFSync FSync; - UnixChmod Chmod; - UnixUTime UTime; - UnixTcflush Tcflush; - UnixUgaCreate UgaCreate; - UnixPerror Perror; - UnixIoCtl IoCtl; - UnixFcntl Fcntl; - UnixCfsetispeed Cfsetispeed; - UnixCfsetospeed Cfsetospeed; - UnixTcgetattr Tcgetattr; - UnixTcsetattr Tcsetattr; - UnixPeCoffGetEntryPoint PeCoffGetEntryPoint; - UnixPeCoffRelocateImageExtraAction PeCoffRelocateImageExtraAction; - UnixPeCoffLoaderUnloadImageExtraAction PeCoffUnloadImageExtraAction; - UnixEnableInterruptEmulation EnableInterrupt; - UnixDisableInterruptEmulation DisableInterrupt; - - UnixGetIfAddrs GetIfAddrs; - UnixFreeIfAddrs FreeIfAddrs; - UnixSocket Socket; -} EFI_UNIX_THUNK_PROTOCOL; - -extern EFI_GUID gEfiUnixThunkProtocolGuid; - -#endif diff --git a/UnixPkg/Include/Protocol/UnixUgaIo.h b/UnixPkg/Include/Protocol/UnixUgaIo.h deleted file mode 100644 index 1327e6a096..0000000000 --- a/UnixPkg/Include/Protocol/UnixUgaIo.h +++ /dev/null @@ -1,139 +0,0 @@ -/*++ - -Copyright (c) 2006, Tristan Gingold. All rights reserved.<BR> -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. - -Module Name: - - UnixUgaIo.h - -Abstract: - ---*/ - -#ifndef _UNIX_UGA_IO_H_ -#define _UNIX_UGA_IO_H_ - -#include <Protocol/SimplePointer.h> -#include <Protocol/SimpleTextIn.h> -#include <Protocol/SimpleTextInEx.h> -#include <Protocol/UgaDraw.h> - -#define EFI_UNIX_UGA_IO_PROTOCOL_GUID {0xf2e5e2c6, 0x8985, 0x11db, {0xa1, 0x91, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } } - -typedef struct _EFI_UNIX_UGA_IO_PROTOCOL EFI_UNIX_UGA_IO_PROTOCOL; - -typedef -EFI_STATUS -(EFIAPI *UGAClose)( - EFI_UNIX_UGA_IO_PROTOCOL *Uga - ); - -typedef -EFI_STATUS -(EFIAPI *UGASize)( - EFI_UNIX_UGA_IO_PROTOCOL *Uga, - UINT32 Width, - UINT32 Height - ); - -typedef -EFI_STATUS -(EFIAPI *UGACheckKey)( - EFI_UNIX_UGA_IO_PROTOCOL *Uga - ); - -typedef -EFI_STATUS -(EFIAPI *UGAGetKey)( - EFI_UNIX_UGA_IO_PROTOCOL *Uga, - EFI_KEY_DATA *key - ); - -typedef -EFI_STATUS -(EFIAPI *UGAKeySetState) ( - IN EFI_UNIX_UGA_IO_PROTOCOL *UgaIo, - IN EFI_KEY_TOGGLE_STATE *KeyToggleState - ); - - -typedef -VOID -(EFIAPI *UGA_REGISTER_KEY_NOTIFY_CALLBACK) ( - IN VOID *Context, - IN EFI_KEY_DATA *KeyData - ); - -typedef -EFI_STATUS -(EFIAPI *UGARegisterKeyNotify) ( - IN EFI_UNIX_UGA_IO_PROTOCOL *UgaIo, - IN UGA_REGISTER_KEY_NOTIFY_CALLBACK CallBack, - IN VOID *Context - ); - - -typedef struct { - UINTN SourceX; - UINTN SourceY; - UINTN DestinationX; - UINTN DestinationY; - UINTN Width; - UINTN Height; - UINTN Delta; -} UGA_BLT_ARGS; - -typedef -EFI_STATUS -(EFIAPI *UGABlt)( - IN EFI_UNIX_UGA_IO_PROTOCOL *Uga, - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, - IN EFI_UGA_BLT_OPERATION BltOperation, - IN UGA_BLT_ARGS *Args - ); - -typedef -BOOLEAN -(EFIAPI *UGAIsKeyPressed) ( - IN EFI_UNIX_UGA_IO_PROTOCOL *UgaIo, - IN EFI_KEY_DATA *KeyData - ); - -typedef -EFI_STATUS -(EFIAPI *UGACheckPointer)( - EFI_UNIX_UGA_IO_PROTOCOL *Uga - ); - -typedef -EFI_STATUS -(EFIAPI *UGAGetPointerState)( - EFI_UNIX_UGA_IO_PROTOCOL *Uga, - EFI_SIMPLE_POINTER_STATE *state - ); - -struct _EFI_UNIX_UGA_IO_PROTOCOL { - VOID *Private; - UGAClose UgaClose; - UGASize UgaSize; - UGACheckKey UgaCheckKey; - UGAKeySetState UgaKeySetState; - UGAGetKey UgaGetKey; - UGARegisterKeyNotify UgaRegisterKeyNotify; - UGABlt UgaBlt; - UGAIsKeyPressed UgaIsKeyPressed; - UGACheckPointer UgaCheckPointer; - UGAGetPointerState UgaGetPointerState; -}; - - -extern EFI_GUID gEfiUnixUgaIoProtocolGuid; - -#endif diff --git a/UnixPkg/Include/UnixDxe.h b/UnixPkg/Include/UnixDxe.h deleted file mode 100644 index 29cde565a1..0000000000 --- a/UnixPkg/Include/UnixDxe.h +++ /dev/null @@ -1,36 +0,0 @@ -/*++
-
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
-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.
-
-Module Name:
- UnixDxe.h
-
-Abstract:
- Public include file for the Unix Library
-
---*/
-
-#ifndef __UNIX_DXE_H__
-#define __UNIX_DXE_H__
-
-#include <Ppi/UnixPeiLoadFile.h>
-#include <Ppi/UnixAutoScan.h>
-#include <Ppi/UnixThunk.h>
-#include <Ppi/UnixFwh.h>
-
-//
-// UnixIo.h depends on UnixThunk.h
-//
-
-#include <Common/UnixInclude.h>
-#include <Protocol/UnixThunk.h>
-#include <Protocol/UnixIo.h>
-
-#endif
diff --git a/UnixPkg/Include/UnixPeim.h b/UnixPkg/Include/UnixPeim.h deleted file mode 100644 index af91d3f86f..0000000000 --- a/UnixPkg/Include/UnixPeim.h +++ /dev/null @@ -1,30 +0,0 @@ -/*++
-
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
-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.
-
-Module Name:
- UnixPeim.h
-
-Abstract:
- Public include file for the Unix Library
-
---*/
-
-#ifndef __UNIX_PEIM_H__
-#define __UNIX_PEIM_H__
-
-#include <Ppi/UnixPeiLoadFile.h>
-#include <Ppi/UnixAutoScan.h>
-#include <Ppi/UnixThunk.h>
-#include <Ppi/UnixFwh.h>
-
-#include <Protocol/UnixThunk.h>
-
-#endif
|