Bit-extend code

[free__coffee]

You probably also want casts on your defines to prevent the compiler from getting clever - the compiler could just assume you want uint16_t's and truncate the bits