[PATCH] EmulatorPkg: Add the second console to Emulator

[PATCH] EmulatorPkg: Add the second console to Emulator

[Zhiguang Liu]

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1687

Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>

It will show on both screens,if set
gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window 1!GOP Window 2"
in EmulatorPkg.dsc

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
---
 EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c b/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c
index 633a97d14a..5288ee49f3 100644
--- a/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c
+++ b/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c
@@ -42,6 +42,38 @@ EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath = {
   gEndEntire
 };
 
+EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath2 = {
+  {
+    {
+      {
+        HARDWARE_DEVICE_PATH,
+        HW_VENDOR_DP,
+        {
+          (UINT8) (sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),
+          (UINT8) ((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)
+        }
+      },
+      EMU_THUNK_PROTOCOL_GUID
+    },
+    0
+  },
+  {
+    {
+      {
+        HARDWARE_DEVICE_PATH,
+        HW_VENDOR_DP,
+        {
+          (UINT8) (sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),
+          (UINT8) ((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)
+        },
+      },
+      EMU_GRAPHICS_WINDOW_PROTOCOL_GUID,
+    },
+    1
+  },
+  gEndEntire
+};
+
 //
 // Predefined platform default console device path
 //
@@ -51,6 +83,10 @@ BDS_CONSOLE_CONNECT_ENTRY   gPlatformConsole[] = {
     (CONSOLE_OUT | CONSOLE_IN)
   },
   {
+(EFI_DEVICE_PATH_PROTOCOL *) &gGopDevicePath2,
+    (CONSOLE_OUT | CONSOLE_IN)
+  },
+    {
     NULL,
     0
   }
-- 
2.21.0.windows.1

Re: [edk2-devel] [PATCH] EmulatorPkg: Add the second console to Emulator

[Jordan Justen]

What do you think about this change to the commit message?

EmulatorPkg: Support a second GOP window

Two GOP screens will be created if PcdEmuGop is set in
EmulatorPkg.dsc:

gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window 1!GOP Window 2"

On 2019-04-28 20:04:25, Zhiguang Liu wrote:
> @@ -51,6 +83,10 @@ BDS_CONSOLE_CONNECT_ENTRY   gPlatformConsole[] = {
>      (CONSOLE_OUT | CONSOLE_IN)
>    },
>    {
> +(EFI_DEVICE_PATH_PROTOCOL *) &gGopDevicePath2,
> +    (CONSOLE_OUT | CONSOLE_IN)
> +  },
> +    {

The indentation looks wrong on these lines.

With these fixes:
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

>      NULL,
>      0
>    }

Re: [edk2-devel] [PATCH] EmulatorPkg: Add the second console to Emulator

[Zhiguang Liu]

Sorry, I didn't notice that.
I will fix that and send a new version.

Best Regards,
Zhiguang Liu


>-----Original Message-----
>From: Justen, Jordan L
>Sent: Monday, April 29, 2019 12:54 PM
>To: Liu, Zhiguang <zhiguang.liu@intel.com>; devel@edk2.groups.io
>Cc: Andrew Fish <afish@apple.com>; Ni, Ray <ray.ni@intel.com>
>Subject: Re: [edk2-devel] [PATCH] EmulatorPkg: Add the second console to
>Emulator
>
>What do you think about this change to the commit message?
>
>EmulatorPkg: Support a second GOP window
>
>Two GOP screens will be created if PcdEmuGop is set in
>EmulatorPkg.dsc:
>
>gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window 1!GOP Window
>2"
>
>On 2019-04-28 20:04:25, Zhiguang Liu wrote:
>> @@ -51,6 +83,10 @@ BDS_CONSOLE_CONNECT_ENTRY   gPlatformConsole[]
>= {
>>      (CONSOLE_OUT | CONSOLE_IN)
>>    },
>>    {
>> +(EFI_DEVICE_PATH_PROTOCOL *) &gGopDevicePath2,
>> +    (CONSOLE_OUT | CONSOLE_IN)
>> +  },
>> +    {
>
>The indentation looks wrong on these lines.
>
>With these fixes:
>Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
>
>>      NULL,
>>      0
>>    }