Date: Sun, 24 Nov 1996 18:48:55 +0800 From: Peter Wemm <peter@spinner.DIALix.COM> To: joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch) Cc: phk@freebsd.org, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-sys@freefall.freebsd.org Subject: Re: cvs commit: src/sys/i386/boot/biosboot probe_keyboard.c Message-ID: <199611241048.SAA01002@spinner.DIALix.COM> In-Reply-To: Your message of "Sun, 24 Nov 1996 11:02:55 %2B0100." <199611241002.LAA10480@uriah.heep.sax.de>
next in thread | previous in thread | raw e-mail | index | archive | help
J Wunsch wrote: > As Peter Wemm wrote: > > Modified: sys/i386/boot/biosboot probe_keyboard.c > > Log: > > Fix my previous (untested) commit. The probe routine now appears to work > > again. > > > > Something needs to be done about this in 2.2, since the code there doesn't > > even compile anymore since the syscons/kbdio/psm merge into 2.2. > > If it works again in -current, there's no reason to not merge it into > 2.2. Yes.. I have tested both cases now and it works as it did before. :-) Remember, this code is only used if the optional PROBE_KEYBOARD setting is defined. The 2.2 code currently does not compile at all, since the syscons/kbdio stuff has already been **partly** merged into 2.2, and the probe_keyboard.c file is now missing it's definitions. This is what 2.2 currently does: cc -O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 -DDO_BAD144 -DBOOTWAIT=5000 -DTIMEOUT= -DBOOTSEG=0x1000 -DBOOTSTACK=0xFFF0 -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -DPROBE_KEYBOARD -DCOMCONSOLE=0x3F8 -DCONSPEED=9600 -c /home/src/sys/i386/boot/biosboot/probe_keyboard.c /home/src/sys/i386/boot/biosboot/probe_keyboard.c: In function `probe_keyboard': /home/src/sys/i386/boot/biosboot/probe_keyboard.c:61: `KB_STAT' undeclared (first use this function) /home/src/sys/i386/boot/biosboot/probe_keyboard.c:61: (Each undeclared identifier is reported only once /home/src/sys/i386/boot/biosboot/probe_keyboard.c:61: for each function it appears in.) /home/src/sys/i386/boot/biosboot/probe_keyboard.c:61: `KB_BUF_FULL' undeclared (first use this function) /home/src/sys/i386/boot/biosboot/probe_keyboard.c:63: `KB_DATA' undeclared (first use this function) /home/src/sys/i386/boot/biosboot/probe_keyboard.c:72: `KB_READY' undeclared (first use this function) /home/src/sys/i386/boot/biosboot/probe_keyboard.c:73: `KB_RESET' undeclared (first use this function) /home/src/sys/i386/boot/biosboot/probe_keyboard.c:77: `KB_ACK' undeclared (first use this function) /home/src/sys/i386/boot/biosboot/probe_keyboard.c:77: `KB_ECHO' undeclared (first use this function) /home/src/sys/i386/boot/biosboot/probe_keyboard.c:79: `KB_RESEND' undeclared (first use this function) /home/src/sys/i386/boot/biosboot/probe_keyboard.c:105: `KB_RESET_DONE' undeclared (first use this function) *** Error code 1 phk has expressed reservations about merging these fixes into 2.2 in case it breaks something, but I don't see how it can be any more broken than it already is.. :-) Cheers, -Peter
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199611241048.SAA01002>