diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
| commit | 04b244dd661c24b510ac22936decfc0972d202d3 (patch) | |
| tree | 3ebfef98afc303fddf3415d6fba64e8682f495e8 /usr/src/uts/i86pc/sys/boot_console.h | |
| parent | eac250589e41f1b705e1b7427b02b3379aac9f9e (diff) | |
| parent | a69187741b83640a90dd8586195456dd50c016a8 (diff) | |
| download | illumos-joyent-20120517.tar.gz | |
Merge git.joyent.com:illumos-joyent20120517
Diffstat (limited to 'usr/src/uts/i86pc/sys/boot_console.h')
| -rw-r--r-- | usr/src/uts/i86pc/sys/boot_console.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr/src/uts/i86pc/sys/boot_console.h b/usr/src/uts/i86pc/sys/boot_console.h index 912e2010d9..b2fcf98f97 100644 --- a/usr/src/uts/i86pc/sys/boot_console.h +++ b/usr/src/uts/i86pc/sys/boot_console.h @@ -19,6 +19,8 @@ * CDDL HEADER END */ /* + * Copyright (c) 2012 Gary Mills + * * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,8 +38,8 @@ extern "C" { #define CONS_INVALID -1 #define CONS_SCREEN_TEXT 0 -#define CONS_TTYA 1 -#define CONS_TTYB 2 +#define CONS_TTY 1 +#define CONS_XXX 2 /* Unused */ #define CONS_USBSER 3 #define CONS_HYPERVISOR 4 #define CONS_SCREEN_GRAPHICS 5 @@ -51,6 +53,8 @@ extern void kb_init(void); extern int kb_getchar(void); extern int kb_ischar(void); +extern int boot_console_type(int *); + extern void bcons_init(char *); extern void bcons_putchar(int); extern int bcons_getchar(void); @@ -63,8 +67,6 @@ extern boolean_t bcons_hypervisor_redirect(void); extern void bcons_device_change(int); #endif /* !_BOOT */ -extern int console; - #ifdef __cplusplus } #endif |