// Screen handling
//
-VOID egInitScreen(VOID)
-{
+static VOID egDetermineScreenSize(VOID) {
EFI_STATUS Status = EFI_SUCCESS;
UINT32 UGAWidth, UGAHeight, UGADepth, UGARefreshRate;
- // get protocols
- Status = LibLocateProtocol(&ConsoleControlProtocolGuid, (VOID **) &ConsoleControl);
- if (EFI_ERROR(Status))
- ConsoleControl = NULL;
-
- Status = LibLocateProtocol(&UgaDrawProtocolGuid, (VOID **) &UgaDraw);
- if (EFI_ERROR(Status))
- UgaDraw = NULL;
-
- Status = LibLocateProtocol(&GraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput);
- if (EFI_ERROR(Status))
- GraphicsOutput = NULL;
-
// get screen size
egHasGraphics = FALSE;
if (GraphicsOutput != NULL) {
}
}
+VOID egInitScreen(VOID)
+{
+ EFI_STATUS Status = EFI_SUCCESS;
+
+ // get protocols
+ Status = LibLocateProtocol(&ConsoleControlProtocolGuid, (VOID **) &ConsoleControl);
+ if (EFI_ERROR(Status))
+ ConsoleControl = NULL;
+
+ Status = LibLocateProtocol(&UgaDrawProtocolGuid, (VOID **) &UgaDraw);
+ if (EFI_ERROR(Status))
+ UgaDraw = NULL;
+
+ Status = LibLocateProtocol(&GraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput);
+ if (EFI_ERROR(Status))
+ GraphicsOutput = NULL;
+
+ egDetermineScreenSize();
+}
+
+// Convert a graphics mode (in *ModeWidth) to a width and height (returned in
+// *ModeWidth and *Height, respectively).
+// Returns TRUE if successful, FALSE if not (invalid mode)
+BOOLEAN egGetResFromMode(UINTN *ModeWidth, UINTN *Height) {
+ UINTN Size;
+ EFI_STATUS Status;
+ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info = NULL;
+
+ Status = refit_call4_wrapper(GraphicsOutput->QueryMode, GraphicsOutput, *ModeWidth, &Size, &Info);
+ if ((Status == EFI_SUCCESS) && (Info != NULL)) {
+ *ModeWidth = Info->HorizontalResolution;
+ *Height = Info->VerticalResolution;
+ return TRUE;
+ }
+ return FALSE;
+} // BOOLEAN egGetResFromMode()
+
// Sets the screen resolution to the specified value, if possible. If *ScreenHeight
// is 0 and GOP mode is detected, assume that *ScreenWidth contains a GOP mode
// number rather than a horizontal resolution. If the specified resolution is not
if (GraphicsOutput != NULL) { // GOP mode (UEFI)
if (*ScreenHeight == 0) { // User specified a mode number (stored in *ScreenWidth); use it directly
- if (*ScreenWidth == GraphicsOutput->Mode->Mode) { // user requested current mode; do nothing
+ ModeNum = (UINT32) *ScreenWidth;
+ if (egGetResFromMode(ScreenWidth, ScreenHeight) && (
+ refit_call2_wrapper(GraphicsOutput->SetMode, GraphicsOutput, ModeNum) == EFI_SUCCESS)) {
ModeSet = TRUE;
- *ScreenWidth = Info->HorizontalResolution;
- *ScreenHeight = Info->VerticalResolution;
- } else {
- ModeNum = (UINT32) *ScreenWidth;
+ }
+// if ((*ScreenWidth == GraphicsOutput->Mode->Mode)) { // user requested current mode; do nothing
+// ModeSet = TRUE;
+// *ScreenWidth = Info->HorizontalResolution;
+// *ScreenHeight = Info->VerticalResolution;
+// } else {
+/* ModeNum = (UINT32) *ScreenWidth;
Status = refit_call4_wrapper(GraphicsOutput->QueryMode, GraphicsOutput, ModeNum, &Size, &Info);
if (Status == EFI_SUCCESS) {
Status = refit_call2_wrapper(GraphicsOutput->SetMode, GraphicsOutput, ModeNum);
*ScreenWidth = Info->HorizontalResolution;
*ScreenHeight = Info->VerticalResolution;
} // if set mode OK
- } // if queried mode OK
- } // if/else
+ } // if queried mode OK */
+// } // if/else
// User specified width & height; must find mode -- but only if change is required....
} else {
Status = refit_call4_wrapper(GraphicsOutput->QueryMode, GraphicsOutput, GraphicsOutput->Mode->Mode, &Size, &Info);
- if ((Status == EFI_SUCCESS) && (Info->HorizontalResolution == *ScreenWidth) &&
- (Info->VerticalResolution == *ScreenHeight)) {
- ModeSet = TRUE; // user requested current mode; do nothing
- } else {
+// if ((Status == EFI_SUCCESS) && (Info->HorizontalResolution == *ScreenWidth) &&
+// (Info->VerticalResolution == *ScreenHeight) && !AlwaysSet) {
+// ModeSet = TRUE; // user requested current mode; do nothing
+// } else {
// Do a loop through the modes to see if the specified one is available;
// and if so, switch to it....
do {
ModeSet = (Status == EFI_SUCCESS);
} // if
} while ((++ModeNum < GraphicsOutput->Mode->MaxMode) && !ModeSet);
- } // if/else
+// } // if/else
} // if/else
if (ModeSet) {
VOID egGetScreenSize(OUT UINTN *ScreenWidth, OUT UINTN *ScreenHeight)
{
+ egDetermineScreenSize();
+
if (ScreenWidth != NULL)
*ScreenWidth = egScreenWidth;
if (ScreenHeight != NULL)
*ScreenHeight = egScreenHeight;
}
-// Set a text mode
-// Returns the mode that was actually set.
-UINT32 egSetTextMode(UINT32 RequestedMode) {
+// Set a text mode.
+// Returns TRUE if the mode actually changed, FALSE otherwise.
+// Note that a FALSE return value can mean either an error or no change
+// necessary.
+BOOLEAN egSetTextMode(UINT32 RequestedMode) {
UINTN i = 0, Width, Height;
- UINT32 UsedMode = ST->ConOut->Mode->Mode;
EFI_STATUS Status;
+ BOOLEAN ChangedIt = FALSE;
if (RequestedMode != ST->ConOut->Mode->Mode) {
- SwitchToGraphics();
+// SwitchToGraphics();
Status = refit_call2_wrapper(ST->ConOut->SetMode, ST->ConOut, RequestedMode);
if (Status == EFI_SUCCESS) {
- UsedMode = RequestedMode;
+ ChangedIt = TRUE;
} else {
SwitchToText(FALSE);
Print(L"Error setting text mode %d; available modes are:\n", RequestedMode);
SwitchToGraphics();
} // if/else successful change
} // if need to change mode
- return UsedMode;
-} // UINT32 egSetTextMode()
+ return ChangedIt;
+} // BOOLEAN egSetTextMode()
CHAR16 * egScreenDescription(VOID)
{