svn commit: r297555 - in stable/10/sys/boot/efi/loader: . arch/amd64

[Marius Strobl]

Author: marius
Date: Mon Apr  4 12:21:04 2016
New Revision: 297555
URL: https://svnweb.freebsd.org/changeset/base/297555

Log:
  MFC: r292563
  
  loader.efi: strip trailing whitespace
  
  MFC: r293244 (remainder missing in r294275)
  
  Introduce and use new EFI_ERROR_CODE macro for EFI errors

Modified:
  stable/10/sys/boot/efi/loader/Makefile
  stable/10/sys/boot/efi/loader/arch/amd64/framebuffer.c
  stable/10/sys/boot/efi/loader/devicename.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/efi/loader/Makefile
==============================================================================
--- stable/10/sys/boot/efi/loader/Makefile	Mon Apr  4 12:15:06 2016	(r297554)
+++ stable/10/sys/boot/efi/loader/Makefile	Mon Apr  4 12:21:04 2016	(r297555)
@@ -65,7 +65,7 @@ HAVE_BCACHE=    yes
 CFLAGS+=	-DEFI_STAGING_SIZE=${EFI_STAGING_SIZE}
 .endif
 
-# Always add MI sources 
+# Always add MI sources
 .PATH:		${.CURDIR}/../../common
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common

Modified: stable/10/sys/boot/efi/loader/arch/amd64/framebuffer.c
==============================================================================
--- stable/10/sys/boot/efi/loader/arch/amd64/framebuffer.c	Mon Apr  4 12:15:06 2016	(r297554)
+++ stable/10/sys/boot/efi/loader/arch/amd64/framebuffer.c	Mon Apr  4 12:21:04 2016	(r297555)
@@ -180,7 +180,7 @@ efifb_uga_find_pixel(EFI_UGA_DRAW_PROTOC
 	printf("No change detected in frame buffer");
 
  fail:
-	printf(" -- error %lu\n", status & ~EFI_ERROR_MASK);
+	printf(" -- error %lu\n", EFI_ERROR_CODE(status));
 	free(data1);
 	return (-1);
 }
@@ -305,7 +305,7 @@ efifb_from_uga(struct efi_fb *efifb, EFI
 	 * offset within the frame buffer of the visible region, nor
 	 * the stride. Our only option is to look at the system and
 	 * fill in the blanks based on that. Luckily, UGA was mostly
-	 * only used on Apple hardware. 
+	 * only used on Apple hardware.
 	 */
 	offset = -1;
 	ev = getenv("smbios.system.maker");
@@ -475,7 +475,7 @@ command_gop(int argc, char *argv[])
 	status = BS->LocateProtocol(&gop_guid, NULL, (VOID **)&gop);
 	if (EFI_ERROR(status)) {
 		sprintf(command_errbuf, "%s: Graphics Output Protocol not "
-		    "present (error=%lu)", argv[0], status & ~EFI_ERROR_MASK);
+		    "present (error=%lu)", argv[0], EFI_ERROR_CODE(status));
 		return (CMD_ERROR);
 	}
 
@@ -496,7 +496,7 @@ command_gop(int argc, char *argv[])
 		if (EFI_ERROR(status)) {
 			sprintf(command_errbuf, "%s: Unable to set mode to "
 			    "%u (error=%lu)", argv[0], mode,
-			    status & ~EFI_ERROR_MASK);
+			    EFI_ERROR_CODE(status));
 			return (CMD_ERROR);
 		}
 	} else if (!strcmp(argv[1], "get")) {
@@ -543,7 +543,7 @@ command_uga(int argc, char *argv[])
 	status = BS->LocateProtocol(&uga_guid, NULL, (VOID **)&uga);
 	if (EFI_ERROR(status)) {
 		sprintf(command_errbuf, "%s: UGA Protocol not present "
-		    "(error=%lu)", argv[0], status & ~EFI_ERROR_MASK);
+		    "(error=%lu)", argv[0], EFI_ERROR_CODE(status));
 		return (CMD_ERROR);
 	}
 

Modified: stable/10/sys/boot/efi/loader/devicename.c
==============================================================================
--- stable/10/sys/boot/efi/loader/devicename.c	Mon Apr  4 12:15:06 2016	(r297554)
+++ stable/10/sys/boot/efi/loader/devicename.c	Mon Apr  4 12:21:04 2016	(r297555)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 
 static int efi_parsedev(struct devdesc **, const char *, const char **);
 
-/* 
+/*
  * Point (dev) at an allocated device specifier for the device matching the
  * path in (devspec). If it contains an explicit device specification,
  * use that.  If not, use the default device.