Clean up MdePkg source to correct some coding style issues, etc.

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbKbDxe / EfiKey.c

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
index da6ce75b3a8daf59a64d4e3ad453b39ece28cb17..d4b5f38e020662a3889b1786faf54f6e31bb65c8 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
@@ -193,7 +193,7 @@ USBKeyboardDriverBindingStart (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueKeyboardEnable),\r
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardEnable),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -202,7 +202,7 @@ USBKeyboardDriverBindingStart (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueKeyboardPresenceDetect),\r
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardPresenceDetect),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -394,6 +394,12 @@ ErrorExit:
     if (UsbKeyboardDevice->SimpleInputEx.WaitForKeyEx != NULL) {\r
       gBS->CloseEvent (UsbKeyboardDevice->SimpleInputEx.WaitForKeyEx);\r
     }\r
+    if (UsbKeyboardDevice->KeyboardLayoutEvent != NULL) {\r
+      gBS->CloseEvent (UsbKeyboardDevice->KeyboardLayoutEvent);\r
+    }\r
+    if (UsbKeyboardDevice->KeyConvertionTable != NULL) {\r
+      FreePool (UsbKeyboardDevice->KeyConvertionTable);\r
+    }\r
     FreePool (UsbKeyboardDevice);\r
     UsbKeyboardDevice = NULL;\r
   }\r
@@ -467,7 +473,7 @@ USBKeyboardDriverBindingStop (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueKeyboardDisable),\r
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardDisable),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -652,7 +658,7 @@ USBKeyboardReset (
 \r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueKeyboardReset),\r
+    FixedPcdGet32 (PcdStatusCodeValueKeyboardReset),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -663,7 +669,7 @@ USBKeyboardReset (
   if (!ExtendedVerification) {\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_PROGRESS_CODE,\r
-      PcdGet32 (PcdStatusCodeValueKeyboardClearBuffer),\r
+      FixedPcdGet32 (PcdStatusCodeValueKeyboardClearBuffer),\r
       UsbKeyboardDevice->DevicePath\r
       );\r
     //\r