X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellDebug1CommandsLib%2FHexEdit%2FHexEditorTypes.h;h=2a0429a4a1bc7c913b7dd8d42dbf0a7f35cef8a5;hp=51c9f44cd52d589fc85b86cfd5b34027c33bc2b8;hb=5563281fa2b31093a1cbd415553b9264c5136e89;hpb=632820d1cf1ce7a18ef354255eaeae6fdbf383b9

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h
index 51c9f44cd5..2a0429a4a1 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/HexEdit/HexEditorTypes.h
@@ -1,7 +1,7 @@
 /** @file
   data types that are used by editor
   
-  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved. <BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -18,7 +18,7 @@
 #include "UefiShellDebug1CommandsLib.h"
 #include "EditTitleBar.h"
 
-#define EFI_EDITOR_LINE_LIST  'eell'
+#define EFI_EDITOR_LINE_LIST  SIGNATURE_32 ('e', 'e', 'l', 'l')
 
 #define ASCII_POSITION        ((0x10 * 3) + 12)
 
@@ -60,7 +60,7 @@ typedef struct {
 
 typedef union {
   HEFI_EDITOR_COLOR_ATTRIBUTES  Colors;
-  UINT8                         Data;
+  UINTN                         Data;
 } HEFI_EDITOR_COLOR_UNION;
 
 typedef struct {
@@ -78,10 +78,9 @@ typedef struct {
 } HEFI_EDITOR_DISK_IMAGE;
 
 typedef struct {
-  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *IoFncs;
-
-  UINTN                           Offset;
-  UINTN                           Size;
+  EFI_CPU_IO2_PROTOCOL *IoFncs;
+  UINTN                Offset;
+  UINTN                Size;
 } HEFI_EDITOR_MEM_IMAGE;
 
 typedef struct {
@@ -110,23 +109,18 @@ typedef struct {
 } HEFI_EDITOR_BUFFER_IMAGE;
 
 typedef struct {
-  UINT8 *Buffer;
-  UINTN Size;
-} HEFI_EDITOR_CLIPBOARD;
-
-typedef struct {
-  HEFI_EDITOR_BUFFER_IMAGE    *BufferImage;
-  HEFI_EDITOR_CLIPBOARD       *Clipboard;
-
-  HEFI_EDITOR_COLOR_UNION     ColorAttributes;
-  HEFI_EDITOR_POSITION        ScreenSize;           // row number and column number
-  BOOLEAN                     MouseSupported;
-  EFI_SIMPLE_POINTER_PROTOCOL *MouseInterface;
-  INT32                       MouseAccumulatorX;
-  INT32                       MouseAccumulatorY;
-
-  UINTN                       SelectStart;          // starting from 1
-  UINTN                       SelectEnd;            // starting from 1
+  HEFI_EDITOR_BUFFER_IMAGE          *BufferImage;
+
+  HEFI_EDITOR_COLOR_UNION           ColorAttributes;
+  HEFI_EDITOR_POSITION              ScreenSize;           // row number and column number
+  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *TextInputEx;
+  BOOLEAN                           MouseSupported;
+  EFI_SIMPLE_POINTER_PROTOCOL       *MouseInterface;
+  INT32                             MouseAccumulatorX;
+  INT32                             MouseAccumulatorY;
+
+  UINTN                             SelectStart;          // starting from 1
+  UINTN                             SelectEnd;            // starting from 1
 } HEFI_EDITOR_GLOBAL_EDITOR;
 
 #endif