Module Name: src
Committed By: nat
Date: Wed Jun 5 11:01:47 UTC 2024
Modified Files:
src/sys/arch/mac68k/dev: aed.c
src/sys/arch/macppc/dev: aed.c
Log Message:
Pass event up to adb device.
While here do the same for macppc.
Addresses PR/58303
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/mac68k/dev/aed.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/macppc/dev/aed.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/mac68k/dev/aed.c
diff -u src/sys/arch/mac68k/dev/aed.c:1.38 src/sys/arch/mac68k/dev/aed.c:1.39
--- src/sys/arch/mac68k/dev/aed.c:1.38 Sun Sep 26 16:36:18 2021
+++ src/sys/arch/mac68k/dev/aed.c Wed Jun 5 11:01:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: aed.c,v 1.38 2021/09/26 16:36:18 thorpej Exp $ */
+/* $NetBSD: aed.c,v 1.39 2024/06/05 11:01:47 nat Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.38 2021/09/26 16:36:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.39 2024/06/05 11:01:47 nat Exp $");
#include "opt_adb.h"
@@ -164,6 +164,7 @@ aed_input(adb_event_t *event)
aed_dokeyupdown(&new_event);
break;
case ADBADDR_MS:
+ event->u.m.buttons |= aed_sc->sc_buttons;
new_event.u.m.buttons |= aed_sc->sc_buttons;
aed_handoff(&new_event);
break;
Index: src/sys/arch/macppc/dev/aed.c
diff -u src/sys/arch/macppc/dev/aed.c:1.34 src/sys/arch/macppc/dev/aed.c:1.35
--- src/sys/arch/macppc/dev/aed.c:1.34 Sun Sep 26 16:36:19 2021
+++ src/sys/arch/macppc/dev/aed.c Wed Jun 5 11:01:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: aed.c,v 1.34 2021/09/26 16:36:19 thorpej Exp $ */
+/* $NetBSD: aed.c,v 1.35 2024/06/05 11:01:47 nat Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.34 2021/09/26 16:36:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.35 2024/06/05 11:01:47 nat Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -167,6 +167,7 @@ aed_input(adb_event_t *event)
aed_dokeyupdown(&new_event);
break;
case ADBADDR_MS:
+ event->u.m.buttons |= aed_sc->sc_buttons;
new_event.u.m.buttons |= aed_sc->sc_buttons;
aed_handoff(&new_event);
break;
