diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-04 12:57:36 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-04 12:57:36 +0000 |
| commit | b156585baf970b2e42dc1e9dc920784b85983ab1 (patch) | |
| tree | 78fa97604d7a4b06d50250192c448045ed8d608a /usr/src/uts | |
| parent | 1678a6d4908c55f0db8485ea4211312a3e143e60 (diff) | |
| parent | 022bfefbcaaea5feb95b93e32451de7e29dbcb58 (diff) | |
| download | illumos-joyent-b156585baf970b2e42dc1e9dc920784b85983ab1.tar.gz | |
[illumos-gate merge]
commit 022bfefbcaaea5feb95b93e32451de7e29dbcb58
10324 topo_usb_parse_port_type() gets value check wrong
commit b1f626711b7485860ff0a6eb5e6edc949958f605
10130 smatch fixes for usr/src/cmd/fm
commit 8e4148b01b8967e1a9ff6fdb6c8a2baff7363432
10115 ses topo module needs smatch fixes
commit 0627591eb8261c55a48bc3b17ff3dfe0d0568939
10114 fmev_proxy_cb() doesn't need inval checks
commit f1c3c46914bb8b71335ee0d065b1a639f9caad89
10113 fmd_adm_xprt_f should return void
commit 29c3ebdbcfe9e0ec2a1d2e45961c53e573b9d3ab
10102 libnvfru needs smatch fixes
commit f6b3f249ec2ef9f94d38d7a7c1b4fcbe2e891933
9776 mandoc(1) does not support an ERRORS section for 7I man pages
9778 Convert agpgart_io(7I) to mandoc
9779 Convert audio(7I) to mandoc
9780 Convert cdio(7I) to mandoc
9777 Convert dsp(7I) to mandoc
commit 1bc1e552b353b59f21e7697fe988ec2d86d09d4b
10325 sparc also needs plat_diagpath for consconfig_dacf
commit 406d4d29fb52df8ec016b6e9a83e030013fa1514
10333 cw: error: comparison between pointer and zero character constant
Diffstat (limited to 'usr/src/uts')
| -rw-r--r-- | usr/src/uts/sparc/io/consplat.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/usr/src/uts/sparc/io/consplat.c b/usr/src/uts/sparc/io/consplat.c index 6ca09e0b3a..41b3aaa117 100644 --- a/usr/src/uts/sparc/io/consplat.c +++ b/usr/src/uts/sparc/io/consplat.c @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright 2019 Peter Tribble. + */ /* * isa-specific console configuration routines @@ -112,10 +114,10 @@ plat_fbpath(void) char * plat_mousepath(void) { - static char *mousepath = NULL; - static char buf[MAXPATHLEN]; - char *path, *p, *q; - major_t zs_major, kb_major; + static char *mousepath = NULL; + static char buf[MAXPATHLEN]; + char *path, *p, *q; + major_t zs_major, kb_major; if (mousepath != NULL) return (mousepath); @@ -196,6 +198,15 @@ plat_stdoutpath(void) return (outpath); } +/* + * stub definition for consconfig_dacf + */ +char * +plat_diagpath(void) +{ + return (NULL); +} + int plat_stdin_is_keyboard(void) { |