summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/dev
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2022-03-28 12:43:12 +0000
committerriastradh <riastradh@NetBSD.org>2022-03-28 12:43:12 +0000
commit61daad76269fa3106571d4cf4388476ecd520b98 (patch)
tree16a47a389b4c1cc8db06701803f43a9f229a5264 /sys/arch/macppc/dev
parent5e68d6d51c5b7e76a98b76138b98716a4a880afc (diff)
uhidev(9): Get the device and interface through attach args.
This way uhidev drivers don't need access to uhidev_softc itself for it.
Diffstat (limited to 'sys/arch/macppc/dev')
-rw-r--r--sys/arch/macppc/dev/pbms.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/macppc/dev/pbms.c b/sys/arch/macppc/dev/pbms.c
index a1bfb88516c..35e84622a0e 100644
--- a/sys/arch/macppc/dev/pbms.c
+++ b/sys/arch/macppc/dev/pbms.c
@@ -1,4 +1,4 @@
-/* $Id: pbms.c,v 1.19 2021/08/07 16:18:57 thorpej Exp $ */
+/* $Id: pbms.c,v 1.20 2022/03/28 12:43:12 riastradh Exp $ */
/*
* Copyright (c) 2005, Johan Wallén
@@ -307,7 +307,8 @@ pbms_match(device_t parent, cfdata_t match, void *aux)
* we expect.
*/
if (uha->uiaa->uiaa_proto == UIPROTO_MOUSE &&
- (udd = usbd_get_device_descriptor(uha->parent->sc_udev)) != NULL) {
+ ((udd = usbd_get_device_descriptor(uha->uiaa->uiaa_device))
+ != NULL)) {
vendor = UGETW(udd->idVendor);
product = UGETW(udd->idProduct);
for (i = 0; i < PBMS_NUM_DEVICES; i++) {
@@ -329,6 +330,7 @@ pbms_attach(device_t parent, device_t self, void *aux)
struct uhidev_attach_arg *uha = aux;
struct pbms_dev *pd;
struct pbms_softc *sc = device_private(self);
+ struct usbd_device *udev;
usb_device_descriptor_t *udd;
int i;
uint16_t vendor, product;
@@ -341,7 +343,8 @@ pbms_attach(device_t parent, device_t self, void *aux)
sc->sc_datalen = PBMS_DATA_LEN;
/* Fill in device-specific parameters. */
- if ((udd = usbd_get_device_descriptor(uha->parent->sc_udev)) != NULL) {
+ udev = uha->uiaa->uiaa_udevice;
+ if ((udd = usbd_get_device_descriptor(udev)) != NULL) {
product = UGETW(udd->idProduct);
vendor = UGETW(udd->idVendor);
for (i = 0; i < PBMS_NUM_DEVICES; i++) {