[src/netbsd-9]: src/sys/arch/zaurus/dev Pull up following revision(s) (reques...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6a2965c60a87
branches:  netbsd-9
changeset: 843465:6a2965c60a87
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 04 14:29:26 2019 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #395):

        sys/arch/zaurus/dev/zrc.c: revision 1.10

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.

diffstat:

 sys/arch/zaurus/dev/zrc.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 7c888ef14fb2 -r 6a2965c60a87 sys/arch/zaurus/dev/zrc.c
--- a/sys/arch/zaurus/dev/zrc.c Mon Nov 04 14:13:31 2019 +0000
+++ b/sys/arch/zaurus/dev/zrc.c Mon Nov 04 14:29:26 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zrc.c,v 1.9 2012/10/27 17:18:14 chs Exp $      */
+/*     $NetBSD: zrc.c,v 1.9.42.1 2019/11/04 14:29:26 martin 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.9.42.1 2019/11/04 14:29:26 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -131,6 +133,11 @@
 };
 
 #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