[edk2,edk2-staging,13/20] IntelUndiPkg/XGigUndiDxe: drop locally defined ASSERT() macro

Message ID 20181115023353.20159-14-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • IntelUndiPkg/XGigUndiDxe: fix GCC / ARM build issues
Related show

Commit Message

Ard Biesheuvel Nov. 15, 2018, 2:33 a.m.
Drop the locally defined ASSERT() macro and include DebugLib instead.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h | 22 +-------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

-- 
2.17.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h
index e324b0539782..aa3b3543cb79 100644
--- a/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h
+++ b/IntelUndiPkg/XGigUndiDxe/ixgbe_osdep.h
@@ -41,6 +41,7 @@  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <Base.h>
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
 #include <Library/PrintLib.h>
 
 #define CHAR            CHAR8
@@ -219,26 +220,6 @@  IxgbeReverseDword (
 
 typedef BOOLEAN boolean_t;
 
-#if 0
-#undef ASSERT
-#define ASSERT(x)
-#define DEBUGOUT  Aprint
-#define DEBUGOUT1 Aprint
-#define DEBUGOUT2 Aprint
-#define DEBUGOUT3 Aprint
-#define DEBUGOUT6 Aprint
-#define DEBUGOUT7 Aprint
-#else /* 1 */
-#undef ASSERT
-
-/** ASSERT macro left blank
-
-   @param[in]   x    Assert condition
-   
-   @return   None
-**/
-#define ASSERT(x)
-
 /** Macro wrapper for shared code DEBUGOUT statement,
    blank here
 
@@ -311,7 +292,6 @@  typedef BOOLEAN boolean_t;
    @retval   None
 **/
 #define DEBUGOUT7(s, a, b, c, d, e, f, g)
-#endif /* 0 */
 
 /** Macro wrapper for shared code EWARN macro,
    blank here