diff options
| -rw-r--r-- | share/man/man4/man4.macppc/aoa.4 | 6 | ||||
| -rw-r--r-- | share/man/man4/man4.macppc/snapper.4 | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/aoa.c | 7 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/snapper.c | 7 |
4 files changed, 17 insertions, 9 deletions
diff --git a/share/man/man4/man4.macppc/aoa.4 b/share/man/man4/man4.macppc/aoa.4 index a70ae8c4386..fe8b2237658 100644 --- a/share/man/man4/man4.macppc/aoa.4 +++ b/share/man/man4/man4.macppc/aoa.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: aoa.4,v 1.9 2016/07/02 16:28:50 mglocker Exp $ +.\" $OpenBSD: aoa.4,v 1.10 2020/06/06 21:01:30 gkoehler Exp $ .\" .\" Copyright (c) 2005 Joris Vink. .\" Copyright (c) 2004 Dale Rahn. @@ -25,7 +25,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: July 2 2016 $ +.Dd $Mdocdate: June 6 2020 $ .Dt AOA 4 macppc .Os .Sh NAME @@ -46,8 +46,6 @@ driver include: .Pp .Bl -dash -offset indent -compact .It -PowerBook5,4 -.It PowerMac7,3 .It PowerMac9,1 diff --git a/share/man/man4/man4.macppc/snapper.4 b/share/man/man4/man4.macppc/snapper.4 index ebbfab9f2ab..357d01264b0 100644 --- a/share/man/man4/man4.macppc/snapper.4 +++ b/share/man/man4/man4.macppc/snapper.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: snapper.4,v 1.16 2015/01/15 20:37:36 schwarze Exp $ +.\" $OpenBSD: snapper.4,v 1.17 2020/06/06 21:01:30 gkoehler Exp $ .\" .\" Copyright (c) 2004 Dale Rahn. .\" All rights reserved. @@ -24,7 +24,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd $Mdocdate: January 15 2015 $ +.Dd $Mdocdate: June 6 2020 $ .Dt SNAPPER 4 macppc .Os .Sh NAME @@ -57,6 +57,8 @@ PowerBook5,2 .It PowerBook5,3 .It +PowerBook5,4 +.It PowerBook5,5 .It PowerBook5,6 diff --git a/sys/arch/macppc/dev/aoa.c b/sys/arch/macppc/dev/aoa.c index f4d2d367105..85b015a58b5 100644 --- a/sys/arch/macppc/dev/aoa.c +++ b/sys/arch/macppc/dev/aoa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aoa.c,v 1.9 2016/09/19 06:46:43 ratchov Exp $ */ +/* $OpenBSD: aoa.c,v 1.10 2020/06/06 21:01:30 gkoehler Exp $ */ /*- * Copyright (c) 2005 Tsubai Masanari. All rights reserved. @@ -57,6 +57,8 @@ void aoa_attach(struct device *, struct device *, void *); void aoa_defer(struct device *); void aoa_set_volume(struct aoa_softc *, int, int); +extern char *hw_prod; + struct cfattach aoa_ca = { sizeof(struct aoa_softc), aoa_match, aoa_attach }; @@ -107,7 +109,8 @@ aoa_match(struct device *parent, void *match, void *aux) bzero(compat, sizeof compat); OF_getprop(soundchip, "compatible", compat, sizeof compat); - if (strcmp(compat, "AOAKeylargo") == 0) + if (strcmp(compat, "AOAKeylargo") == 0 && + strcmp(hw_prod, "PowerBook5,4") != 0) return (1); if (strcmp(compat, "AOAK2") == 0) return (1); diff --git a/sys/arch/macppc/dev/snapper.c b/sys/arch/macppc/dev/snapper.c index 8297fe5731d..a4ebd7f54f3 100644 --- a/sys/arch/macppc/dev/snapper.c +++ b/sys/arch/macppc/dev/snapper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: snapper.c,v 1.37 2016/09/19 06:46:43 ratchov Exp $ */ +/* $OpenBSD: snapper.c,v 1.38 2020/06/06 21:01:30 gkoehler Exp $ */ /* $NetBSD: snapper.c,v 1.1 2003/12/27 02:19:34 grant Exp $ */ /*- @@ -70,6 +70,8 @@ void snapper_set_input(struct snapper_softc *, int); int tas3004_write(struct snapper_softc *, u_int, const void *); int tas3004_init(struct snapper_softc *); +extern char *hw_prod; + struct cfattach snapper_ca = { sizeof(struct snapper_softc), snapper_match, snapper_attach }; @@ -442,6 +444,9 @@ snapper_match(struct device *parent, void *match, void *aux) bzero(compat, sizeof compat); OF_getprop(soundchip, "compatible", compat, sizeof compat); + if (strcmp(compat, "AOAKeylargo") == 0 && + strcmp(hw_prod, "PowerBook5,4") == 0) + return (1); if (strcmp(compat, "snapper") == 0) return (1); |