diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2010-03-03 12:25:10 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2010-03-03 12:25:10 +0000 |
| commit | 0b4f59c33f4ad77c8c270f9521302f6cb0290b78 (patch) | |
| tree | 6ade2f985e7d4938b3cd374a8a7a9260e2da4ca3 /sys/arch/mips64 | |
| parent | 966ff3a8f0e66279ecaf1ee2b9752aa09808f8cb (diff) | |
Store ARCBios variables before machine specific setup is performed and
make console selection on a per machine basis. Whilst here store the
keyboard layout ('keybd') and graphics state ('gfx') variables for
future use.
ok miod@
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/include/arcbios.h | 6 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/arcbios.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/mips64/include/arcbios.h b/sys/arch/mips64/include/arcbios.h index 85480a913d7..acaaef10505 100644 --- a/sys/arch/mips64/include/arcbios.h +++ b/sys/arch/mips64/include/arcbios.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arcbios.h,v 1.13 2009/12/07 18:56:27 miod Exp $ */ +/* $OpenBSD: arcbios.h,v 1.14 2010/03/03 12:25:09 jsing Exp $ */ /*- * Copyright (c) 1996 M. Warner Losh. All rights reserved. * @@ -403,7 +403,9 @@ typedef struct arc_param_blk_64 extern int bios_is_32bit; extern char bios_enaddr[20]; -extern char bios_console[10]; +extern char bios_console[30]; +extern char bios_graphics[6]; +extern char bios_keyboard[6]; int bios_getchar(void); void bios_putchar(char); diff --git a/sys/arch/mips64/mips64/arcbios.c b/sys/arch/mips64/mips64/arcbios.c index a477a157069..94f1e74a134 100644 --- a/sys/arch/mips64/mips64/arcbios.c +++ b/sys/arch/mips64/mips64/arcbios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arcbios.c,v 1.28 2009/12/07 19:39:57 miod Exp $ */ +/* $OpenBSD: arcbios.c,v 1.29 2010/03/03 12:25:09 jsing Exp $ */ /*- * Copyright (c) 1996 M. Warner Losh. All rights reserved. * Copyright (c) 1996-2004 Opsycon AB. All rights reserved. @@ -50,7 +50,9 @@ int bios_is_32bit; */ char bios_enaddr[20] = "ff:ff:ff:ff:ff:ff"; -char bios_console[10]; /* Primary console. */ +char bios_console[30]; /* Primary console. */ +char bios_graphics[6]; /* Graphics state. */ +char bios_keyboard[6]; /* Keyboard layout. */ extern int physmem; /* Total physical memory size */ extern int rsvdmem; /* Total reserved memory size */ |