Module Name: src Committed By: tsutsui Date: Sat Nov 2 23:03:53 UTC 2019
Modified Files: src/sys/arch/zaurus/dev: zrc.c Log Message: Fix build errors with options WSDISPLAY_COMPAT_RAWKBD. - Add missing RAWKEY_* macro definitions (taken from OpenBSD) - Explicitly include "opt_wsdisplay_compat.h" for #ifdef WSDISPLAY_COMPAT_RAWKBD conditionals. (it is not properly pulled at least in netbsd-8) https://mail-index.netbsd.org/port-zaurus/2019/11/02/msg000083.html Should be pulled up to netbsd-8 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/dev/zrc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/zaurus/dev/zrc.c diff -u src/sys/arch/zaurus/dev/zrc.c:1.9 src/sys/arch/zaurus/dev/zrc.c:1.10 --- src/sys/arch/zaurus/dev/zrc.c:1.9 Sat Oct 27 17:18:14 2012 +++ src/sys/arch/zaurus/dev/zrc.c Sat Nov 2 23:03:53 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: zrc.c,v 1.9 2012/10/27 17:18:14 chs Exp $ */ +/* $NetBSD: zrc.c,v 1.10 2019/11/02 23:03:53 tsutsui Exp $ */ /* $OpenBSD: zaurus_remote.c,v 1.1 2005/11/17 05:26:31 uwe Exp $ */ /* @@ -17,8 +17,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "opt_wsdisplay_compat.h" + #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.9 2012/10/27 17:18:14 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.10 2019/11/02 23:03:53 tsutsui Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -131,6 +133,11 @@ static const keysym_t zrc_keydesc[] = { }; #ifdef WSDISPLAY_COMPAT_RAWKBD +/* XXX see OpenBSD's <sys/dev/wscons/wskbdraw.h> */ +#define RAWKEY_Null 0x00 +#define RAWKEY_AudioMute 0x85 +#define RAWKEY_AudioLower 0x86 +#define RAWKEY_AudioRaise 0x87 #define RAWKEY_AudioRewind 0xa0 #define RAWKEY_AudioForward 0xa1 #define RAWKEY_AudioPlay 0xa2