diff options
author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-01-21 09:40:59 +0000 |
---|---|---|
committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-01-21 09:40:59 +0000 |
commit | 7347d5d6e62ddd214f6bee9dbf8074a11015ece5 (patch) | |
tree | cd5542a8069d5b04d1c276e7b5ad32c4d28bd588 /MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c | |
parent | 0ca3bcbc900b3221b9efcdbf168c27d85f98c49e (diff) | |
download | edk2-7347d5d6e62ddd214f6bee9dbf8074a11015ece5.zip edk2-7347d5d6e62ddd214f6bee9dbf8074a11015ece5.tar.gz edk2-7347d5d6e62ddd214f6bee9dbf8074a11015ece5.tar.bz2 |
1. Sync the tracker for supporting the ModeNumber larger than 2.
2. Fixed one bug in SetMode(), Cursor should not be enabled with mandatory.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4594 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c')
-rw-r--r-- | MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c index 74def9e..2be62ff 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c @@ -230,7 +230,7 @@ TerminalConOutOutputString ( //
Mode = This->Mode;
- if (Mode->Mode > 1) {
+ if (Mode->Mode > 2) {
return EFI_UNSUPPORTED;
}
@@ -431,11 +431,11 @@ TerminalConOutQueryMode ( /*++
Routine Description:
- Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.QueryMode().
+ Implements EFI_SIMPLE_TEXT_OUT_PROTOCOL.QueryMode().
It returns information for an available text mode
that the terminal supports.
- In this driver, we only support text mode 80x25, which is
- defined as mode 0.
+ In this driver, we support text mode 80x25 (mode 0),
+ 80x50 (mode 1), 100x31 (mode 2).
Arguments:
@@ -464,7 +464,7 @@ TerminalConOutQueryMode ( --*/
{
- if (This->Mode->MaxMode > 2) {
+ if (This->Mode->MaxMode > 3) {
return EFI_DEVICE_ERROR;
}
@@ -476,6 +476,10 @@ TerminalConOutQueryMode ( *Columns = MODE1_COLUMN_COUNT;
*Rows = MODE1_ROW_COUNT;
return EFI_SUCCESS;
+ } else if (ModeNumber == 2) {
+ *Columns = MODE2_COLUMN_COUNT;
+ *Rows = MODE2_ROW_COUNT;
+ return EFI_SUCCESS;
}
return EFI_UNSUPPORTED;
@@ -523,7 +527,7 @@ TerminalConOutSetMode ( //
TerminalDevice = TERMINAL_CON_OUT_DEV_FROM_THIS (This);
- if (ModeNumber > 1) {
+ if (ModeNumber > 2) {
return EFI_UNSUPPORTED;
}
|