>Number:         7303
>Category:       port-arm32
>Synopsis:       cannot compile arm32/isa/joy_isapnp.c
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    port-arm32-maintainer (NetBSD/arm32 Portmaster)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Apr  2 01:35:00 1999
>Last-Modified:
>Originator:     Izumi Tsutsui
>Organization:
Izumi Tsutsui	Himeji City, Japan
>Release:        NetBSD-current supped on 19990324
>Environment:
System: NetBSD/arm32 1.3K on CATS system

>Description:
Although isapnp_devmatch() interface was changed,
arch/arm32/isa/joy_isapnp.c have not been changed
so it can not be compiled.

>How-To-Repeat:
Build arm32 kernel with config `joy* at isapnp?'

>Fix:
Pull fixes from i386/isa/joy_isapnp.c. I'm not sure
whether joy_isapnp on arm32 was really supported, though.
I have no joysticks...

--- sys/arch/arm32/isa/joy_isapnp.c.orig	Mon Oct  5 20:10:38 1998
+++ sys/arch/arm32/isa/joy_isapnp.c	Wed Mar 24 21:37:20 1999
@@ -63,7 +63,12 @@
 	struct cfdata *match;
 	void *aux;
 {
-	return isapnp_devmatch(aux, &isapnp_joy_devinfo);
+	int pri, variant;
+
+	pri = isapnp_devmatch(aux, &isapnp_joy_devinfo, &variant);
+	if (pri && variant > 0)
+		pri = 0;
+	return (pri);
 }
 
 void

>Audit-Trail:
>Unformatted: