| .. | .. |
|---|
| 394 | 394 | (ch & 0x00ff) | attr; |
|---|
| 395 | 395 | } |
|---|
| 396 | 396 | |
|---|
| 397 | | -static u8 mdacon_build_attr(struct vc_data *c, u8 color, u8 intensity, |
|---|
| 398 | | - u8 blink, u8 underline, u8 reverse, u8 italic) |
|---|
| 397 | +static u8 mdacon_build_attr(struct vc_data *c, u8 color, |
|---|
| 398 | + enum vc_intensity intensity, |
|---|
| 399 | + bool blink, bool underline, bool reverse, |
|---|
| 400 | + bool italic) |
|---|
| 399 | 401 | { |
|---|
| 400 | 402 | /* The attribute is just a bit vector: |
|---|
| 401 | 403 | * |
|---|
| .. | .. |
|---|
| 405 | 407 | * Bit 7 : blink |
|---|
| 406 | 408 | */ |
|---|
| 407 | 409 | |
|---|
| 408 | | - return (intensity & 3) | |
|---|
| 409 | | - ((underline & 1) << 2) | |
|---|
| 410 | | - ((reverse & 1) << 3) | |
|---|
| 411 | | - (!!italic << 4) | |
|---|
| 412 | | - ((blink & 1) << 7); |
|---|
| 410 | + return (intensity & VCI_MASK) | |
|---|
| 411 | + (underline << 2) | |
|---|
| 412 | + (reverse << 3) | |
|---|
| 413 | + (italic << 4) | |
|---|
| 414 | + (blink << 7); |
|---|
| 413 | 415 | } |
|---|
| 414 | 416 | |
|---|
| 415 | 417 | static void mdacon_invert_region(struct vc_data *c, u16 *p, int count) |
|---|
| .. | .. |
|---|
| 488 | 490 | return; |
|---|
| 489 | 491 | } |
|---|
| 490 | 492 | |
|---|
| 491 | | - mda_set_cursor(c->vc_y*mda_num_columns*2 + c->vc_x*2); |
|---|
| 493 | + mda_set_cursor(c->state.y * mda_num_columns * 2 + c->state.x * 2); |
|---|
| 492 | 494 | |
|---|
| 493 | | - switch (c->vc_cursor_type & 0x0f) { |
|---|
| 495 | + switch (CUR_SIZE(c->vc_cursor_type)) { |
|---|
| 494 | 496 | |
|---|
| 495 | 497 | case CUR_LOWER_THIRD: mda_set_cursor_size(10, 13); break; |
|---|
| 496 | 498 | case CUR_LOWER_HALF: mda_set_cursor_size(7, 13); break; |
|---|