CVS commit: [netbsd-5] src/sys/arch/macppc/dev
Module Name:src
Committed By: riz
Date: Tue Nov 6 20:10:49 UTC 2012
Modified Files:
src/sys/arch/macppc/dev [netbsd-5]: awacs.c
Log Message:
Pull up following revision(s) (requested by phx in ticket #1816):
sys/arch/macppc/dev/awacs.c: revision 1.43
My PowerMac3,1 is using gpio4 to detect a connected headphone, and I would bet
that the same is true for PowerMac3,2.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.4.1 src/sys/arch/macppc/dev/awacs.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/macppc/dev/awacs.c
diff -u src/sys/arch/macppc/dev/awacs.c:1.35 src/sys/arch/macppc/dev/awacs.c:1.35.4.1
--- src/sys/arch/macppc/dev/awacs.c:1.35 Wed Aug 27 14:31:46 2008
+++ src/sys/arch/macppc/dev/awacs.c Tue Nov 6 20:10:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: awacs.c,v 1.35 2008/08/27 14:31:46 jmcneill Exp $ */
+/* $NetBSD: awacs.c,v 1.35.4.1 2012/11/06 20:10:49 riz Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awacs.c,v 1.35 2008/08/27 14:31:46 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: awacs.c,v 1.35.4.1 2012/11/06 20:10:49 riz Exp $);
#include sys/param.h
#include sys/audioio.h
@@ -281,7 +281,9 @@ static const char *detect_reversed[] = {
AAPL,3500,
NULL};
-static const char *use_gpio4[] = { PowerMac3,3,
+static const char *use_gpio4[] = { PowerMac3,1,
+ PowerMac3,2,
+ PowerMac3,3,
NULL};
/*
CVS commit: [netbsd-5] src/sys/arch/macppc/dev
Module Name:src
Committed By: snj
Date: Mon Jan 11 00:52:47 UTC 2010
Modified Files:
src/sys/arch/macppc/dev [netbsd-5]: pbms.c
Log Message:
Apply patch (requested by tsutsui in ticket #916):
Fix crash on detach.
To generate a diff of this commit:
cvs rdiff -u -r1.7.30.1 -r1.7.30.2 src/sys/arch/macppc/dev/pbms.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/macppc/dev/pbms.c
diff -u src/sys/arch/macppc/dev/pbms.c:1.7.30.1 src/sys/arch/macppc/dev/pbms.c:1.7.30.2
--- src/sys/arch/macppc/dev/pbms.c:1.7.30.1 Tue Aug 25 18:28:03 2009
+++ src/sys/arch/macppc/dev/pbms.c Mon Jan 11 00:52:47 2010
@@ -1,4 +1,4 @@
-/* $Id: pbms.c,v 1.7.30.1 2009/08/25 18:28:03 snj Exp $ */
+/* $Id: pbms.c,v 1.7.30.2 2010/01/11 00:52:47 snj Exp $ */
/*
* Copyright (c) 2005, Johan Wallén
@@ -402,7 +402,7 @@
int
pbms_detach(struct device *self, int flags)
{
- struct pbms_softc *sc = (struct pbms_softc *)self;
+ struct pbms_softc *sc = device_private(self);
int ret;
/* The wsmouse driver does all the work. */
@@ -419,7 +419,7 @@
int
pbms_activate(device_ptr_t self, enum devact act)
{
- struct pbms_softc *sc = (struct pbms_softc *)self;
+ struct pbms_softc *sc = device_private(self);
int ret;
if (act == DVACT_DEACTIVATE) {
CVS commit: [netbsd-5] src/sys/arch/macppc/dev
Module Name:src
Committed By: snj
Date: Tue Aug 25 18:28:04 UTC 2009
Modified Files:
src/sys/arch/macppc/dev [netbsd-5]: pbms.c
Log Message:
Pull up following revision(s) (requested by aymeric in ticket #916):
sys/arch/macppc/dev/pbms.c: revision 1.8
. use device_private() (led to immediate crash during attach)
. while there, fix the aspect ratio of the trackpad on the geyser2 model
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.30.1 src/sys/arch/macppc/dev/pbms.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/macppc/dev/pbms.c
diff -u src/sys/arch/macppc/dev/pbms.c:1.7 src/sys/arch/macppc/dev/pbms.c:1.7.30.1
--- src/sys/arch/macppc/dev/pbms.c:1.7 Wed Oct 17 19:55:19 2007
+++ src/sys/arch/macppc/dev/pbms.c Tue Aug 25 18:28:03 2009
@@ -1,4 +1,4 @@
-/* $Id: pbms.c,v 1.7 2007/10/17 19:55:19 garbled Exp $ */
+/* $Id: pbms.c,v 1.7.30.1 2009/08/25 18:28:03 snj Exp $ */
/*
* Copyright (c) 2005, Johan Wallén
@@ -243,7 +243,7 @@
/* 15 inch PowerBooks */
POWERBOOK_TOUCHPAD(15, 0x020e, 85, 16, 57), /* XXX Not tested. */
POWERBOOK_TOUCHPAD(15, 0x020f, 85, 16, 57),
- POWERBOOK_TOUCHPAD(15, 0x0215, 64, 16, 43),
+ POWERBOOK_TOUCHPAD(15, 0x0215, 90, 15, 107),
/* 17 inch PowerBooks */
POWERBOOK_TOUCHPAD(17, 0x020d, 71, 26, 68) /* XXX Not tested. */
#undef POWERBOOK_TOUCHPAD
@@ -348,7 +348,7 @@
struct wsmousedev_attach_args a;
struct uhidev_attach_arg *uha = aux;
struct pbms_dev *pd;
- struct pbms_softc *sc = (struct pbms_softc *)self;
+ struct pbms_softc *sc = device_private(self);
usb_device_descriptor_t *udd;
int i;
uint16_t vendor, product;
@@ -374,11 +374,10 @@
sc-sc_x_sensors = pd-x_sensors;
sc-sc_y_factor = pd-y_factor;
sc-sc_y_sensors = pd-y_sensors;
-if (product == 0x215) {
+if (product == 0x0215) {
sc-is_geyser2 = 1;
- sc-sc_x_sensors = 15;
- sc-sc_y_sensors = 9;
sc-sc_datalen = 64;
+ sc-sc_y_sensors = 9;
}
break;
}
