diff options
Diffstat (limited to 'sys/arch/vax')
| -rw-r--r-- | sys/arch/vax/vax/locore.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/sys/arch/vax/vax/locore.c b/sys/arch/vax/vax/locore.c index 8df5af36832..4e08c6246da 100644 --- a/sys/arch/vax/vax/locore.c +++ b/sys/arch/vax/vax/locore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.c,v 1.29 2003/11/10 21:05:06 miod Exp $ */ +/* $OpenBSD: locore.c,v 1.30 2006/07/30 18:31:49 miod Exp $ */ /* $NetBSD: locore.c,v 1.43 2000/03/26 11:39:45 ragge Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. @@ -126,10 +126,17 @@ start(struct rpb *prpb) case VAX_BTYP_420: /* They are very similar */ dep_call = &ka410_calls; strlcat(cpu_model, "3100", sizeof cpu_model); - if (((vax_siedata >> 8) & 0xff) == 1) - strlcat(cpu_model, "/m{38,48}", sizeof cpu_model); - else if (((vax_siedata >> 8) & 0xff) == 0) + switch ((vax_siedata >> 8) & 0xff) { + case 0x00: strlcat(cpu_model, "/m{30,40}", sizeof cpu_model); + break; + case 0x01: + strlcat(cpu_model, "/m{38,48}", sizeof cpu_model); + break; + case 0x02: + strlcat(cpu_model, "/m{10,20}{,e}", sizeof cpu_model); + break; + } break; case VAX_BTYP_410: @@ -146,7 +153,7 @@ start(struct rpb *prpb) #if VAX46 case VAX_BTYP_46: dep_call = &ka46_calls; - switch(vax_siedata & 0xFF) { + switch(vax_siedata & 0xff) { case VAX_VTYP_47: strlcpy(cpu_model, "MicroVAX 3100 m80", sizeof cpu_model); break; @@ -161,7 +168,7 @@ start(struct rpb *prpb) #if VAX48 case VAX_BTYP_48: dep_call = &ka48_calls; - switch((vax_siedata >> 8) & 0xFF) { + switch ((vax_siedata >> 8) & 0xff) { case VAX_STYP_45: strlcpy(cpu_model, "MicroVAX 3100/m{30,40}", sizeof cpu_model); break; @@ -182,7 +189,7 @@ start(struct rpb *prpb) #if VAX53 case VAX_BTYP_1303: dep_call = &ka53_calls; - switch((vax_siedata >> 8) & 0xFF) { + switch ((vax_siedata >> 8) & 0xff) { case VAX_STYP_50: strlcpy(cpu_model, "MicroVAX 3100 model 85 or 90", sizeof cpu_model); break; @@ -245,7 +252,7 @@ start(struct rpb *prpb) case VAX_BTYP_1301: dep_call = &ka680_calls; strlcpy(cpu_model,"VAX 4000 ", sizeof cpu_model); - switch((vax_siedata & 0xff00) >> 8) { + switch ((vax_siedata >> 8) & 0xff) { case VAX_STYP_675: strlcat(cpu_model,"400", sizeof cpu_model); break; @@ -262,7 +269,7 @@ start(struct rpb *prpb) case VAX_BTYP_1305: dep_call = &ka680_calls; strlcpy(cpu_model,"VAX 4000 ", sizeof cpu_model); - switch((vax_siedata & 0xff00) >> 8) { + switch ((vax_siedata >> 8) & 0xff) { case VAX_STYP_681: strlcat(cpu_model,"500A", sizeof cpu_model); break; |