Merge all the message macros into AP6210_xxx macros...