CVS commit: src/sys/arch/arm/s3c2xx0

[David Young]

Module Name:    src
Committed By:   dyoung
Date:           Thu Nov 11 15:58:41 UTC 2010

Modified Files:
        src/sys/arch/arm/s3c2xx0: ohci_s3c24x0.c

Log Message:
Fix usb_port.h-removal fallout with the patch by Brett Slager in
port-arm/44081, "evbarm/SMDK2410 kernel fails to compile".

Use device_t instead of device_ptr_t.  Use device_t and cfdata_t
typedefs.  Insert missing aprint_naive().


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.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/arm/s3c2xx0/ohci_s3c24x0.c
diff -u src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.6 src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.7
--- src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.6	Mon Apr 28 20:23:14 2008
+++ src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c	Thu Nov 11 15:58:41 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci_s3c24x0.c,v 1.6 2008/04/28 20:23:14 martin Exp $ */
+/*	$NetBSD: ohci_s3c24x0.c,v 1.7 2010/11/11 15:58:41 dyoung Exp $ */
 
 /* derived from ohci_pci.c */
 
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.6 2008/04/28 20:23:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.7 2010/11/11 15:58:41 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,9 +54,9 @@
 #include <dev/usb/ohcireg.h>
 #include <dev/usb/ohcivar.h>
 
-int	ohci_ssio_match(struct device *, struct cfdata *, void *);
-void	ohci_ssio_attach(struct device *, struct device *, void *);
-int	ohci_ssio_detach(device_ptr_t, int);
+int	ohci_ssio_match(device_t, cfdata_t, void *);
+void	ohci_ssio_attach(device_t, device_t, void *);
+int	ohci_ssio_detach(device_t, int);
 
 extern	int ohcidebug;
 
@@ -70,7 +70,7 @@
     ohci_ssio_match, ohci_ssio_attach, ohci_ssio_detach, ohci_activate);
 
 int
-ohci_ssio_match(struct device *parent, struct cfdata *match, void *aux)
+ohci_ssio_match(device_t parent, cfdata_t match, void *aux)
 {
 	struct s3c2xx0_attach_args *sa = (struct s3c2xx0_attach_args *)aux;
 	/* XXX: check some registers */
@@ -84,7 +84,7 @@
 }
 
 void
-ohci_ssio_attach(struct device *parent, struct device *self, void *aux)
+ohci_ssio_attach(device_t parent, device_t self, void *aux)
 {
 	struct ohci_ssio_softc *sc = device_private(self);
 	struct s3c2xx0_attach_args *sa = (struct s3c2xx0_attach_args *)aux;
@@ -92,6 +92,7 @@
 	usbd_status r;
 
 	aprint_normal("\n");
+	aprint_naive("\n");
 
 	sc->sc.sc_dev = self;
 	sc->sc.sc_bus.hci_private = sc;
@@ -134,7 +135,7 @@
 }
 
 int
-ohci_ssio_detach(device_ptr_t self, int flags)
+ohci_ssio_detach(device_t self, int flags)
 {
 	return (0);
 }