Common: Kill off duplicate log warning definitions

Also embed the log checks rather than using macros
This commit is contained in:
Lioncash
2014-08-21 20:11:52 -04:00
parent 48f52b9662
commit 690ed8580c
6 changed files with 53 additions and 57 deletions

View File

@ -209,9 +209,8 @@ protected:
GENERIC_LOG(LogType, LogTypes::LINFO, " OutBuffer: 0x%08x (0x%x):",
OutBuffer, OutBufferSize);
#if defined(MAX_LOGLEVEL) && MAX_LOGLEVEL >= INFO_LEVEL
DumpCommands(OutBuffer, OutBufferSize, LogType, Verbosity);
#endif
if (Verbosity >= LogTypes::LOG_LEVELS::LINFO)
DumpCommands(OutBuffer, OutBufferSize, LogType, Verbosity);
}
}
};

View File

@ -710,12 +710,11 @@ static int ParseAttribList(u8* pAttribIDList, u16& _startID, u16& _endID)
u8 seqSize = attribList.Read8(attribOffset); attribOffset++;
u8 typeID = attribList.Read8(attribOffset); attribOffset++;
#if MAX_LOGLEVEL >= DEBUG_LEVEL
_dbg_assert_(WII_IPC_WIIMOTE, sequence == SDP_SEQ8);
(void)seqSize;
#else
(void)sequence, (void)seqSize;
#endif
if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG)
{
_dbg_assert_(WII_IPC_WIIMOTE, sequence == SDP_SEQ8);
(void)seqSize;
}
if (typeID == SDP_UINT32)
{