svn commit: r294270 - stable/10/sys/boot/efi/loader

[Ed Maste]

Author: emaste
Date: Mon Jan 18 15:37:41 2016
New Revision: 294270
URL: https://svnweb.freebsd.org/changeset/base/294270

Log:
  MFC r293165: loader.efi: support non-contiguous console modes

Modified:
  stable/10/sys/boot/efi/loader/main.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/efi/loader/main.c
==============================================================================
--- stable/10/sys/boot/efi/loader/main.c	Mon Jan 18 15:34:10 2016	(r294269)
+++ stable/10/sys/boot/efi/loader/main.c	Mon Jan 18 15:37:41 2016	(r294270)
@@ -333,10 +333,11 @@ command_mode(int argc, char *argv[])
 		return (CMD_OK);
 	}
 
-	for (i = 0; ; i++) {
+	printf("Current mode: %d\n", conout->Mode->Mode);
+	for (i = 0; i <= conout->Mode->MaxMode; i++) {
 		status = conout->QueryMode(conout, i, &cols, &rows);
 		if (EFI_ERROR(status))
-			break;
+			continue;
 		printf("Mode %d: %u columns, %u rows\n", i, (unsigned)cols,
 		    (unsigned)rows);
 	}