Index: Library/UefiShellCommandLib/ConsistMapping.c
===================================================================
--- Library/UefiShellCommandLib/ConsistMapping.c	(revision 16491)
+++ Library/UefiShellCommandLib/ConsistMapping.c	(working copy)
@@ -42,12 +42,26 @@
   CHAR16    *Name;
 } MTD_NAME;
 
-typedef VOID (EFIAPI *SerialDecodeFucntion) (EFI_DEVICE_PATH_PROTOCOL *DevPath, DEVICE_CONSIST_MAPPING_INFO *MapInfo,EFI_DEVICE_PATH_PROTOCOL *);
+/**
+  Serial Decode function.
 
+  @param  DevPath          The Device path info.
+  @param  MapInfo          The map info.
+  @param  OrigDevPath      The original device path protocol.
+
+**/
+typedef 
+VOID 
+(EFIAPI *SERIAL_DECODE_FUNCTION) (
+  EFI_DEVICE_PATH_PROTOCOL    *DevPath, 
+  DEVICE_CONSIST_MAPPING_INFO *MapInfo,
+  EFI_DEVICE_PATH_PROTOCOL    *OrigDevPath
+  );
+
 typedef struct {
   UINT8 Type;
   UINT8 SubType;
-  SerialDecodeFucntion SerialFun;
+  SERIAL_DECODE_FUNCTION SerialFun;
   INTN (EFIAPI *CompareFun) (EFI_DEVICE_PATH_PROTOCOL *DevPath, EFI_DEVICE_PATH_PROTOCOL *DevPath2);
 } DEV_PATH_CONSIST_MAPPING_TABLE;
 
@@ -426,6 +440,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -453,6 +468,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -476,6 +492,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -500,6 +517,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -524,6 +542,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -550,6 +569,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -608,6 +628,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 
 **/
 VOID
@@ -671,6 +692,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -694,6 +716,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -719,6 +742,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -763,6 +787,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -786,6 +811,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -823,6 +849,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -856,6 +883,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -901,6 +929,8 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
+
 **/
 VOID
 EFIAPI
@@ -938,6 +968,8 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
+
 **/
 VOID
 EFIAPI
@@ -962,6 +994,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -987,6 +1020,7 @@
 
   @param[in] DevicePathNode   The node to get info on.
   @param[in] MappingItem      The info item to populate.
+  @param[in] DevicePath       Ignored.
 **/
 VOID
 EFIAPI
@@ -1015,6 +1049,7 @@
 
   @param[in] DevicePathNode       Ignored.
   @param[in] MappingItem          Ignored.
+  @param[in] DevicePath           Ignored.
 
   Does nothing.
 **/
@@ -1265,7 +1300,7 @@
   IN EFI_DEVICE_PATH_PROTOCOL       *DevicePath
   )
 {
-  SerialDecodeFucntion      SerialFun;
+  SERIAL_DECODE_FUNCTION    SerialFun;
   UINTN                     Index;
   EFI_DEVICE_PATH_PROTOCOL  *OriginalDevicePath;