.. | .. |
---|
240 | 240 | struct fbcon_ops *ops = info->fbcon_par; |
---|
241 | 241 | unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff; |
---|
242 | 242 | int w = DIV_ROUND_UP(vc->vc_font.width, 8), c; |
---|
243 | | - int y = real_y(ops->p, vc->vc_y); |
---|
244 | | - int attribute, use_sw = (vc->vc_cursor_type & 0x10); |
---|
| 243 | + int y = real_y(ops->p, vc->state.y); |
---|
| 244 | + int attribute, use_sw = vc->vc_cursor_type & CUR_SW; |
---|
245 | 245 | int err = 1; |
---|
246 | 246 | char *src; |
---|
247 | 247 | |
---|
.. | .. |
---|
277 | 277 | cursor.set |= FB_CUR_SETCMAP; |
---|
278 | 278 | } |
---|
279 | 279 | |
---|
280 | | - if ((ops->cursor_state.image.dx != (vc->vc_font.width * vc->vc_x)) || |
---|
| 280 | + if ((ops->cursor_state.image.dx != (vc->vc_font.width * vc->state.x)) || |
---|
281 | 281 | (ops->cursor_state.image.dy != (vc->vc_font.height * y)) || |
---|
282 | 282 | ops->cursor_reset) { |
---|
283 | | - ops->cursor_state.image.dx = vc->vc_font.width * vc->vc_x; |
---|
| 283 | + ops->cursor_state.image.dx = vc->vc_font.width * vc->state.x; |
---|
284 | 284 | ops->cursor_state.image.dy = vc->vc_font.height * y; |
---|
285 | 285 | cursor.set |= FB_CUR_SETPOS; |
---|
286 | 286 | } |
---|
.. | .. |
---|
316 | 316 | ops->p->cursor_shape = vc->vc_cursor_type; |
---|
317 | 317 | cursor.set |= FB_CUR_SETSHAPE; |
---|
318 | 318 | |
---|
319 | | - switch (ops->p->cursor_shape & CUR_HWMASK) { |
---|
| 319 | + switch (CUR_SIZE(ops->p->cursor_shape)) { |
---|
320 | 320 | case CUR_NONE: |
---|
321 | 321 | cur_height = 0; |
---|
322 | 322 | break; |
---|