Date: Thu, 19 Jul 2018 15:44:49 -0500 From: Justin Hibbits <jhibbits@freebsd.org> To: Nathan Whitehorn <nwhitehorn@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r336514 - head/sys/dev/vt/hw/ofwfb Message-ID: <CAHSQbTBsFGkPTdRE%2BUYdXQAQUWmntD3egp10SsZ7zo1pChfJ6A@mail.gmail.com> In-Reply-To: <72e23592-9ff2-b373-f8cc-755c358989f5@freebsd.org> References: <201807192022.w6JKMkE6044331@repo.freebsd.org> <72e23592-9ff2-b373-f8cc-755c358989f5@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
You're right. I'm an idiot. I compiled but didn't try booting. Fixing it after I fix the build. - Justin On Thu, Jul 19, 2018 at 3:37 PM Nathan Whitehorn <nwhitehorn@freebsd.org> wrote: > > Isn't stdout-path supposed to contain a string rather than an ihandle? > This code assumes it is an ihandle (or xref phandle), which I think is > wrong. > -Nathan > > On 07/19/18 13:22, Justin Hibbits wrote: > > Author: jhibbits > > Date: Thu Jul 19 20:22:46 2018 > > New Revision: 336514 > > URL: https://svnweb.freebsd.org/changeset/base/336514 > > > > Log: > > ofwfb: Check for /chosen/stdout-path in addition to /chosen/stdout > > > > Some platforms use /chosen/stdout-path as the property containing the path to > > the stdout node, not /chosen/stdout. > > > > Modified: > > head/sys/dev/vt/hw/ofwfb/ofwfb.c > > > > Modified: head/sys/dev/vt/hw/ofwfb/ofwfb.c > > ============================================================================== > > --- head/sys/dev/vt/hw/ofwfb/ofwfb.c Thu Jul 19 20:20:43 2018 (r336513) > > +++ head/sys/dev/vt/hw/ofwfb/ofwfb.c Thu Jul 19 20:22:46 2018 (r336514) > > @@ -102,6 +102,10 @@ ofwfb_probe(struct vt_device *vd) > > if (OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)) == > > sizeof(stdout)) > > node = OF_instance_to_package(stdout); > > + if (node == -1) > > + if (OF_getprop(chosen, "stdout-path", &stdout, sizeof(stdout)) == > > + sizeof(stdout)) > > + node = OF_instance_to_package(stdout); > > if (node == -1) { > > /* > > * The "/chosen/stdout" does not exist try > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAHSQbTBsFGkPTdRE%2BUYdXQAQUWmntD3egp10SsZ7zo1pChfJ6A>