Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/usb/if_upl.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/usb/if_upl.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.30.8.2
retrieving revision 1.31
diff -u -p -r1.30.8.2 -r1.31
--- src/sys/dev/usb/if_upl.c	2008/06/04 02:05:20	1.30.8.2
+++ src/sys/dev/usb/if_upl.c	2008/04/28 20:23:59	1.31
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_upl.c,v 1.30.8.2 2008/06/04 02:05:20 yamt Exp $	*/
+/*	$NetBSD: if_upl.c,v 1.31 2008/04/28 20:23:59 martin Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.30.8.2 2008/06/04 02:05:20 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.31 2008/04/28 20:23:59 martin Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -230,16 +230,15 @@ USB_ATTACH(upl)
 
 	DPRINTFN(5,(" : upl_attach: sc=%p, dev=%p", sc, dev));
 
-	sc->sc_dev = self;
-
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	USB_ATTACH_SETUP;
-	aprint_normal_dev(self, "%s\n", devinfop);
+	printf("%s: %s\n", USBDEVNAME(sc->sc_dev), devinfop);
 	usbd_devinfo_free(devinfop);
 
 	err = usbd_set_config_no(dev, UPL_CONFIG_NO, 1);
 	if (err) {
-		aprint_error_dev(self, "setting config no failed\n");
+		printf("%s: setting config no failed\n",
+		    USBDEVNAME(sc->sc_dev));
 		USB_ATTACH_ERROR_RETURN;
 	}
 
@@ -249,7 +248,8 @@ USB_ATTACH(upl)
 
 	err = usbd_device2interface_handle(dev, UPL_IFACE_IDX, &iface);
 	if (err) {
-		aprint_error_dev(self, "getting interface handle failed\n");
+		printf("%s: getting interface handle failed\n",
+		    USBDEVNAME(sc->sc_dev));
 		USB_ATTACH_ERROR_RETURN;
 	}
 
@@ -260,7 +260,8 @@ USB_ATTACH(upl)
 	for (i = 0; i < id->bNumEndpoints; i++) {
 		ed = usbd_interface2endpoint_descriptor(iface, i);
 		if (ed == NULL) {
-			aprint_error_dev(self, "couldn't get ep %d\n", i);
+			printf("%s: couldn't get ep %d\n",
+			    USBDEVNAME(sc->sc_dev), i);
 			USB_ATTACH_ERROR_RETURN;
 		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
@@ -277,7 +278,7 @@ USB_ATTACH(upl)
 
 	if (sc->sc_ed[UPL_ENDPT_RX] == 0 || sc->sc_ed[UPL_ENDPT_TX] == 0 ||
 	    sc->sc_ed[UPL_ENDPT_INTR] == 0) {
-		aprint_error_dev(self, "missing endpoint\n");
+		printf("%s: missing endpoint\n", USBDEVNAME(sc->sc_dev));
 		USB_ATTACH_ERROR_RETURN;
 	}
 
@@ -355,7 +356,8 @@ USB_DETACH(upl)
 	if (sc->sc_ep[UPL_ENDPT_TX] != NULL ||
 	    sc->sc_ep[UPL_ENDPT_RX] != NULL ||
 	    sc->sc_ep[UPL_ENDPT_INTR] != NULL)
-		aprint_debug_dev(self, "detach has active endpoints\n");
+		printf("%s: detach has active endpoints\n",
+		       USBDEVNAME(sc->sc_dev));
 #endif
 
 	sc->sc_attached = 0;
@@ -370,7 +372,7 @@ USB_DETACH(upl)
 int
 upl_activate(device_ptr_t self, enum devact act)
 {
-	struct upl_softc *sc = device_private(self);
+	struct upl_softc *sc = (struct upl_softc *)self;
 
 	DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));