diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-19 12:51:54 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-19 12:51:54 +0000 |
| commit | 26cc0db1f3094e1ea37a1422fa6e4e80865e12e0 (patch) | |
| tree | 456d3d0b3afbd1c169cc31fadc9dd18e92fde236 /sys/arch/sparc/dev/cgtwo.c | |
| parent | a7a5a186672eb7551af3e7f9c8077ce66d124a9c (diff) | |
use new eeprom.h
Diffstat (limited to 'sys/arch/sparc/dev/cgtwo.c')
| -rw-r--r-- | sys/arch/sparc/dev/cgtwo.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c index 87f1e0579ce..15c9ee2eaed 100644 --- a/sys/arch/sparc/dev/cgtwo.c +++ b/sys/arch/sparc/dev/cgtwo.c @@ -198,7 +198,7 @@ cgtwoattach(parent, self, args) * Assume this is the console if there's no eeprom info * to be found. */ - if (eep == NULL || eep->eeConsole == EE_CONS_COLOR) + if (eep == NULL || eep->ee_diag.eed_console == EED_CONS_COLOR) isconsole = (fbconstty != NULL); else isconsole = 0; @@ -212,8 +212,7 @@ cgtwoattach(parent, self, args) if ((sc->sc_fb.fb_pixels = ca->ca_ra.ra_vaddr) == NULL && isconsole) { /* this probably cannot happen, but what the heck */ sc->sc_fb.fb_pixels = mapiodev(sc->sc_phys + CG2_PIXMAP_OFF, - CG2_PIXMAP_SIZE, - ca->ca_bustype); + CG2_PIXMAP_SIZE, ca->ca_bustype); } #ifndef offsetof #define offsetof(type, member) ((size_t)(&((type *)0)->member)) @@ -221,13 +220,13 @@ cgtwoattach(parent, self, args) sc->sc_reg = (volatile struct cg2statusreg *) mapiodev((caddr_t)sc->sc_phys + - CG2_ROPMEM_OFF + offsetof(struct cg2fb, status.reg), - sizeof(struct cg2statusreg), ca->ca_bustype); + CG2_ROPMEM_OFF + offsetof(struct cg2fb, status.reg), + sizeof(struct cg2statusreg), ca->ca_bustype); sc->sc_cmap = (volatile u_short *) mapiodev((caddr_t)sc->sc_phys + - CG2_ROPMEM_OFF + offsetof(struct cg2fb, redmap[0]), - 3 * CG2_CMSIZE, ca->ca_bustype); + CG2_ROPMEM_OFF + offsetof(struct cg2fb, redmap[0]), + 3 * CG2_CMSIZE, ca->ca_bustype); if (isconsole) { printf(" (console)\n"); |