diff options
| -rw-r--r-- | drivers/video/newport_con.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/video/newport_con.c b/drivers/video/newport_con.c index 96ef612f1..e35951b82 100644 --- a/drivers/video/newport_con.c +++ b/drivers/video/newport_con.c @@ -153,9 +153,9 @@ void newport_reset (void) for(i = 0; i < 128; i++) { newport_bfwait(); if (i == 92 || i == 94) - npregs->set.dcbdata0.hwords.s1 = 0xff00; + npregs->set.dcbdata0.byshort.s1 = 0xff00; else - npregs->set.dcbdata0.hwords.s1 = 0x0000; + npregs->set.dcbdata0.byshort.s1 = 0x0000; } newport_init_cmap(); @@ -163,10 +163,10 @@ void newport_reset (void) /* turn off popup plane */ npregs->set.dcbmode = (DCB_XMAP0 | R_DCB_XMAP9_PROTOCOL | XM9_CRS_CONFIG | NPORT_DMODE_W1); - npregs->set.dcbdata0.bytes.b3 &= ~XM9_PUPMODE; + npregs->set.dcbdata0.bybytes.b3 &= ~XM9_PUPMODE; npregs->set.dcbmode = (DCB_XMAP1 | R_DCB_XMAP9_PROTOCOL | XM9_CRS_CONFIG | NPORT_DMODE_W1); - npregs->set.dcbdata0.bytes.b3 &= ~XM9_PUPMODE; + npregs->set.dcbdata0.bybytes.b3 &= ~XM9_PUPMODE; topscan = 0; npregs->cset.topscan = 0x3ff; @@ -192,7 +192,7 @@ void newport_get_screensize(void) NPORT_DMODE_W2 | VC2_PROTOCOL); for(i = 0; i < 128; i++) { newport_bfwait(); - linetable[i] = npregs->set.dcbdata0.hwords.s1; + linetable[i] = npregs->set.dcbdata0.byshort.s1; } newport_xsize = newport_ysize = 0; @@ -203,12 +203,12 @@ void newport_get_screensize(void) NPORT_DMODE_W2 | VC2_PROTOCOL); do { newport_bfwait(); - treg = npregs->set.dcbdata0.hwords.s1; + treg = npregs->set.dcbdata0.byshort.s1; if ((treg & 1) == 0) cols += (treg >> 7) & 0xfe; if ((treg & 0x80) == 0) { newport_bfwait(); - treg = npregs->set.dcbdata0.hwords.s1; + treg = npregs->set.dcbdata0.byshort.s1; } } while ((treg & 0x8000) == 0); if (cols) { @@ -231,18 +231,18 @@ static void newport_get_revisions(void) unsigned int bt445_rev; unsigned int bitplanes; - rex3_rev = npregs->cset.stat & NPORT_STAT_VERS; + rex3_rev = npregs->cset.status & NPORT_STAT_VERS; npregs->set.dcbmode = (DCB_CMAP0 | NCMAP_PROTOCOL | NCMAP_REGADDR_RREG | NPORT_DMODE_W1); - tmp = npregs->set.dcbdata0.bytes.b3; + tmp = npregs->set.dcbdata0.bybytes.b3; cmap_rev = tmp & 7; board_rev = (tmp >> 4) & 7; bitplanes = ((board_rev > 1) && (tmp & 0x80)) ? 8 : 24; npregs->set.dcbmode = (DCB_CMAP1 | NCMAP_PROTOCOL | NCMAP_REGADDR_RREG | NPORT_DMODE_W1); - tmp = npregs->set.dcbdata0.bytes.b3; + tmp = npregs->set.dcbdata0.bybytes.b3; if ((tmp & 7) < cmap_rev) cmap_rev = (tmp & 7); @@ -250,14 +250,14 @@ static void newport_get_revisions(void) npregs->set.dcbmode = (DCB_XMAP0 | R_DCB_XMAP9_PROTOCOL | XM9_CRS_REVISION | NPORT_DMODE_W1); - xmap9_rev = npregs->set.dcbdata0.bytes.b3 & 7; + xmap9_rev = npregs->set.dcbdata0.bybytes.b3 & 7; npregs->set.dcbmode = (DCB_BT445 | BT445_PROTOCOL | BT445_CSR_ADDR_REG | NPORT_DMODE_W1); - npregs->set.dcbdata0.bytes.b3 = BT445_REVISION_REG; + npregs->set.dcbdata0.bybytes.b3 = BT445_REVISION_REG; npregs->set.dcbmode = (DCB_BT445 | BT445_PROTOCOL | BT445_CSR_REVISION | NPORT_DMODE_W1); - bt445_rev = (npregs->set.dcbdata0.bytes.b3 >> 4) - 0x0a; + bt445_rev = (npregs->set.dcbdata0.bybytes.b3 >> 4) - 0x0a; #define L(a) (char)('A'+(a)) printk ("NG1: Revision %d, %d bitplanes, REX3 revision %c, VC2 revision %c, xmap9 revision %c, cmap revision %c, bt445 revision %c\n", @@ -286,7 +286,7 @@ __initfunc(static const char *newport_startup(void)) return NULL; } - p->set.xstarti = TESTVAL; if(p->set._xstart.i != XSTI_TO_FXSTART(TESTVAL)) { + p->set.xstarti = TESTVAL; if(p->set._xstart.word != XSTI_TO_FXSTART(TESTVAL)) { return NULL; } |