diff options
Diffstat (limited to 'sys/arch/sparc/dev')
| -rw-r--r-- | sys/arch/sparc/dev/bwtwo.c | 7 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/cgeight.c | 3 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/cgfour.c | 3 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/cgsix.c | 7 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/cgtwo.c | 3 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/cons.c | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/fb.c | 15 |
7 files changed, 25 insertions, 18 deletions
diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c index 78be5d0b885..f629c0cffa4 100644 --- a/sys/arch/sparc/dev/bwtwo.c +++ b/sys/arch/sparc/dev/bwtwo.c @@ -1,3 +1,4 @@ +/* $OpenBSD: bwtwo.c,v 1.13 1996/08/13 08:05:18 downsj Exp $ */ /* $NetBSD: bwtwo.c,v 1.26 1996/04/01 17:30:15 christos Exp $ */ /* @@ -290,13 +291,13 @@ bwtwoattach(parent, self, args) #if defined(SUN4) if (CPU_ISSUN4) { struct eeprom *eep = (struct eeprom *)eeprom_va; - int constype = (fb->fb_flags & FB_PFOUR) ? EE_CONS_P4OPT : - EE_CONS_BW; + int constype = (fb->fb_flags & FB_PFOUR) ? EED_CONS_P4 : + EED_CONS_BW; /* * Assume this is the console if there's no eeprom info * to be found. */ - if (eep == NULL || eep->eeConsole == constype) + if (eep == NULL || eep->ee_diag.eed_console == constype) isconsole = (fbconstty != NULL); else isconsole = 0; diff --git a/sys/arch/sparc/dev/cgeight.c b/sys/arch/sparc/dev/cgeight.c index aea11563608..b720a24744a 100644 --- a/sys/arch/sparc/dev/cgeight.c +++ b/sys/arch/sparc/dev/cgeight.c @@ -1,3 +1,4 @@ +/* $OpenBSD: cgeight.c,v 1.7 1996/08/13 08:05:20 downsj Exp $ */ /* $NetBSD: cgeight.c,v 1.7 1996/04/01 17:29:57 christos Exp $ */ /* @@ -224,7 +225,7 @@ cgeightattach(parent, self, args) * Assume this is the console if there's no eeprom info * to be found. */ - if (eep == NULL || eep->eeConsole == EE_CONS_P4OPT) + if (eep == NULL || eep->ee_diag.eed_console == EED_CONS_P4) isconsole = (fbconstty != NULL); } diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c index d5dde467a9c..279d1cb0fea 100644 --- a/sys/arch/sparc/dev/cgfour.c +++ b/sys/arch/sparc/dev/cgfour.c @@ -1,3 +1,4 @@ +/* $OpenBSD: cgfour.c,v 1.7 1996/08/13 08:05:21 downsj Exp $ */ /* $NetBSD: cgfour.c,v 1.7 1996/04/01 17:29:58 christos Exp $ */ /* @@ -228,7 +229,7 @@ cgfourattach(parent, self, args) * Assume this is the console if there's no eeprom info * to be found. */ - if (eep == NULL || eep->eeConsole == EE_CONS_P4OPT) + if (eep == NULL || eep->ee_diag.eed_console == EED_CONS_P4) isconsole = (fbconstty != NULL); } diff --git a/sys/arch/sparc/dev/cgsix.c b/sys/arch/sparc/dev/cgsix.c index 259024c7da6..dd967ebf558 100644 --- a/sys/arch/sparc/dev/cgsix.c +++ b/sys/arch/sparc/dev/cgsix.c @@ -1,3 +1,4 @@ +/* $OpenBSD: cgsix.c,v 1.7 1996/08/13 08:05:22 downsj Exp $ */ /* $NetBSD: cgsix.c,v 1.25 1996/04/01 17:30:00 christos Exp $ */ /* @@ -291,13 +292,13 @@ cgsixattach(parent, self, args) #if defined(SUN4) if (CPU_ISSUN4) { struct eeprom *eep = (struct eeprom *)eeprom_va; - int constype = (fb->fb_flags & FB_PFOUR) ? EE_CONS_P4OPT : - EE_CONS_COLOR; + int constype = (fb->fb_flags & FB_PFOUR) ? EED_CONS_P4 : + EED_CONS_COLOR; /* * Assume this is the console if there's no eeprom info * to be found. */ - if (eep == NULL || eep->eeConsole == constype) + if (eep == NULL || eep->ee_diag.eed_console == constype) isconsole = (fbconstty != NULL); else isconsole = 0; diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c index 243c7cde111..8c5dcc8f11a 100644 --- a/sys/arch/sparc/dev/cgtwo.c +++ b/sys/arch/sparc/dev/cgtwo.c @@ -1,3 +1,4 @@ +/* $OpenBSD: cgtwo.c,v 1.10 1996/08/13 08:05:23 downsj Exp $ */ /* $NetBSD: cgtwo.c,v 1.16 1996/05/18 12:19:14 mrg Exp $ */ /* @@ -206,7 +207,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; diff --git a/sys/arch/sparc/dev/cons.c b/sys/arch/sparc/dev/cons.c index 08df311233b..11a1606bae8 100644 --- a/sys/arch/sparc/dev/cons.c +++ b/sys/arch/sparc/dev/cons.c @@ -1,3 +1,4 @@ +/* $OpenBSD: cons.c,v 1.5 1996/08/13 08:05:24 downsj Exp $ */ /* $NetBSD: cons.c,v 1.23.4.1 1996/06/02 09:07:53 mrg Exp $ */ /* @@ -309,8 +310,8 @@ cnopen(dev, flag, mode, p) struct eeprom *ep = (struct eeprom *)eeprom_va; if (ep) { - rows = (u_short)ep->eeTtyRows; - cols = (u_short)ep->eeTtyCols; + rows = (u_short)ep->ee_diag.eed_rowsize; + cols = (u_short)ep->ee_diag.eed_colsize; } } firstopen = 0; diff --git a/sys/arch/sparc/dev/fb.c b/sys/arch/sparc/dev/fb.c index 836bc7dbdad..37bf3b10be7 100644 --- a/sys/arch/sparc/dev/fb.c +++ b/sys/arch/sparc/dev/fb.c @@ -1,3 +1,4 @@ +/* $OpenBSD: fb.c,v 1.9 1996/08/13 08:05:25 downsj Exp $ */ /* $NetBSD: fb.c,v 1.18 1996/04/01 17:29:54 christos Exp $ */ /* @@ -298,23 +299,23 @@ fb_setsize(fb, depth, def_width, def_height, node, bustype) break; } } else if (eep != NULL) { - switch (eep->eeScreenSize) { - case EE_SCR_1152X900: + switch (eep->ee_diag.eed_scrsize) { + case EED_SCR_1152X900: fb->fb_type.fb_width = 1152; fb->fb_type.fb_height = 900; break; - case EE_SCR_1024X1024: + case EED_SCR_1024X1024: fb->fb_type.fb_width = 1024; fb->fb_type.fb_height = 1024; break; - case EE_SCR_1600X1280: + case EED_SCR_1600X1280: fb->fb_type.fb_width = 1600; fb->fb_type.fb_height = 1280; break; - case EE_SCR_1440X1440: + case EED_SCR_1440X1440: fb->fb_type.fb_width = 1440; fb->fb_type.fb_height = 1440; break; @@ -412,8 +413,8 @@ fbrcons_init(fb) rc->rc_maxcol = 80; rc->rc_maxrow = 34; } else { - rc->rc_maxcol = eep->eeTtyCols; - rc->rc_maxrow = eep->eeTtyRows; + rc->rc_maxcol = eep->ee_diag.eed_colsize; + rc->rc_maxrow = eep->ee_diag.eed_rowsize; } } #endif /* SUN4 */ |