revert some define to usb_common.h
Correct macro definition