Module Name:    src
Committed By:   scole
Date:           Thu Aug  4 18:08:12 UTC 2016

Modified Files:
        src/sys/external/bsd/gnu-efi/dist/inc: efiapi.h
Added Files:
        src/sys/external/bsd/gnu-efi/dist/inc: efifpswa.h

Log Message:
PR port-ia64/50719

Remove duplicate EFI files for ia64


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/gnu-efi/dist/inc/efifpswa.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h:1.1.1.1	Tue Apr  1 16:16:07 2014
+++ src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h	Thu Aug  4 18:08:12 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: efiapi.h,v 1.1.1.1 2014/04/01 16:16:07 jakllsch Exp $	*/
+/*	$NetBSD: efiapi.h,v 1.2 2016/08/04 18:08:12 scole Exp $	*/
 
 #ifndef _EFI_API_H
 #define _EFI_API_H
@@ -848,6 +848,9 @@ typedef struct _EFI_BOOT_SERVICES {
 #define SAL_SYSTEM_TABLE_GUID    \
     { 0xeb9d2d32, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} }
 
+/* DIG64 Headless Console & Debug Port Table. */
+#define	HCDP_TABLE_GUID    \
+    { 0xf951938d, 0x620b, 0x42ef, {0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98} }
 
 typedef struct _EFI_CONFIGURATION_TABLE {
     EFI_GUID                VendorGuid;

Added files:

Index: src/sys/external/bsd/gnu-efi/dist/inc/efifpswa.h
diff -u /dev/null src/sys/external/bsd/gnu-efi/dist/inc/efifpswa.h:1.1
--- /dev/null	Thu Aug  4 18:08:12 2016
+++ src/sys/external/bsd/gnu-efi/dist/inc/efifpswa.h	Thu Aug  4 18:08:12 2016
@@ -0,0 +1,41 @@
+/*	$NetBSD: efifpswa.h,v 1.1 2016/08/04 18:08:12 scole Exp $	*/
+/* $FreeBSD: releng/10.1/sys/boot/efi/include/efifpswa.h 96893 2002-05-19 03:17:22Z marcel $ */
+#ifndef _EFI_FPSWA_H
+#define _EFI_FPSWA_H
+
+/*
+ * EFI FP SWA Driver (Floating Point Software Assist)
+ */
+
+#define EFI_INTEL_FPSWA \
+    { 0xc41b6531, 0x97b9, 0x11d3, 0x9a, 0x29, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d }
+
+INTERFACE_DECL(_FPSWA_INTERFACE);
+
+typedef struct _FPSWA_RET {
+    UINT64                          status;
+    UINT64                          err1;
+    UINT64                          err2;
+    UINT64                          err3;
+} FPSWA_RET;
+
+typedef
+FPSWA_RET
+(EFIAPI *EFI_FPSWA) (
+    IN UINTN                        TrapType,
+    IN OUT VOID                     *Bundle,
+    IN OUT UINT64                   *pipsr,
+    IN OUT UINT64                   *pfsr,
+    IN OUT UINT64                   *pisr,
+    IN OUT UINT64                   *ppreds,
+    IN OUT UINT64                   *pifs,
+    IN OUT VOID                     *fp_state
+    );
+
+typedef struct _FPSWA_INTERFACE {
+    UINT32                          Revision;
+    UINT32                          Reserved;
+    EFI_FPSWA                       Fpswa;
+} FPSWA_INTERFACE;
+
+#endif

Reply via email to