From 9f6531d14d145918079d03926ff827f6c1a274a4 Mon Sep 17 00:00:00 2001
From: gikidy <gikidy@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 24 Apr 2009 07:30:54 +0000
Subject: Adjust the code so that global variable placed at beginning of file.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8172 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c         | 116 ++++++++++-----------
 .../Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h           |  15 ++-
 2 files changed, 65 insertions(+), 66 deletions(-)

(limited to 'IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe')

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
index 973cf24afb..3662340149 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
@@ -15,64 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "Ps2Keyboard.h"
 
-//
-// Function declarations
-//
-UINT8
-KeyReadDataRegister (
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn
-  );
-
-VOID
-KeyWriteDataRegister (
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,
-  IN UINT8                   Data
-  );
-
-VOID
-KeyWriteCommandRegister (
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,
-  IN UINT8                   Data
-  );
-
-VOID
-KeyboardError (
-  IN KEYBOARD_CONSOLE_IN_DEV*ConsoleIn,
-  IN CHAR16                 *ErrMsg // should be a unicode string
-  );
-
-EFI_STATUS
-GetScancodeBufHead (
-  KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,
-  IN UINT32                Count,
-  OUT UINT8                *Buf
-  );
-
-EFI_STATUS
-PopScancodeBufHead (
-  KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,
-  IN UINT32                Count,
-  OUT UINT8                *Buf
-  );
-
-EFI_STATUS
-KeyboardWrite (
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,
-  IN UINT8                   Data
-  );
-
-EFI_STATUS
-KeyboardCommand (
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,
-  IN UINT8                   Data
-  );
-
-EFI_STATUS
-KeyboardWaitForValue (
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,
-  IN UINT8                   Value
-  );
-
 struct {
   UINT8  ScanCode;
   UINT16  EfiScanCode;
@@ -625,6 +567,64 @@ UINTN  mWaitForValueTimeOut = KEYBOARD_WAITFORVALUE_TIMEOUT;
 
 BOOLEAN          mEnableMouseInterface;
 
+//
+// Function declarations
+//
+UINT8
+KeyReadDataRegister (
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn
+  );
+
+VOID
+KeyWriteDataRegister (
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,
+  IN UINT8                   Data
+  );
+
+VOID
+KeyWriteCommandRegister (
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,
+  IN UINT8                   Data
+  );
+
+VOID
+KeyboardError (
+  IN KEYBOARD_CONSOLE_IN_DEV*ConsoleIn,
+  IN CHAR16                 *ErrMsg // should be a unicode string
+  );
+
+EFI_STATUS
+GetScancodeBufHead (
+  KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,
+  IN UINT32                Count,
+  OUT UINT8                *Buf
+  );
+
+EFI_STATUS
+PopScancodeBufHead (
+  KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,
+  IN UINT32                Count,
+  OUT UINT8                *Buf
+  );
+
+EFI_STATUS
+KeyboardWrite (
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,
+  IN UINT8                   Data
+  );
+
+EFI_STATUS
+KeyboardCommand (
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,
+  IN UINT8                   Data
+  );
+
+EFI_STATUS
+KeyboardWaitForValue (
+  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,
+  IN UINT8                   Value
+  );
+
 /**
   Read data register 
 
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
index a029ef910f..cbfbbda768 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
@@ -34,6 +34,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 
+//
+// Global Variables
+//
+extern EFI_DRIVER_BINDING_PROTOCOL   gKeyboardControllerDriver;
+extern EFI_COMPONENT_NAME_PROTOCOL   gPs2KeyboardComponentName;
+extern EFI_COMPONENT_NAME2_PROTOCOL  gPs2KeyboardComponentName2;
+
 //
 // Driver Private Data
 //
@@ -119,14 +126,6 @@ typedef struct {
 
 #define TABLE_END 0x0
 
-//
-// Global Variables
-//
-extern EFI_DRIVER_BINDING_PROTOCOL   gKeyboardControllerDriver;
-extern EFI_COMPONENT_NAME_PROTOCOL   gPs2KeyboardComponentName;
-extern EFI_COMPONENT_NAME2_PROTOCOL  gPs2KeyboardComponentName2;
-
-
 //
 // Driver entry point
 //
-- 
cgit v1.2.3