-#define ATTR_NARROW 0x80000000UL
-#define ATTR_WIDE 0x40000000UL
-#define ATTR_BOLD 0x04000000UL
-#define ATTR_UNDER 0x08000000UL
-#define ATTR_REVERSE 0x10000000UL
-#define ATTR_BLINK 0x20000000UL
-#define ATTR_FGMASK 0x001F0000UL
-#define ATTR_BGMASK 0x03E00000UL
-#define ATTR_COLOURS 0x03FF0000UL
-#define ATTR_FGSHIFT 16
-#define ATTR_BGSHIFT 21
-
-#define ATTR_DEFAULT 0x01280000UL /* bg 9, fg 8 */
-#define ATTR_DEFFG 0x00080000UL
-#define ATTR_DEFBG 0x01200000UL
-#define ERASE_CHAR (ATTR_DEFAULT | ATTR_ASCII | ' ')
-#define ATTR_MASK 0xFFFFFF00UL
-#define CHAR_MASK 0x000000FFUL
+#define ATTR_NARROW 0x8000U
+#define ATTR_WIDE 0x4000U
+#define ATTR_BOLD 0x0400U
+#define ATTR_UNDER 0x0800U
+#define ATTR_REVERSE 0x1000U
+#define ATTR_BLINK 0x2000U
+#define ATTR_FGMASK 0x001FU
+#define ATTR_BGMASK 0x03E0U
+#define ATTR_COLOURS 0x03FFU
+#define ATTR_FGSHIFT 0
+#define ATTR_BGSHIFT 5
+
+#define ATTR_DEFAULT 0x0128U /* bg 9, fg 8 */
+#define ATTR_DEFFG 0x0008U
+#define ATTR_DEFBG 0x0120U