CVS commit: src/sys/arch/sparc64/dev

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Fri Jun  3 03:05:21 UTC 2011

Modified Files:
        src/sys/arch/sparc64/dev: pyrovar.h upa.c

Log Message:
CFATTACH_DECL_NEW


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/dev/pyrovar.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/dev/upa.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/sparc64/dev/pyrovar.h
diff -u src/sys/arch/sparc64/dev/pyrovar.h:1.2 src/sys/arch/sparc64/dev/pyrovar.h:1.3
--- src/sys/arch/sparc64/dev/pyrovar.h:1.2	Tue Mar 15 07:42:03 2011
+++ src/sys/arch/sparc64/dev/pyrovar.h	Thu Jun  2 23:05:21 2011
@@ -55,7 +55,7 @@
 };
 
 struct pyro_softc {
-	struct device sc_dv;
+	device_t sc_dev;
 	int sc_node;
 	int sc_ign;
 	bus_dma_tag_t sc_dmat;

Index: src/sys/arch/sparc64/dev/upa.c
diff -u src/sys/arch/sparc64/dev/upa.c:1.15 src/sys/arch/sparc64/dev/upa.c:1.16
--- src/sys/arch/sparc64/dev/upa.c:1.15	Tue Jan 12 09:45:50 2010
+++ src/sys/arch/sparc64/dev/upa.c	Thu Jun  2 23:05:21 2011
@@ -50,7 +50,7 @@
 };
 
 struct upa_softc {
-	struct device		sc_dev;
+	device_t		sc_dev;
 	bus_space_tag_t		sc_bt;
 	bus_space_handle_t	sc_reg[3];
 	struct upa_range	*sc_range;
@@ -59,10 +59,10 @@
 	bus_space_tag_t		sc_cbt;
 };
 
-int	upa_match(struct device*, struct cfdata*, void *);
-void	upa_attach(struct device*, struct device*, void *);
+int	upa_match(device_t, cfdata_t, void *);
+void	upa_attach(device_t, device_t, void *);
 
-CFATTACH_DECL(upa, sizeof(struct upa_softc),
+CFATTACH_DECL_NEW(upa, sizeof(struct upa_softc),
     upa_match, upa_attach, NULL, NULL);
 
 int upa_print(void *, const char *);
@@ -72,7 +72,7 @@
 paddr_t upa_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int);
 
 int
-upa_match(struct device *parent, struct cfdata *match, void *aux)
+upa_match(device_t parent, cfdata_t match, void *aux)
 {
 	struct mainbus_attach_args *ma = aux;
 
@@ -83,12 +83,13 @@
 }
 
 void
-upa_attach(struct device *parent, struct device *self, void *aux)
+upa_attach(device_t parent, device_t self, void *aux)
 {
 	struct upa_softc *sc = device_private(self);
 	struct mainbus_attach_args *ma = aux;
 	int i, node;
 
+	sc->sc_dev = self;
 	sc->sc_bt = ma->ma_bustag;
 	sc->sc_node = ma->ma_node;
 
@@ -128,7 +129,7 @@
 		map.ma_name = buf;
 		map.ma_bustag = sc->sc_cbt;
 		map.ma_dmatag = ma->ma_dmatag;
-		config_found(&sc->sc_dev, &map, upa_print);
+		config_found(sc->sc_dev, &map, upa_print);
 	}
 }