ShellPkg/UefiShellDebug1CommandsLib: remove unused but set variable

[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / Pci.h

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.h
index cbc1b0235af7a8d186a278385c2bc54b92a7c1da..1b061548426f1fd45f40b48835578b7528021cf0 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.h
@@ -1,6 +1,7 @@
 /** @file\r
   Header file for Pci shell Debug1 function.\r
 \r
+  Copyright (c) 2013 Hewlett-Packard Development Company, L.P.\r
   Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -100,9 +101,9 @@ typedef enum {
     (((PcieDeviceCap) >> 3) & 0x3)\r
 #define PCIE_CAP_EXTENDED_TAG(PcieDeviceCap) \\r
     (((PcieDeviceCap) >> 5) & 0x1)\r
-#define PCIE_CAP_L0sLatency(PcieDeviceCap) \\r
+#define PCIE_CAP_L0SLATENCY(PcieDeviceCap) \\r
     (((PcieDeviceCap) >> 6) & 0x7)\r
-#define PCIE_CAP_L1Latency(PcieDeviceCap) \\r
+#define PCIE_CAP_L1LATENCY(PcieDeviceCap) \\r
     (((PcieDeviceCap) >> 9) & 0x7)\r
 #define PCIE_CAP_ERR_REPORTING(PcieDeviceCap) \\r
     (((PcieDeviceCap) >> 15) & 0x1)\r
@@ -157,13 +158,13 @@ typedef enum {
 //\r
 // Link Capabilities Register\r
 //\r
-#define PCIE_CAP_SUP_LINK_SPEEDS(PcieLinkCap) \\r
+#define PCIE_CAP_MAX_LINK_SPEED(PcieLinkCap) \\r
     ((PcieLinkCap) & 0x0f)\r
 #define PCIE_CAP_MAX_LINK_WIDTH(PcieLinkCap) \\r
     (((PcieLinkCap) >> 4) & 0x3f)\r
 #define PCIE_CAP_ASPM_SUPPORT(PcieLinkCap) \\r
     (((PcieLinkCap) >> 10) & 0x3)\r
-#define PCIE_CAP_L0s_LATENCY(PcieLinkCap) \\r
+#define PCIE_CAP_L0S_LATENCY(PcieLinkCap) \\r
     (((PcieLinkCap) >> 12) & 0x7)\r
 #define PCIE_CAP_L1_LATENCY(PcieLinkCap) \\r
     (((PcieLinkCap) >> 15) & 0x7)\r
@@ -334,7 +335,7 @@ typedef struct {
   UINT8   CacheLineSize;\r
   UINT8   PrimaryLatencyTimer;\r
   UINT8   HeaderType;\r
-  UINT8   BIST;\r
+  UINT8   Bist;\r
 \r
 } PCI_COMMON_HEADER;\r
 \r
@@ -427,13 +428,15 @@ typedef struct {
   UINT32  Data[46];\r
 } PCI_CARDBUS_DATA;\r
 \r
+typedef union {\r
+  PCI_DEVICE_HEADER   Device;\r
+  PCI_BRIDGE_HEADER   Bridge;\r
+  PCI_CARDBUS_HEADER  CardBus;\r
+} NON_COMMON_UNION;\r
+\r
 typedef struct {\r
   PCI_COMMON_HEADER Common;\r
-  union {\r
-    PCI_DEVICE_HEADER   Device;\r
-    PCI_BRIDGE_HEADER   Bridge;\r
-    PCI_CARDBUS_HEADER  CardBus;\r
-  } NonCommon;\r
+  NON_COMMON_UNION NonCommon;\r
   UINT32  Data[48];\r
 } PCI_CONFIG_SPACE;\r
 \r
@@ -450,10 +453,10 @@ typedef struct {
   UINT32  SlotCap;\r
   UINT16  SlotControl;\r
   UINT16  SlotStatus;\r
-  UINT16  RsvdP;\r
   UINT16  RootControl;\r
+  UINT16  RsvdP;\r
   UINT32  RootStatus;\r
-} PCIE_CAP_STURCTURE;\r
+} PCIE_CAP_STRUCTURE;\r
 \r
 #pragma pack()\r
 \r