@retval FALSE String has at least one other character.\r
**/\r
BOOLEAN\r
-IsNumberLetterOnly(\r
- IN CONST CHAR16 *String,\r
- IN CONST UINTN Len\r
+IsNumberLetterOnly (\r
+ IN CONST CHAR16 *String,\r
+ IN CONST UINTN Len\r
)\r
{\r
- UINTN Count;\r
- for (Count = 0 ; Count < Len && String != NULL && *String != CHAR_NULL ; String++,Count++) {\r
- if (! ((*String >= L'a' && *String <= L'z') ||\r
- (*String >= L'A' && *String <= L'Z') ||\r
- (*String >= L'0' && *String <= L'9'))\r
- ){\r
+ UINTN Count;\r
+\r
+ for (Count = 0; Count < Len && String != NULL && *String != CHAR_NULL; String++, Count++) {\r
+ if (!(((*String >= L'a') && (*String <= L'z')) ||\r
+ ((*String >= L'A') && (*String <= L'Z')) ||\r
+ ((*String >= L'0') && (*String <= L'9')))\r
+ )\r
+ {\r
return (FALSE);\r
}\r
}\r
+\r
return (TRUE);\r
}\r
\r
items (";" normally).\r
**/\r
BOOLEAN\r
-SearchList(\r
+SearchList (\r
IN CONST CHAR16 *List,\r
IN CONST CHAR16 *MetaTarget,\r
OUT CHAR16 **FullName OPTIONAL,\r
BOOLEAN Result;\r
CHAR16 *TempSpot;\r
\r
- for (ListWalker = List , TempList = NULL\r
- ; ListWalker != NULL && *ListWalker != CHAR_NULL\r
- ;\r
- ) {\r
- TempList = StrnCatGrow(&TempList, NULL, ListWalker, 0);\r
- ASSERT(TempList != NULL);\r
- TempSpot = StrStr(TempList, Target);\r
+ for (ListWalker = List, TempList = NULL\r
+ ; ListWalker != NULL && *ListWalker != CHAR_NULL\r
+ ;\r
+ )\r
+ {\r
+ TempList = StrnCatGrow (&TempList, NULL, ListWalker, 0);\r
+ ASSERT (TempList != NULL);\r
+ TempSpot = StrStr (TempList, Target);\r
if (TempSpot != NULL) {\r
*TempSpot = CHAR_NULL;\r
}\r
\r
- while (SkipTrailingNumbers && (ShellIsDecimalDigitCharacter(TempList[StrLen(TempList)-1]) || TempList[StrLen(TempList)-1] == L':')) {\r
- TempList[StrLen(TempList)-1] = CHAR_NULL;\r
+ while (SkipTrailingNumbers && (ShellIsDecimalDigitCharacter (TempList[StrLen (TempList)-1]) || TempList[StrLen (TempList)-1] == L':')) {\r
+ TempList[StrLen (TempList)-1] = CHAR_NULL;\r
}\r
\r
- ListWalker = StrStr(ListWalker, Target);\r
- while(ListWalker != NULL && *ListWalker == *Target) {\r
+ ListWalker = StrStr (ListWalker, Target);\r
+ while (ListWalker != NULL && *ListWalker == *Target) {\r
ListWalker++;\r
}\r
+\r
if (Meta) {\r
- Result = gUnicodeCollation->MetaiMatch(gUnicodeCollation, (CHAR16*)TempList, (CHAR16*)MetaTarget);\r
+ Result = gUnicodeCollation->MetaiMatch (gUnicodeCollation, (CHAR16 *)TempList, (CHAR16 *)MetaTarget);\r
} else {\r
- Result = (BOOLEAN)(StrCmp(TempList, MetaTarget)==0);\r
+ Result = (BOOLEAN)(StrCmp (TempList, MetaTarget) == 0);\r
}\r
+\r
if (Result) {\r
if (FullName != NULL) {\r
*FullName = TempList;\r
} else {\r
- FreePool(TempList);\r
+ FreePool (TempList);\r
}\r
+\r
return (TRUE);\r
}\r
- FreePool(TempList);\r
+\r
+ FreePool (TempList);\r
TempList = NULL;\r
}\r
\r
@retval STR_MAP_MEDIA_CDROM The media is a CD ROM.\r
@retval STR_MAP_MEDIA_FLOPPY The media is a floppy drive.\r
**/\r
-CHAR16*\r
+CHAR16 *\r
GetDeviceMediaType (\r
- IN EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
+ IN EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
)\r
{\r
ACPI_HID_DEVICE_PATH *Acpi;\r
// Acpi.HID = 0X0604 -> Floppy\r
//\r
if (NULL == DevicePath) {\r
- return HiiGetString(gShellLevel2HiiHandle, STRING_TOKEN(STR_MAP_MEDIA_UNKNOWN), NULL);\r
+ return HiiGetString (gShellLevel2HiiHandle, STRING_TOKEN (STR_MAP_MEDIA_UNKNOWN), NULL);\r
}\r
\r
- for (;!IsDevicePathEndType (DevicePath) ;DevicePath = NextDevicePathNode (DevicePath)) {\r
+ for ( ; !IsDevicePathEndType (DevicePath); DevicePath = NextDevicePathNode (DevicePath)) {\r
if (DevicePathType (DevicePath) == MEDIA_DEVICE_PATH) {\r
switch (DevicePathSubType (DevicePath)) {\r
- case MEDIA_HARDDRIVE_DP:\r
- return HiiGetString(gShellLevel2HiiHandle, STRING_TOKEN(STR_MAP_MEDIA_HARDDISK), NULL);\r
- case MEDIA_CDROM_DP:\r
- return HiiGetString(gShellLevel2HiiHandle, STRING_TOKEN(STR_MAP_MEDIA_CDROM), NULL);\r
+ case MEDIA_HARDDRIVE_DP:\r
+ return HiiGetString (gShellLevel2HiiHandle, STRING_TOKEN (STR_MAP_MEDIA_HARDDISK), NULL);\r
+ case MEDIA_CDROM_DP:\r
+ return HiiGetString (gShellLevel2HiiHandle, STRING_TOKEN (STR_MAP_MEDIA_CDROM), NULL);\r
}\r
} else if (DevicePathType (DevicePath) == ACPI_DEVICE_PATH) {\r
- Acpi = (ACPI_HID_DEVICE_PATH *) DevicePath;\r
+ Acpi = (ACPI_HID_DEVICE_PATH *)DevicePath;\r
if (EISA_ID_TO_NUM (Acpi->HID) == 0x0604) {\r
- return HiiGetString(gShellLevel2HiiHandle, STRING_TOKEN(STR_MAP_MEDIA_FLOPPY), NULL);\r
+ return HiiGetString (gShellLevel2HiiHandle, STRING_TOKEN (STR_MAP_MEDIA_FLOPPY), NULL);\r
}\r
}\r
}\r
\r
- return HiiGetString(gShellLevel2HiiHandle, STRING_TOKEN(STR_MAP_MEDIA_UNKNOWN), NULL);\r
+ return HiiGetString (gShellLevel2HiiHandle, STRING_TOKEN (STR_MAP_MEDIA_UNKNOWN), NULL);\r
}\r
\r
/**\r
**/\r
BOOLEAN\r
IsRemoveableDevice (\r
- IN EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
+ IN EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
)\r
{\r
if (NULL == DevicePath) {\r
while (!IsDevicePathEndType (DevicePath)) {\r
if (DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) {\r
switch (DevicePathSubType (DevicePath)) {\r
- case MSG_USB_DP:\r
- case MSG_SCSI_DP:\r
- return TRUE;\r
- default:\r
- return FALSE;\r
+ case MSG_USB_DP:\r
+ case MSG_SCSI_DP:\r
+ return TRUE;\r
+ default:\r
+ return FALSE;\r
}\r
}\r
+\r
DevicePath = NextDevicePathNode (DevicePath);\r
}\r
+\r
return FALSE;\r
}\r
\r
@retval FALSE The map should not be displayed.\r
**/\r
BOOLEAN\r
-MappingListHasType(\r
- IN CONST CHAR16 *MapList,\r
- IN CONST CHAR16 *Specific,\r
- IN CONST CHAR16 *TypeString,\r
- IN CONST BOOLEAN Normal,\r
- IN CONST BOOLEAN Consist\r
+MappingListHasType (\r
+ IN CONST CHAR16 *MapList,\r
+ IN CONST CHAR16 *Specific,\r
+ IN CONST CHAR16 *TypeString,\r
+ IN CONST BOOLEAN Normal,\r
+ IN CONST BOOLEAN Consist\r
)\r
{\r
- CHAR16 *NewSpecific;\r
- RETURN_STATUS Status;\r
- UINTN Length;\r
+ CHAR16 *NewSpecific;\r
+ RETURN_STATUS Status;\r
+ UINTN Length;\r
\r
//\r
// specific has priority\r
//\r
if (Specific != NULL) {\r
- Length = StrLen (Specific);\r
+ Length = StrLen (Specific);\r
//\r
// Allocate enough buffer for Specific and potential ":"\r
//\r
- NewSpecific = AllocatePool ((Length + 2) * sizeof(CHAR16));\r
- if (NewSpecific == NULL){\r
+ NewSpecific = AllocatePool ((Length + 2) * sizeof (CHAR16));\r
+ if (NewSpecific == NULL) {\r
return FALSE;\r
}\r
+\r
StrCpyS (NewSpecific, Length + 2, Specific);\r
if (Specific[Length - 1] != L':') {\r
- Status = StrnCatS(NewSpecific, Length + 2, L":", StrLen(L":"));\r
+ Status = StrnCatS (NewSpecific, Length + 2, L":", StrLen (L":"));\r
if (EFI_ERROR (Status)) {\r
- FreePool(NewSpecific);\r
+ FreePool (NewSpecific);\r
return FALSE;\r
}\r
}\r
\r
- if (SearchList(MapList, NewSpecific, NULL, TRUE, FALSE, L";")) {\r
- FreePool(NewSpecific);\r
+ if (SearchList (MapList, NewSpecific, NULL, TRUE, FALSE, L";")) {\r
+ FreePool (NewSpecific);\r
return (TRUE);\r
}\r
- FreePool(NewSpecific);\r
+\r
+ FreePool (NewSpecific);\r
}\r
+\r
if ( Consist\r
- && Specific == NULL\r
- && (SearchList(MapList, L"HD*", NULL, TRUE, TRUE, L";")\r
- ||SearchList(MapList, L"CD*", NULL, TRUE, TRUE, L";")\r
- ||SearchList(MapList, L"F*", NULL, TRUE, TRUE, L";")\r
- ||SearchList(MapList, L"FP*", NULL, TRUE, TRUE, L";"))){\r
+ && (Specific == NULL)\r
+ && ( SearchList (MapList, L"HD*", NULL, TRUE, TRUE, L";")\r
+ || SearchList (MapList, L"CD*", NULL, TRUE, TRUE, L";")\r
+ || SearchList (MapList, L"F*", NULL, TRUE, TRUE, L";")\r
+ || SearchList (MapList, L"FP*", NULL, TRUE, TRUE, L";")))\r
+ {\r
return (TRUE);\r
}\r
\r
if ( Normal\r
- && Specific == NULL\r
- && (SearchList(MapList, L"FS", NULL, FALSE, TRUE, L";")\r
- ||SearchList(MapList, L"BLK", NULL, FALSE, TRUE, L";"))){\r
+ && (Specific == NULL)\r
+ && ( SearchList (MapList, L"FS", NULL, FALSE, TRUE, L";")\r
+ || SearchList (MapList, L"BLK", NULL, FALSE, TRUE, L";")))\r
+ {\r
return (TRUE);\r
}\r
\r
- if (TypeString != NULL && SearchList(MapList, TypeString, NULL, TRUE, TRUE, L";")) {\r
+ if ((TypeString != NULL) && SearchList (MapList, TypeString, NULL, TRUE, TRUE, L";")) {\r
return (TRUE);\r
}\r
+\r
return (FALSE);\r
}\r
\r
-\r
/**\r
Display a single map line for device Handle if conditions are met.\r
\r
@retval EFI_SUCCESS The mapping was displayed.\r
**/\r
EFI_STATUS\r
-PerformSingleMappingDisplay(\r
- IN CONST BOOLEAN Verbose,\r
- IN CONST BOOLEAN Consist,\r
- IN CONST BOOLEAN Normal,\r
- IN CONST CHAR16 *TypeString,\r
- IN CONST BOOLEAN SFO,\r
- IN CONST CHAR16 *Specific OPTIONAL,\r
- IN CONST EFI_HANDLE Handle\r
+PerformSingleMappingDisplay (\r
+ IN CONST BOOLEAN Verbose,\r
+ IN CONST BOOLEAN Consist,\r
+ IN CONST BOOLEAN Normal,\r
+ IN CONST CHAR16 *TypeString,\r
+ IN CONST BOOLEAN SFO,\r
+ IN CONST CHAR16 *Specific OPTIONAL,\r
+ IN CONST EFI_HANDLE Handle\r
)\r
{\r
EFI_DEVICE_PATH_PROTOCOL *DevPath;\r
Alias = NULL;\r
TempSpot2 = NULL;\r
CurrentName = NULL;\r
- DevPath = DevicePathFromHandle(Handle);\r
+ DevPath = DevicePathFromHandle (Handle);\r
DevPathCopy = DevPath;\r
- MapList = gEfiShellProtocol->GetMapFromDevicePath(&DevPathCopy);\r
+ MapList = gEfiShellProtocol->GetMapFromDevicePath (&DevPathCopy);\r
if (MapList == NULL) {\r
return EFI_NOT_FOUND;\r
}\r
\r
- if (!MappingListHasType(MapList, Specific, TypeString, Normal, Consist)){\r
+ if (!MappingListHasType (MapList, Specific, TypeString, Normal, Consist)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
// Allocate a name\r
//\r
CurrentName = NULL;\r
- CurrentName = StrnCatGrow(&CurrentName, 0, MapList, 0);\r
+ CurrentName = StrnCatGrow (&CurrentName, 0, MapList, 0);\r
if (CurrentName == NULL) {\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
// Chop off the other names that become "Alias(s)"\r
// leaving just the normal name\r
//\r
- TempSpot = StrStr(CurrentName, L";");\r
+ TempSpot = StrStr (CurrentName, L";");\r
if (TempSpot != NULL) {\r
*TempSpot = CHAR_NULL;\r
}\r
//\r
// Skip the first name. This is the standard name.\r
//\r
- TempSpot = StrStr(MapList, L";");\r
+ TempSpot = StrStr (MapList, L";");\r
if (TempSpot != NULL) {\r
TempSpot++;\r
}\r
- SearchList(TempSpot, L"HD*", &CurrentName, TRUE, FALSE, L";");\r
+\r
+ SearchList (TempSpot, L"HD*", &CurrentName, TRUE, FALSE, L";");\r
if (CurrentName == NULL) {\r
- SearchList(TempSpot, L"CD*", &CurrentName, TRUE, FALSE, L";");\r
+ SearchList (TempSpot, L"CD*", &CurrentName, TRUE, FALSE, L";");\r
}\r
+\r
if (CurrentName == NULL) {\r
- SearchList(TempSpot, L"FP*", &CurrentName, TRUE, FALSE, L";");\r
+ SearchList (TempSpot, L"FP*", &CurrentName, TRUE, FALSE, L";");\r
}\r
+\r
if (CurrentName == NULL) {\r
- SearchList(TempSpot, L"F*", &CurrentName, TRUE, FALSE, L";");\r
+ SearchList (TempSpot, L"F*", &CurrentName, TRUE, FALSE, L";");\r
}\r
+\r
if (CurrentName == NULL) {\r
//\r
// We didnt find anything, so just the first one in the list...\r
//\r
- CurrentName = StrnCatGrow(&CurrentName, 0, MapList, 0);\r
+ CurrentName = StrnCatGrow (&CurrentName, 0, MapList, 0);\r
if (CurrentName == NULL) {\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
- TempSpot = StrStr(CurrentName, L";");\r
+\r
+ TempSpot = StrStr (CurrentName, L";");\r
if (TempSpot != NULL) {\r
*TempSpot = CHAR_NULL;\r
}\r
} else {\r
- Alias = StrnCatGrow(&Alias, 0, MapList, 0);\r
+ Alias = StrnCatGrow (&Alias, 0, MapList, 0);\r
if (Alias == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- TempSpot = StrStr(Alias, CurrentName);\r
+\r
+ TempSpot = StrStr (Alias, CurrentName);\r
if (TempSpot != NULL) {\r
- TempSpot2 = StrStr(TempSpot, L";");\r
+ TempSpot2 = StrStr (TempSpot, L";");\r
if (TempSpot2 != NULL) {\r
TempSpot2++; // Move past ";" from CurrentName\r
- CopyMem(TempSpot, TempSpot2, StrSize(TempSpot2));\r
+ CopyMem (TempSpot, TempSpot2, StrSize (TempSpot2));\r
} else {\r
*TempSpot = CHAR_NULL;\r
}\r
}\r
- if (Alias[StrLen(Alias)-1] == L';') {\r
- Alias[StrLen(Alias)-1] = CHAR_NULL;\r
+\r
+ if (Alias[StrLen (Alias)-1] == L';') {\r
+ Alias[StrLen (Alias)-1] = CHAR_NULL;\r
}\r
}\r
}\r
- DevPathString = ConvertDevicePathToText(DevPath, TRUE, FALSE);\r
- TempLen = StrLen(CurrentName);\r
+\r
+ DevPathString = ConvertDevicePathToText (DevPath, TRUE, FALSE);\r
+ TempLen = StrLen (CurrentName);\r
if (!SFO) {\r
ShellPrintHiiEx (\r
-1,\r
STRING_TOKEN (STR_MAP_ENTRY),\r
gShellLevel2HiiHandle,\r
CurrentName,\r
- Alias!=NULL?Alias:(TempLen < StrLen(MapList)?MapList + TempLen+1:L""),\r
+ Alias != NULL ? Alias : (TempLen < StrLen (MapList) ? MapList + TempLen+1 : L""),\r
DevPathString\r
- );\r
+ );\r
if (Verbose) {\r
//\r
// also print handle, media type, removable (y/n), and current directory\r
//\r
- MediaType = GetDeviceMediaType(DevPath);\r
- if ((TypeString != NULL &&MediaType != NULL && StrStr(TypeString, MediaType) != NULL) || TypeString == NULL) {\r
- Removable = IsRemoveableDevice(DevPath);\r
- TempSpot2 = ShellGetCurrentDir(CurrentName);\r
+ MediaType = GetDeviceMediaType (DevPath);\r
+ if (((TypeString != NULL) && (MediaType != NULL) && (StrStr (TypeString, MediaType) != NULL)) || (TypeString == NULL)) {\r
+ Removable = IsRemoveableDevice (DevPath);\r
+ TempSpot2 = ShellGetCurrentDir (CurrentName);\r
ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
STRING_TOKEN (STR_MAP_ENTRY_VERBOSE),\r
gShellLevel2HiiHandle,\r
- ConvertHandleToHandleIndex(Handle),\r
+ ConvertHandleToHandleIndex (Handle),\r
MediaType,\r
- Removable?L"Yes":L"No",\r
+ Removable ? L"Yes" : L"No",\r
TempSpot2\r
- );\r
+ );\r
}\r
- SHELL_FREE_NON_NULL(MediaType);\r
+\r
+ SHELL_FREE_NON_NULL (MediaType);\r
}\r
} else {\r
ShellPrintHiiEx (\r
gShellLevel2HiiHandle,\r
CurrentName,\r
DevPathString,\r
- Consist?L"":(TempLen < StrLen(MapList)?MapList + TempLen+1:L"")\r
- );\r
+ Consist ? L"" : (TempLen < StrLen (MapList) ? MapList + TempLen+1 : L"")\r
+ );\r
}\r
- SHELL_FREE_NON_NULL(DevPathString);\r
- SHELL_FREE_NON_NULL(CurrentName);\r
- SHELL_FREE_NON_NULL(Alias);\r
+\r
+ SHELL_FREE_NON_NULL (DevPathString);\r
+ SHELL_FREE_NON_NULL (CurrentName);\r
+ SHELL_FREE_NON_NULL (Alias);\r
return EFI_SUCCESS;\r
}\r
\r
@retval EFI_NOT_FOUND Name was not a map on Handle.\r
**/\r
EFI_STATUS\r
-PerformSingleMappingDelete(\r
- IN CONST CHAR16 *Specific,\r
- IN CONST EFI_HANDLE Handle\r
+PerformSingleMappingDelete (\r
+ IN CONST CHAR16 *Specific,\r
+ IN CONST EFI_HANDLE Handle\r
)\r
{\r
EFI_DEVICE_PATH_PROTOCOL *DevPath;\r
CONST CHAR16 *MapList;\r
CHAR16 *CurrentName;\r
\r
- DevPath = DevicePathFromHandle(Handle);\r
+ DevPath = DevicePathFromHandle (Handle);\r
DevPathCopy = DevPath;\r
- MapList = gEfiShellProtocol->GetMapFromDevicePath(&DevPathCopy);\r
+ MapList = gEfiShellProtocol->GetMapFromDevicePath (&DevPathCopy);\r
CurrentName = NULL;\r
\r
if (MapList == NULL) {\r
return (EFI_NOT_FOUND);\r
}\r
+\r
//\r
// if there is a specific and its not on the list...\r
//\r
- if (!SearchList(MapList, Specific, &CurrentName, TRUE, FALSE, L";")) {\r
+ if (!SearchList (MapList, Specific, &CurrentName, TRUE, FALSE, L";")) {\r
return (EFI_NOT_FOUND);\r
}\r
- return (gEfiShellProtocol->SetMap(NULL, CurrentName));\r
+\r
+ return (gEfiShellProtocol->SetMap (NULL, CurrentName));\r
}\r
\r
-CONST CHAR16 Cd[] = L"cd*";\r
-CONST CHAR16 Hd[] = L"hd*";\r
-CONST CHAR16 Fp[] = L"fp*";\r
-CONST CHAR16 AnyF[] = L"F*";\r
+CONST CHAR16 Cd[] = L"cd*";\r
+CONST CHAR16 Hd[] = L"hd*";\r
+CONST CHAR16 Fp[] = L"fp*";\r
+CONST CHAR16 AnyF[] = L"F*";\r
+\r
/**\r
Function to display mapping information to the user.\r
\r
\r
**/\r
SHELL_STATUS\r
-PerformMappingDisplay(\r
- IN CONST BOOLEAN Verbose,\r
- IN CONST BOOLEAN Consist,\r
- IN CONST BOOLEAN Normal,\r
- IN CONST CHAR16 *TypeString,\r
- IN CONST BOOLEAN SFO,\r
- IN CONST CHAR16 *Specific OPTIONAL,\r
- IN CONST BOOLEAN Header\r
+PerformMappingDisplay (\r
+ IN CONST BOOLEAN Verbose,\r
+ IN CONST BOOLEAN Consist,\r
+ IN CONST BOOLEAN Normal,\r
+ IN CONST CHAR16 *TypeString,\r
+ IN CONST BOOLEAN SFO,\r
+ IN CONST CHAR16 *Specific OPTIONAL,\r
+ IN CONST BOOLEAN Header\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_HANDLE *HandleBuffer;\r
- UINTN BufferSize;\r
- UINTN LoopVar;\r
- CHAR16 *Test;\r
- BOOLEAN Found;\r
-\r
- if (!Consist && !Normal && Specific == NULL && TypeString == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"map");\r
+ EFI_STATUS Status;\r
+ EFI_HANDLE *HandleBuffer;\r
+ UINTN BufferSize;\r
+ UINTN LoopVar;\r
+ CHAR16 *Test;\r
+ BOOLEAN Found;\r
+\r
+ if (!Consist && !Normal && (Specific == NULL) && (TypeString == NULL)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"map");\r
return (SHELL_INVALID_PARAMETER);\r
}\r
\r
if (TypeString != NULL) {\r
- Test = (CHAR16*)Cd;\r
- if (StrnCmp(TypeString, Test, StrLen(Test)-1) != 0) {\r
- Test = (CHAR16*)Hd;\r
- if (StrnCmp(TypeString, Test, StrLen(Test)-1) != 0) {\r
- Test = (CHAR16*)Fp;\r
- if (StrnCmp(TypeString, Test, StrLen(Test)-1) != 0) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", TypeString);\r
+ Test = (CHAR16 *)Cd;\r
+ if (StrnCmp (TypeString, Test, StrLen (Test)-1) != 0) {\r
+ Test = (CHAR16 *)Hd;\r
+ if (StrnCmp (TypeString, Test, StrLen (Test)-1) != 0) {\r
+ Test = (CHAR16 *)Fp;\r
+ if (StrnCmp (TypeString, Test, StrLen (Test)-1) != 0) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", TypeString);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
} else if (Test == NULL) {\r
- Test = (CHAR16*)AnyF;\r
+ Test = (CHAR16 *)AnyF;\r
}\r
}\r
} else {\r
// Print the header\r
//\r
if (!SFO) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_HEADER), gShellLevel2HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MAP_HEADER), gShellLevel2HiiHandle);\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_SFO_HEADER), gShellLevel2HiiHandle, L"map");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_SFO_HEADER), gShellLevel2HiiHandle, L"map");\r
}\r
}\r
\r
- BufferSize = 0;\r
- HandleBuffer = NULL;\r
+ BufferSize = 0;\r
+ HandleBuffer = NULL;\r
\r
//\r
// Look up all SimpleFileSystems in the platform\r
//\r
- Status = gBS->LocateHandle(\r
- ByProtocol,\r
- &gEfiSimpleFileSystemProtocolGuid,\r
- NULL,\r
- &BufferSize,\r
- HandleBuffer);\r
+ Status = gBS->LocateHandle (\r
+ ByProtocol,\r
+ &gEfiSimpleFileSystemProtocolGuid,\r
+ NULL,\r
+ &BufferSize,\r
+ HandleBuffer\r
+ );\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
- HandleBuffer = AllocateZeroPool(BufferSize);\r
+ HandleBuffer = AllocateZeroPool (BufferSize);\r
if (HandleBuffer == NULL) {\r
return (SHELL_OUT_OF_RESOURCES);\r
}\r
- Status = gBS->LocateHandle(\r
- ByProtocol,\r
- &gEfiSimpleFileSystemProtocolGuid,\r
- NULL,\r
- &BufferSize,\r
- HandleBuffer);\r
+\r
+ Status = gBS->LocateHandle (\r
+ ByProtocol,\r
+ &gEfiSimpleFileSystemProtocolGuid,\r
+ NULL,\r
+ &BufferSize,\r
+ HandleBuffer\r
+ );\r
}\r
\r
//\r
// Get the map name(s) for each one.\r
//\r
for ( LoopVar = 0, Found = FALSE\r
- ; LoopVar < (BufferSize / sizeof(EFI_HANDLE)) && HandleBuffer != NULL\r
- ; LoopVar ++\r
- ){\r
- Status = PerformSingleMappingDisplay(\r
- Verbose,\r
- Consist,\r
- Normal,\r
- Test,\r
- SFO,\r
- Specific,\r
- HandleBuffer[LoopVar]);\r
- if (!EFI_ERROR(Status)) {\r
+ ; LoopVar < (BufferSize / sizeof (EFI_HANDLE)) && HandleBuffer != NULL\r
+ ; LoopVar++\r
+ )\r
+ {\r
+ Status = PerformSingleMappingDisplay (\r
+ Verbose,\r
+ Consist,\r
+ Normal,\r
+ Test,\r
+ SFO,\r
+ Specific,\r
+ HandleBuffer[LoopVar]\r
+ );\r
+ if (!EFI_ERROR (Status)) {\r
Found = TRUE;\r
}\r
}\r
//\r
// Look up all BlockIo in the platform\r
//\r
- Status = gBS->LocateHandle(\r
- ByProtocol,\r
- &gEfiBlockIoProtocolGuid,\r
- NULL,\r
- &BufferSize,\r
- HandleBuffer);\r
+ Status = gBS->LocateHandle (\r
+ ByProtocol,\r
+ &gEfiBlockIoProtocolGuid,\r
+ NULL,\r
+ &BufferSize,\r
+ HandleBuffer\r
+ );\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
- SHELL_FREE_NON_NULL(HandleBuffer);\r
- HandleBuffer = AllocateZeroPool(BufferSize);\r
+ SHELL_FREE_NON_NULL (HandleBuffer);\r
+ HandleBuffer = AllocateZeroPool (BufferSize);\r
if (HandleBuffer == NULL) {\r
return (SHELL_OUT_OF_RESOURCES);\r
}\r
- Status = gBS->LocateHandle(\r
- ByProtocol,\r
- &gEfiBlockIoProtocolGuid,\r
- NULL,\r
- &BufferSize,\r
- HandleBuffer);\r
+\r
+ Status = gBS->LocateHandle (\r
+ ByProtocol,\r
+ &gEfiBlockIoProtocolGuid,\r
+ NULL,\r
+ &BufferSize,\r
+ HandleBuffer\r
+ );\r
}\r
- if (!EFI_ERROR(Status) && HandleBuffer != NULL) {\r
+\r
+ if (!EFI_ERROR (Status) && (HandleBuffer != NULL)) {\r
//\r
// Get the map name(s) for each one.\r
//\r
for ( LoopVar = 0\r
- ; LoopVar < BufferSize / sizeof(EFI_HANDLE)\r
- ; LoopVar ++\r
- ){\r
+ ; LoopVar < BufferSize / sizeof (EFI_HANDLE)\r
+ ; LoopVar++\r
+ )\r
+ {\r
//\r
// Skip any that were already done...\r
//\r
- if (gBS->OpenProtocol(\r
- HandleBuffer[LoopVar],\r
- &gEfiSimpleFileSystemProtocolGuid,\r
- NULL,\r
- gImageHandle,\r
- NULL,\r
- EFI_OPEN_PROTOCOL_TEST_PROTOCOL) == EFI_SUCCESS) {\r
- continue;\r
+ if (gBS->OpenProtocol (\r
+ HandleBuffer[LoopVar],\r
+ &gEfiSimpleFileSystemProtocolGuid,\r
+ NULL,\r
+ gImageHandle,\r
+ NULL,\r
+ EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
+ ) == EFI_SUCCESS)\r
+ {\r
+ continue;\r
}\r
- Status = PerformSingleMappingDisplay(\r
- Verbose,\r
- Consist,\r
- Normal,\r
- Test,\r
- SFO,\r
- Specific,\r
- HandleBuffer[LoopVar]);\r
- if (!EFI_ERROR(Status)) {\r
+\r
+ Status = PerformSingleMappingDisplay (\r
+ Verbose,\r
+ Consist,\r
+ Normal,\r
+ Test,\r
+ SFO,\r
+ Specific,\r
+ HandleBuffer[LoopVar]\r
+ );\r
+ if (!EFI_ERROR (Status)) {\r
Found = TRUE;\r
}\r
}\r
- FreePool(HandleBuffer);\r
+\r
+ FreePool (HandleBuffer);\r
}\r
+\r
if (!Found) {\r
if (Specific != NULL) {\r
- ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, L"map", Specific);\r
+ ShellPrintHiiEx (gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, L"map", Specific);\r
} else {\r
- ShellPrintHiiEx(gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_CD_NF), gShellLevel2HiiHandle, L"map");\r
+ ShellPrintHiiEx (gST->ConOut->Mode->CursorColumn, gST->ConOut->Mode->CursorRow-1, NULL, STRING_TOKEN (STR_CD_NF), gShellLevel2HiiHandle, L"map");\r
}\r
}\r
+\r
return (SHELL_SUCCESS);\r
}\r
\r
@sa PerformMappingDisplay\r
**/\r
SHELL_STATUS\r
-PerformMappingDisplay2(\r
- IN CONST BOOLEAN Verbose,\r
- IN CONST BOOLEAN Consist,\r
- IN CONST BOOLEAN Normal,\r
- IN CONST CHAR16 *TypeString,\r
- IN CONST BOOLEAN SFO,\r
- IN CONST CHAR16 *Specific OPTIONAL\r
+PerformMappingDisplay2 (\r
+ IN CONST BOOLEAN Verbose,\r
+ IN CONST BOOLEAN Consist,\r
+ IN CONST BOOLEAN Normal,\r
+ IN CONST CHAR16 *TypeString,\r
+ IN CONST BOOLEAN SFO,\r
+ IN CONST CHAR16 *Specific OPTIONAL\r
)\r
{\r
CONST CHAR16 *TypeWalker;\r
SHELL_STATUS ShellStatus;\r
CHAR16 *Comma;\r
\r
-\r
if (TypeString == NULL) {\r
- return (PerformMappingDisplay(Verbose, Consist, Normal, NULL, SFO, Specific, TRUE));\r
+ return (PerformMappingDisplay (Verbose, Consist, Normal, NULL, SFO, Specific, TRUE));\r
}\r
+\r
ShellStatus = SHELL_SUCCESS;\r
- for (TypeWalker = TypeString ; TypeWalker != NULL && *TypeWalker != CHAR_NULL ;) {\r
- Comma = StrStr(TypeWalker, L",");\r
+ for (TypeWalker = TypeString; TypeWalker != NULL && *TypeWalker != CHAR_NULL;) {\r
+ Comma = StrStr (TypeWalker, L",");\r
if (Comma == NULL) {\r
if (ShellStatus == SHELL_SUCCESS) {\r
- ShellStatus = PerformMappingDisplay(Verbose, Consist, Normal, TypeWalker, SFO, Specific, (BOOLEAN)(TypeWalker == TypeString));\r
+ ShellStatus = PerformMappingDisplay (Verbose, Consist, Normal, TypeWalker, SFO, Specific, (BOOLEAN)(TypeWalker == TypeString));\r
} else {\r
- PerformMappingDisplay(Verbose, Consist, Normal, TypeWalker, SFO, Specific, (BOOLEAN)(TypeWalker == TypeString));\r
+ PerformMappingDisplay (Verbose, Consist, Normal, TypeWalker, SFO, Specific, (BOOLEAN)(TypeWalker == TypeString));\r
}\r
+\r
break;\r
} else {\r
*Comma = CHAR_NULL;\r
if (ShellStatus == SHELL_SUCCESS) {\r
- ShellStatus = PerformMappingDisplay(Verbose, Consist, Normal, TypeWalker, SFO, Specific, (BOOLEAN)(TypeWalker == TypeString));\r
+ ShellStatus = PerformMappingDisplay (Verbose, Consist, Normal, TypeWalker, SFO, Specific, (BOOLEAN)(TypeWalker == TypeString));\r
} else {\r
- PerformMappingDisplay(Verbose, Consist, Normal, TypeWalker, SFO, Specific, (BOOLEAN)(TypeWalker == TypeString));\r
+ PerformMappingDisplay (Verbose, Consist, Normal, TypeWalker, SFO, Specific, (BOOLEAN)(TypeWalker == TypeString));\r
}\r
- *Comma = L',';\r
+\r
+ *Comma = L',';\r
TypeWalker = Comma + 1;\r
}\r
}\r
@retval EFI_NOT_FOUND Specific could not be found.\r
**/\r
EFI_STATUS\r
-PerformMappingDelete(\r
+PerformMappingDelete (\r
IN CONST CHAR16 *Specific\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_HANDLE *HandleBuffer;\r
- UINTN BufferSize;\r
- UINTN LoopVar;\r
- BOOLEAN Deleted;\r
+ EFI_STATUS Status;\r
+ EFI_HANDLE *HandleBuffer;\r
+ UINTN BufferSize;\r
+ UINTN LoopVar;\r
+ BOOLEAN Deleted;\r
\r
if (Specific == NULL) {\r
return (EFI_INVALID_PARAMETER);\r
}\r
\r
- BufferSize = 0;\r
- HandleBuffer = NULL;\r
- Deleted = FALSE;\r
+ BufferSize = 0;\r
+ HandleBuffer = NULL;\r
+ Deleted = FALSE;\r
\r
//\r
// Look up all SimpleFileSystems in the platform\r
//\r
- Status = gBS->LocateHandle(\r
- ByProtocol,\r
- &gEfiDevicePathProtocolGuid,\r
- NULL,\r
- &BufferSize,\r
- HandleBuffer);\r
+ Status = gBS->LocateHandle (\r
+ ByProtocol,\r
+ &gEfiDevicePathProtocolGuid,\r
+ NULL,\r
+ &BufferSize,\r
+ HandleBuffer\r
+ );\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
- HandleBuffer = AllocateZeroPool(BufferSize);\r
+ HandleBuffer = AllocateZeroPool (BufferSize);\r
if (HandleBuffer == NULL) {\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
- Status = gBS->LocateHandle(\r
- ByProtocol,\r
- &gEfiDevicePathProtocolGuid,\r
- NULL,\r
- &BufferSize,\r
- HandleBuffer);\r
+\r
+ Status = gBS->LocateHandle (\r
+ ByProtocol,\r
+ &gEfiDevicePathProtocolGuid,\r
+ NULL,\r
+ &BufferSize,\r
+ HandleBuffer\r
+ );\r
}\r
- if (EFI_ERROR(Status)) {\r
- SHELL_FREE_NON_NULL(HandleBuffer);\r
+\r
+ if (EFI_ERROR (Status)) {\r
+ SHELL_FREE_NON_NULL (HandleBuffer);\r
return (Status);\r
}\r
\r
// Get the map name(s) for each one.\r
//\r
for ( LoopVar = 0\r
- ; LoopVar < BufferSize / sizeof(EFI_HANDLE)\r
- ; LoopVar ++\r
- ){\r
- if (PerformSingleMappingDelete(Specific,HandleBuffer[LoopVar]) == SHELL_SUCCESS) {\r
- Deleted = TRUE;\r
+ ; LoopVar < BufferSize / sizeof (EFI_HANDLE)\r
+ ; LoopVar++\r
+ )\r
+ {\r
+ if (PerformSingleMappingDelete (Specific, HandleBuffer[LoopVar]) == SHELL_SUCCESS) {\r
+ Deleted = TRUE;\r
}\r
}\r
}\r
+\r
//\r
// Look up all BlockIo in the platform\r
//\r
- Status = gBS->LocateHandle(\r
- ByProtocol,\r
- &gEfiBlockIoProtocolGuid,\r
- NULL,\r
- &BufferSize,\r
- HandleBuffer);\r
+ Status = gBS->LocateHandle (\r
+ ByProtocol,\r
+ &gEfiBlockIoProtocolGuid,\r
+ NULL,\r
+ &BufferSize,\r
+ HandleBuffer\r
+ );\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
- FreePool(HandleBuffer);\r
- HandleBuffer = AllocateZeroPool(BufferSize);\r
+ FreePool (HandleBuffer);\r
+ HandleBuffer = AllocateZeroPool (BufferSize);\r
if (HandleBuffer == NULL) {\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
- Status = gBS->LocateHandle(\r
- ByProtocol,\r
- &gEfiBlockIoProtocolGuid,\r
- NULL,\r
- &BufferSize,\r
- HandleBuffer);\r
+\r
+ Status = gBS->LocateHandle (\r
+ ByProtocol,\r
+ &gEfiBlockIoProtocolGuid,\r
+ NULL,\r
+ &BufferSize,\r
+ HandleBuffer\r
+ );\r
}\r
- if (EFI_ERROR(Status)) {\r
- SHELL_FREE_NON_NULL(HandleBuffer);\r
+\r
+ if (EFI_ERROR (Status)) {\r
+ SHELL_FREE_NON_NULL (HandleBuffer);\r
return (Status);\r
}\r
\r
// Get the map name(s) for each one.\r
//\r
for ( LoopVar = 0\r
- ; LoopVar < BufferSize / sizeof(EFI_HANDLE)\r
- ; LoopVar ++\r
- ){\r
+ ; LoopVar < BufferSize / sizeof (EFI_HANDLE)\r
+ ; LoopVar++\r
+ )\r
+ {\r
//\r
// Skip any that were already done...\r
//\r
- if (gBS->OpenProtocol(\r
- HandleBuffer[LoopVar],\r
- &gEfiDevicePathProtocolGuid,\r
- NULL,\r
- gImageHandle,\r
- NULL,\r
- EFI_OPEN_PROTOCOL_TEST_PROTOCOL) == EFI_SUCCESS) {\r
- continue;\r
+ if (gBS->OpenProtocol (\r
+ HandleBuffer[LoopVar],\r
+ &gEfiDevicePathProtocolGuid,\r
+ NULL,\r
+ gImageHandle,\r
+ NULL,\r
+ EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
+ ) == EFI_SUCCESS)\r
+ {\r
+ continue;\r
}\r
- if (PerformSingleMappingDelete(Specific,HandleBuffer[LoopVar]) == SHELL_SUCCESS) {\r
- Deleted = TRUE;\r
+\r
+ if (PerformSingleMappingDelete (Specific, HandleBuffer[LoopVar]) == SHELL_SUCCESS) {\r
+ Deleted = TRUE;\r
}\r
}\r
}\r
- SHELL_FREE_NON_NULL(HandleBuffer);\r
+\r
+ SHELL_FREE_NON_NULL (HandleBuffer);\r
if (!Deleted) {\r
return (EFI_NOT_FOUND);\r
}\r
+\r
return (EFI_SUCCESS);\r
}\r
\r
\r
**/\r
SHELL_STATUS\r
-AddMappingFromMapping(\r
- IN CONST CHAR16 *Map,\r
- IN CONST CHAR16 *SName\r
+AddMappingFromMapping (\r
+ IN CONST CHAR16 *Map,\r
+ IN CONST CHAR16 *SName\r
)\r
{\r
CONST EFI_DEVICE_PATH_PROTOCOL *DevPath;\r
CHAR16 *NewSName;\r
RETURN_STATUS StrRetStatus;\r
\r
- NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);\r
+ NewSName = AllocateCopyPool (StrSize (SName) + sizeof (CHAR16), SName);\r
if (NewSName == NULL) {\r
return (SHELL_OUT_OF_RESOURCES);\r
}\r
- if (NewSName[StrLen(NewSName)-1] != L':') {\r
- StrRetStatus = StrnCatS(NewSName, (StrSize(SName) + sizeof(CHAR16))/sizeof(CHAR16), L":", StrLen(L":"));\r
- if (EFI_ERROR(StrRetStatus)) {\r
- FreePool(NewSName);\r
- return ((SHELL_STATUS) (StrRetStatus & (~MAX_BIT)));\r
+\r
+ if (NewSName[StrLen (NewSName)-1] != L':') {\r
+ StrRetStatus = StrnCatS (NewSName, (StrSize (SName) + sizeof (CHAR16))/sizeof (CHAR16), L":", StrLen (L":"));\r
+ if (EFI_ERROR (StrRetStatus)) {\r
+ FreePool (NewSName);\r
+ return ((SHELL_STATUS)(StrRetStatus & (~MAX_BIT)));\r
}\r
}\r
\r
- if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {\r
- FreePool(NewSName);\r
+ if (!IsNumberLetterOnly (NewSName, StrLen (NewSName)-1)) {\r
+ FreePool (NewSName);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
\r
- DevPath = gEfiShellProtocol->GetDevicePathFromMap(Map);\r
+ DevPath = gEfiShellProtocol->GetDevicePathFromMap (Map);\r
if (DevPath == NULL) {\r
- FreePool(NewSName);\r
+ FreePool (NewSName);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
\r
- Status = gEfiShellProtocol->SetMap(DevPath, NewSName);\r
- FreePool(NewSName);\r
- if (EFI_ERROR(Status)) {\r
+ Status = gEfiShellProtocol->SetMap (DevPath, NewSName);\r
+ FreePool (NewSName);\r
+ if (EFI_ERROR (Status)) {\r
return (SHELL_DEVICE_ERROR);\r
}\r
+\r
return (SHELL_SUCCESS);\r
}\r
\r
\r
**/\r
SHELL_STATUS\r
-AddMappingFromHandle(\r
- IN CONST EFI_HANDLE Handle,\r
- IN CONST CHAR16 *SName\r
+AddMappingFromHandle (\r
+ IN CONST EFI_HANDLE Handle,\r
+ IN CONST CHAR16 *SName\r
)\r
{\r
EFI_DEVICE_PATH_PROTOCOL *DevPath;\r
CHAR16 *NewSName;\r
RETURN_STATUS StrRetStatus;\r
\r
- NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);\r
+ NewSName = AllocateCopyPool (StrSize (SName) + sizeof (CHAR16), SName);\r
if (NewSName == NULL) {\r
return (SHELL_OUT_OF_RESOURCES);\r
}\r
- if (NewSName[StrLen(NewSName)-1] != L':') {\r
- StrRetStatus = StrnCatS(NewSName, (StrSize(SName) + sizeof(CHAR16))/sizeof(CHAR16), L":", StrLen(L":"));\r
- if (EFI_ERROR(StrRetStatus)) {\r
- FreePool(NewSName);\r
- return ((SHELL_STATUS) (StrRetStatus & (~MAX_BIT)));\r
+\r
+ if (NewSName[StrLen (NewSName)-1] != L':') {\r
+ StrRetStatus = StrnCatS (NewSName, (StrSize (SName) + sizeof (CHAR16))/sizeof (CHAR16), L":", StrLen (L":"));\r
+ if (EFI_ERROR (StrRetStatus)) {\r
+ FreePool (NewSName);\r
+ return ((SHELL_STATUS)(StrRetStatus & (~MAX_BIT)));\r
}\r
}\r
\r
- if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {\r
- FreePool(NewSName);\r
+ if (!IsNumberLetterOnly (NewSName, StrLen (NewSName)-1)) {\r
+ FreePool (NewSName);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
\r
- Status = gBS->OpenProtocol(\r
- Handle,\r
- &gEfiDevicePathProtocolGuid,\r
- (VOID**)&DevPath,\r
- gImageHandle,\r
- NULL,\r
- EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
- );\r
- if (EFI_ERROR(Status)) {\r
- FreePool(NewSName);\r
+ Status = gBS->OpenProtocol (\r
+ Handle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ (VOID **)&DevPath,\r
+ gImageHandle,\r
+ NULL,\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ FreePool (NewSName);\r
return (SHELL_DEVICE_ERROR);\r
}\r
- Status = gEfiShellProtocol->SetMap(DevPath, NewSName);\r
- FreePool(NewSName);\r
- if (EFI_ERROR(Status)) {\r
+\r
+ Status = gEfiShellProtocol->SetMap (DevPath, NewSName);\r
+ FreePool (NewSName);\r
+ if (EFI_ERROR (Status)) {\r
return (SHELL_DEVICE_ERROR);\r
}\r
+\r
return (SHELL_SUCCESS);\r
}\r
\r
-STATIC CONST SHELL_PARAM_ITEM MapParamList[] = {\r
- {L"-d", TypeValue},\r
- {L"-r", TypeFlag},\r
- {L"-v", TypeFlag},\r
- {L"-c", TypeFlag},\r
- {L"-f", TypeFlag},\r
- {L"-u", TypeFlag},\r
- {L"-t", TypeValue},\r
- {L"-sfo", TypeValue},\r
- {NULL, TypeMax}\r
- };\r
+STATIC CONST SHELL_PARAM_ITEM MapParamList[] = {\r
+ { L"-d", TypeValue },\r
+ { L"-r", TypeFlag },\r
+ { L"-v", TypeFlag },\r
+ { L"-c", TypeFlag },\r
+ { L"-f", TypeFlag },\r
+ { L"-u", TypeFlag },\r
+ { L"-t", TypeValue },\r
+ { L"-sfo", TypeValue },\r
+ { NULL, TypeMax }\r
+};\r
\r
/**\r
The routine issues dummy read for every physical block device to cause\r
VOID\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN HandleCount;\r
- EFI_HANDLE *Handles;\r
- EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
- UINTN Index;\r
+ EFI_STATUS Status;\r
+ UINTN HandleCount;\r
+ EFI_HANDLE *Handles;\r
+ EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
+ UINTN Index;\r
\r
gBS->LocateHandleBuffer (\r
ByProtocol,\r
Status = gBS->HandleProtocol (\r
Handles[Index],\r
&gEfiBlockIoProtocolGuid,\r
- (VOID **) &BlockIo\r
+ (VOID **)&BlockIo\r
);\r
if (!EFI_ERROR (Status)) {\r
if (!BlockIo->Media->LogicalPartition) {\r
CONST CHAR16 *TypeString;\r
UINTN TempStringLength;\r
\r
- ProblemParam = NULL;\r
- Mapping = NULL;\r
- SName = NULL;\r
- ShellStatus = SHELL_SUCCESS;\r
- MapAsHandle = NULL;\r
+ ProblemParam = NULL;\r
+ Mapping = NULL;\r
+ SName = NULL;\r
+ ShellStatus = SHELL_SUCCESS;\r
+ MapAsHandle = NULL;\r
\r
//\r
// initialize the shell lib (we must be in non-auto-init...)\r
//\r
- Status = ShellInitialize();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = ShellInitialize ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
- Status = CommandInit();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = CommandInit ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
// parse the command line\r
//\r
Status = ShellCommandLineParse (MapParamList, &Package, &ProblemParam, TRUE);\r
- if (EFI_ERROR(Status)) {\r
- if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"map", ProblemParam);\r
- FreePool(ProblemParam);\r
+ if (EFI_ERROR (Status)) {\r
+ if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"map", ProblemParam);\r
+ FreePool (ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- ASSERT(FALSE);\r
+ ASSERT (FALSE);\r
}\r
} else {\r
//\r
// check for "-?"\r
//\r
- SfoMode = ShellCommandLineGetFlag(Package, L"-sfo");\r
- ConstMode = ShellCommandLineGetFlag(Package, L"-c");\r
- NormlMode = ShellCommandLineGetFlag(Package, L"-f");\r
- if (ShellCommandLineGetFlag(Package, L"-?")) {\r
- ASSERT(FALSE);\r
- } else if (ShellCommandLineGetRawValue(Package, 3) != NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"map");\r
+ SfoMode = ShellCommandLineGetFlag (Package, L"-sfo");\r
+ ConstMode = ShellCommandLineGetFlag (Package, L"-c");\r
+ NormlMode = ShellCommandLineGetFlag (Package, L"-f");\r
+ if (ShellCommandLineGetFlag (Package, L"-?")) {\r
+ ASSERT (FALSE);\r
+ } else if (ShellCommandLineGetRawValue (Package, 3) != NULL) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"map");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
//\r
// Deleting a map name...\r
//\r
- if (ShellCommandLineGetFlag(Package, L"-d")) {\r
- if ( ShellCommandLineGetFlag(Package, L"-r")\r
- || ShellCommandLineGetFlag(Package, L"-v")\r
- || ConstMode\r
- || NormlMode\r
- || ShellCommandLineGetFlag(Package, L"-u")\r
- || ShellCommandLineGetFlag(Package, L"-t")\r
- ){\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellLevel2HiiHandle, L"map");\r
+ if (ShellCommandLineGetFlag (Package, L"-d")) {\r
+ if ( ShellCommandLineGetFlag (Package, L"-r")\r
+ || ShellCommandLineGetFlag (Package, L"-v")\r
+ || ConstMode\r
+ || NormlMode\r
+ || ShellCommandLineGetFlag (Package, L"-u")\r
+ || ShellCommandLineGetFlag (Package, L"-t")\r
+ )\r
+ {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellLevel2HiiHandle, L"map");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- SName = ShellCommandLineGetValue(Package, L"-d");\r
+ SName = ShellCommandLineGetValue (Package, L"-d");\r
if (SName != NULL) {\r
- Status = PerformMappingDelete(SName);\r
- if (EFI_ERROR(Status)) {\r
+ Status = PerformMappingDelete (SName);\r
+ if (EFI_ERROR (Status)) {\r
if (Status == EFI_ACCESS_DENIED) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");\r
ShellStatus = SHELL_ACCESS_DENIED;\r
} else if (Status == EFI_NOT_FOUND) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, L"map", SName);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, L"map", SName);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);\r
ShellStatus = SHELL_UNSUPPORTED;\r
}\r
}\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"map");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"map");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
}\r
- } else if ( ShellCommandLineGetFlag(Package, L"-r")\r
-// || ShellCommandLineGetFlag(Package, L"-v")\r
- || ConstMode\r
- || NormlMode\r
- || ShellCommandLineGetFlag(Package, L"-u")\r
- || ShellCommandLineGetFlag(Package, L"-t")\r
- ){\r
+ } else if ( ShellCommandLineGetFlag (Package, L"-r")\r
+ // || ShellCommandLineGetFlag(Package, L"-v")\r
+ || ConstMode\r
+ || NormlMode\r
+ || ShellCommandLineGetFlag (Package, L"-u")\r
+ || ShellCommandLineGetFlag (Package, L"-t")\r
+ )\r
+ {\r
ProbeForMediaChange ();\r
- if ( ShellCommandLineGetFlag(Package, L"-r")) {\r
+ if ( ShellCommandLineGetFlag (Package, L"-r")) {\r
//\r
// Do the reset\r
//\r
- Status = ShellCommandCreateInitialMappingsAndPaths();\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);\r
+ Status = ShellCommandCreateInitialMappingsAndPaths ();\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);\r
ShellStatus = SHELL_UNSUPPORTED;\r
}\r
}\r
- if ( ShellStatus == SHELL_SUCCESS && ShellCommandLineGetFlag(Package, L"-u")) {\r
+\r
+ if ((ShellStatus == SHELL_SUCCESS) && ShellCommandLineGetFlag (Package, L"-u")) {\r
//\r
// Do the Update\r
//\r
Status = ShellCommandUpdateMapping ();\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", Status);\r
ShellStatus = SHELL_UNSUPPORTED;\r
}\r
}\r
+\r
if (ShellStatus == SHELL_SUCCESS) {\r
- Param1 = ShellCommandLineGetRawValue(Package, 1);\r
- TypeString = ShellCommandLineGetValue(Package, L"-t");\r
- if (!ConstMode\r
- &&!NormlMode\r
- &&TypeString == NULL\r
- ) {\r
+ Param1 = ShellCommandLineGetRawValue (Package, 1);\r
+ TypeString = ShellCommandLineGetValue (Package, L"-t");\r
+ if ( !ConstMode\r
+ && !NormlMode\r
+ && (TypeString == NULL)\r
+ )\r
+ {\r
//\r
// now do the display...\r
//\r
- ShellStatus = PerformMappingDisplay(\r
- ShellCommandLineGetFlag(Package, L"-v"),\r
- TRUE,\r
- TRUE,\r
- NULL,\r
- SfoMode,\r
- Param1,\r
- TRUE\r
- );\r
+ ShellStatus = PerformMappingDisplay (\r
+ ShellCommandLineGetFlag (Package, L"-v"),\r
+ TRUE,\r
+ TRUE,\r
+ NULL,\r
+ SfoMode,\r
+ Param1,\r
+ TRUE\r
+ );\r
} else {\r
//\r
// now do the display...\r
//\r
- ShellStatus = PerformMappingDisplay2(\r
- ShellCommandLineGetFlag(Package, L"-v"),\r
- ConstMode,\r
- NormlMode,\r
- TypeString,\r
- SfoMode,\r
- Param1\r
- );\r
+ ShellStatus = PerformMappingDisplay2 (\r
+ ShellCommandLineGetFlag (Package, L"-v"),\r
+ ConstMode,\r
+ NormlMode,\r
+ TypeString,\r
+ SfoMode,\r
+ Param1\r
+ );\r
}\r
}\r
} else {\r
//\r
// adding or displaying (there were no flags)\r
//\r
- SName = ShellCommandLineGetRawValue(Package, 1);\r
- Mapping = ShellCommandLineGetRawValue(Package, 2);\r
- if ( SName == NULL\r
- && Mapping == NULL\r
- ){\r
+ SName = ShellCommandLineGetRawValue (Package, 1);\r
+ Mapping = ShellCommandLineGetRawValue (Package, 2);\r
+ if ( (SName == NULL)\r
+ && (Mapping == NULL)\r
+ )\r
+ {\r
//\r
// display only since no flags\r
//\r
- ShellStatus = PerformMappingDisplay(\r
- ShellCommandLineGetFlag(Package, L"-v"),\r
- TRUE,\r
- TRUE,\r
- NULL,\r
- SfoMode,\r
- NULL,\r
- TRUE\r
- );\r
- } else if ( SName == NULL\r
- || Mapping == NULL\r
- ){\r
- //\r
- // Display only the one specified\r
- //\r
- ShellStatus = PerformMappingDisplay(\r
- FALSE,\r
- FALSE,\r
- FALSE,\r
- NULL,\r
- SfoMode,\r
- SName, // note the variable here...\r
- TRUE\r
- );\r
+ ShellStatus = PerformMappingDisplay (\r
+ ShellCommandLineGetFlag (Package, L"-v"),\r
+ TRUE,\r
+ TRUE,\r
+ NULL,\r
+ SfoMode,\r
+ NULL,\r
+ TRUE\r
+ );\r
+ } else if ( (SName == NULL)\r
+ || (Mapping == NULL)\r
+ )\r
+ {\r
+ //\r
+ // Display only the one specified\r
+ //\r
+ ShellStatus = PerformMappingDisplay (\r
+ FALSE,\r
+ FALSE,\r
+ FALSE,\r
+ NULL,\r
+ SfoMode,\r
+ SName, // note the variable here...\r
+ TRUE\r
+ );\r
} else {\r
- if (ShellIsHexOrDecimalNumber(Mapping, TRUE, FALSE)) {\r
- MapAsHandle = ConvertHandleIndexToHandle(ShellStrToUintn(Mapping));\r
+ if (ShellIsHexOrDecimalNumber (Mapping, TRUE, FALSE)) {\r
+ MapAsHandle = ConvertHandleIndexToHandle (ShellStrToUintn (Mapping));\r
} else {\r
MapAsHandle = NULL;\r
}\r
- if (MapAsHandle == NULL && Mapping[StrLen(Mapping)-1] != L':') {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);\r
+\r
+ if ((MapAsHandle == NULL) && (Mapping[StrLen (Mapping)-1] != L':')) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- TempStringLength = StrLen(SName);\r
- if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);\r
+ TempStringLength = StrLen (SName);\r
+ if (!IsNumberLetterOnly (SName, TempStringLength-((SName[TempStringLength-1] == L':') ? 1 : 0))) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
\r
if (ShellStatus == SHELL_SUCCESS) {\r
if (MapAsHandle != NULL) {\r
- ShellStatus = AddMappingFromHandle(MapAsHandle, SName);\r
+ ShellStatus = AddMappingFromHandle (MapAsHandle, SName);\r
} else {\r
- ShellStatus = AddMappingFromMapping(Mapping, SName);\r
+ ShellStatus = AddMappingFromMapping (Mapping, SName);\r
}\r
\r
if (ShellStatus != SHELL_SUCCESS) {\r
switch (ShellStatus) {\r
case SHELL_ACCESS_DENIED:\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");\r
break;\r
case SHELL_INVALID_PARAMETER:\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);\r
break;\r
case SHELL_DEVICE_ERROR:\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NOF), gShellLevel2HiiHandle, L"map", Mapping);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MAP_NOF), gShellLevel2HiiHandle, L"map", Mapping);\r
break;\r
default:\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", ShellStatus|MAX_BIT);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", ShellStatus|MAX_BIT);\r
}\r
} else {\r
//\r
// now do the display...\r
//\r
- ShellStatus = PerformMappingDisplay(\r
- FALSE,\r
- FALSE,\r
- FALSE,\r
- NULL,\r
- SfoMode,\r
- SName,\r
- TRUE\r
- );\r
+ ShellStatus = PerformMappingDisplay (\r
+ FALSE,\r
+ FALSE,\r
+ FALSE,\r
+ NULL,\r
+ SfoMode,\r
+ SName,\r
+ TRUE\r
+ );\r
} // we were sucessful so do an output\r
}\r
} // got a valid map target\r
\r
return (ShellStatus);\r
}\r
-\r
projects / mirror_edk2.git / blobdiff