-//\r
-// It is expected that a parameter for the following two macros is of type UINTN.\r
-// Be careful to pass a UINT64 parameter because 32-bit build break may happen\r
-// if << or >> shift operations are performed on a 64-bit integer with 32-bit C compiler.\r
-//\r
-#define EFI_SIZE_TO_PAGES(a) (((a) >> EFI_PAGE_SHIFT) + (((a) & EFI_PAGE_MASK) ? 1 : 0))\r
-#define EFI_PAGES_TO_SIZE(a) ( (a) << EFI_PAGE_SHIFT)\r
+/**\r
+ Macro that converts a size, in bytes, to a number of EFI_PAGESs.\r
+\r
+ @param Size A size in bytes. This parameter is assumed to be type UINTN. \r
+ Passing in a parameter that is larger than UINTN may produce \r
+ unexpected results.\r
+\r
+ @return The number of EFI_PAGESs associated with the number of bytes specified\r
+ by Size.\r
+\r
+**/\r
+#define EFI_SIZE_TO_PAGES(Size) (((Size) >> EFI_PAGE_SHIFT) + (((Size) & EFI_PAGE_MASK) ? 1 : 0))\r
+\r
+/**\r
+ Macro that converts a number of EFI_PAGEs to a size in bytes.\r
+\r
+ @param Pages The number of EFI_PAGES. This parameter is assumed to be \r
+ type UINTN. Passing in a parameter that is larger than \r
+ UINTN may produce unexpected results.\r
+\r
+ @return The number of bytes associated with the number of EFI_PAGEs specified \r
+ by Pages.\r
+ \r
+**/\r
+#define EFI_PAGES_TO_SIZE(Pages) ((Pages) << EFI_PAGE_SHIFT)\r