Fri Apr 26 00:59:08 2024 UTC (14d)

Return early if PM data is not available.

This avoids random crashes on my Powerbook when using the mouse or keyboard.

The same was needed for the Powerbook 5xx/Duos (compile tested only).

XXX pullup-10, pullup-9, pullup-8.


(nat)

diff -r1.30 -r1.31 src/sys/arch/mac68k/dev/pm_direct.c

--- src/sys/arch/mac68k/dev/pm_direct.c 2021/08/21 11:55:24	1.30
+++ src/sys/arch/mac68k/dev/pm_direct.c 2024/04/26 00:59:08	1.31

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pm_direct.c,v 1.30 2021/08/21 11:55:24 andvar Exp $	*/
+/*	$NetBSD: pm_direct.c,v 1.31 2024/04/26 00:59:08 nat Exp $	*/
 /*
  * Copyright (C) 1997 Takashi Hamada
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /* From: pm_direct.c 1.3 03/18/98 Takashi Hamada */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.30 2021/08/21 11:55:24 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.31 2024/04/26 00:59:08 nat Exp $");
 #include "opt_adb.h"
 #ifdef DEBUG
 #ifndef ADB_DEBUG
 #define ADB_DEBUG
 #endif
 #endif
 /* #define	PM_GRAB_SI	1 */
 #include <sys/types.h>
 #include <sys/systm.h>
 @@ -552,26 +552,27 @@ pm_intr_pm1(void *arg)
 	/* ask PM what happened */
 	pmdata.command = 0x78;
 	pmdata.num_data = 0;
 	pmdata.data[0] = pmdata.data[1] = 0;
 	pmdata.s_buf = &pmdata.data[2];
 	pmdata.r_buf = &pmdata.data[2];
 	rval = pm_pmgrop_pm1(&pmdata);
 	if (rval != 0) {
 #ifdef ADB_DEBUG
 		if (adb_debug)
 			printf("pm: PM is not ready. error code=%08x\n", rval);
 #endif
 		splx(s);
 		return;
+	}
 	if ((pmdata.data[2] & 0x10) == 0x10) {
 		if ((pmdata.data[2] & 0x0f) == 0) {
 			/* ADB data that were requested by TALK command */
 			pm_adb_get_TALK_result(&pmdata);
 		} else if ((pmdata.data[2] & 0x08) == 0x8) {
 			/* PM is requesting to poll  */
 			pm_adb_poll_next_device_pm1(&pmdata);
 		} else if ((pmdata.data[2] & 0x04) == 0x4) {
 			/* ADB device event */
 			pm_adb_get_ADB_data(&pmdata);
+		}
 @@ -811,26 +812,27 @@ pm_intr_pm2(void *arg)
 	PM_VIA_CLR_INTR();			/* clear VIA1 interrupt */
 						/* ask PM what happened */
 	pmdata.command = 0x78;
 	pmdata.num_data = 0;
 	pmdata.s_buf = &pmdata.data[2];
 	pmdata.r_buf = &pmdata.data[2];
 	rval = pm_pmgrop_pm2(&pmdata);
 	if (rval != 0) {
 #ifdef ADB_DEBUG
 		if (adb_debug)
 			printf("pm: PM is not ready. error code: %08x\n", rval);
 #endif
 		splx(s);
 		return;
+	}
 	switch ((u_int)(pmdata.data[2] & 0xff)) {
 		case 0x00:			/* 1 sec interrupt? */
 			break;
 		case 0x80:			/* 1 sec interrupt? */
 			pm_counter++;
 			break;
 		case 0x08:			/* Brightness/Contrast button on LCD panel */
 			/* get brightness and contrast of the LCD */
 			pm_LCD_brightness = (u_int)pmdata.data[3] & 0xff;
 			pm_LCD_contrast = (u_int)pmdata.data[4] & 0xff;
 /*