|
@@ -104,10 +104,14 @@ struct fbcon_ops {
|
|
#define attr_blink(s) \
|
|
#define attr_blink(s) \
|
|
((s) & 0x8000)
|
|
((s) & 0x8000)
|
|
|
|
|
|
-#define mono_col(info) \
|
|
|
|
- (~(0xfff << (max((info)->var.green.length, \
|
|
|
|
- max((info)->var.red.length, \
|
|
|
|
- (info)->var.blue.length)))) & 0xff)
|
|
|
|
|
|
+
|
|
|
|
+static inline int mono_col(const struct fb_info *info)
|
|
|
|
+{
|
|
|
|
+ __u32 max_len;
|
|
|
|
+ max_len = max(info->var.green.length, info->var.red.length);
|
|
|
|
+ max_len = max(info->var.blue.length, max_len);
|
|
|
|
+ return ~(0xfff << (max_len & 0xff));
|
|
|
|
+}
|
|
|
|
|
|
static inline int attr_col_ec(int shift, struct vc_data *vc,
|
|
static inline int attr_col_ec(int shift, struct vc_data *vc,
|
|
struct fb_info *info, int is_fg)
|
|
struct fb_info *info, int is_fg)
|