CVS commit: src/sys/dev/usb

[David Young]

Module Name:    src
Committed By:   dyoung
Date:           Tue Jun 16 19:42:45 UTC 2009

Modified Files:
        src/sys/dev/usb: usb.c

Log Message:
Use device_t instead of device_ptr_t.  Stop using USB_MATCH() and
USB_ATTACH().


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/dev/usb/usb.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/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.117 src/sys/dev/usb/usb.c:1.118
--- src/sys/dev/usb/usb.c:1.117	Tue May 12 13:22:10 2009
+++ src/sys/dev/usb/usb.c	Tue Jun 16 19:42:44 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb.c,v 1.117 2009/05/12 13:22:10 cegger Exp $	*/
+/*	$NetBSD: usb.c,v 1.118 2009/06/16 19:42:44 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1998, 2002, 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.117 2009/05/12 13:22:10 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.118 2009/06/16 19:42:44 dyoung Exp $");
 
 #include "opt_compat_netbsd.h"
 
@@ -166,13 +166,15 @@
     usb_match, usb_attach, usb_detach, usb_activate, NULL, usb_childdet,
     DVF_DETACH_SHUTDOWN);
 
-USB_MATCH(usb)
+int
+usb_match(device_t parent, cfdata_t match, void *aux)
 {
 	DPRINTF(("usbd_match\n"));
 	return (UMATCH_GENERIC);
 }
 
-USB_ATTACH(usb)
+void
+usb_attach(device_t parent, device_t self, void *aux)
 {
 	struct usb_softc *sc = device_private(self);
 	int usbrev;
@@ -853,7 +855,7 @@
 }
 
 void
-usbd_add_drv_event(int type, usbd_device_handle udev, device_ptr_t dev)
+usbd_add_drv_event(int type, usbd_device_handle udev, device_t dev)
 {
 	struct usb_event *ue = usb_alloc_event();