CVS commit: src/sys/dev/i2o
Module Name:src Committed By: mlelstv Date: Wed Aug 9 16:09:16 UTC 2017 Modified Files: src/sys/dev/i2o: ld_iop.c Log Message: Don't wait for allocation in polling mode. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/dev/i2o/ld_iop.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/i2o/ld_iop.c diff -u src/sys/dev/i2o/ld_iop.c:1.37 src/sys/dev/i2o/ld_iop.c:1.38 --- src/sys/dev/i2o/ld_iop.c:1.37 Mon Feb 27 21:32:33 2017 +++ src/sys/dev/i2o/ld_iop.c Wed Aug 9 16:09:16 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ld_iop.c,v 1.37 2017/02/27 21:32:33 jdolecek Exp $ */ +/* $NetBSD: ld_iop.c,v 1.38 2017/08/09 16:09:16 mlelstv Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.37 2017/02/27 21:32:33 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.38 2017/08/09 16:09:16 mlelstv Exp $"); #include #include @@ -448,7 +448,7 @@ ld_iop_flush(struct ld_softc *ld, bool p sc = device_private(ld->sc_dv); iop = device_private(device_parent(ld->sc_dv)); - im = iop_msg_alloc(iop, IM_WAIT); + im = iop_msg_alloc(iop, poll ? IM_POLL : IM_WAIT); mf.msgflags = I2O_MSGFLAGS(i2o_rbs_cache_flush); mf.msgfunc = I2O_MSGFUNC(sc->sc_ii.ii_tid, I2O_RBS_CACHE_FLUSH);
CVS commit: src/sys/dev/i2o
Module Name:src
Committed By: msaitoh
Date: Sun Aug 16 19:22:33 UTC 2015
Modified Files:
src/sys/dev/i2o: iopsp.c
Log Message:
Fix device_t/softc split bug.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/i2o/iopsp.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/i2o/iopsp.c
diff -u src/sys/dev/i2o/iopsp.c:1.36 src/sys/dev/i2o/iopsp.c:1.37
--- src/sys/dev/i2o/iopsp.c:1.36 Sat Oct 27 17:18:17 2012
+++ src/sys/dev/i2o/iopsp.c Sun Aug 16 19:22:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iopsp.c,v 1.36 2012/10/27 17:18:17 chs Exp $ */
+/* $NetBSD: iopsp.c,v 1.37 2015/08/16 19:22:33 msaitoh Exp $ */
/*-
* Copyright (c) 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.36 2012/10/27 17:18:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.37 2015/08/16 19:22:33 msaitoh Exp $");
#include
#include
@@ -83,6 +83,7 @@ static int
iopsp_match(device_t parent, cfdata_t match, void *aux)
{
struct iop_attach_args *ia;
+ struct iop_softc *iop;
struct {
struct i2o_param_op_results pr;
struct i2o_param_read_results prr;
@@ -90,12 +91,13 @@ iopsp_match(device_t parent, cfdata_t ma
} __packed param;
ia = aux;
+ iop = device_private(parent);
if (ia->ia_class != I2O_CLASS_BUS_ADAPTER_PORT)
return (0);
- if (iop_field_get_all((struct iop_softc *)parent, ia->ia_tid,
- I2O_PARAM_HBA_CTLR_INFO, ¶m, sizeof(param), NULL) != 0)
+ if (iop_field_get_all(iop, ia->ia_tid, I2O_PARAM_HBA_CTLR_INFO, ¶m,
+ sizeof(param), NULL) != 0)
return (0);
return (param.ci.bustype == I2O_HBA_BUS_SCSI ||
CVS commit: src/sys/dev/i2o
Module Name:src Committed By: msaitoh Date: Sun Aug 16 19:21:33 UTC 2015 Modified Files: src/sys/dev/i2o: iop.c Log Message: Fix a buffer pointer check in iop_msg_unmap(). The number of im_xfer is IOP_MAX_MSG_XFERS and it's three. iop_systab_set() makes three ximit buffers. In this case, iop_msg_unmap() overrruns by "if((++ix)->ix_size == 0)". Check overrun first. This change fixes a bug that iop(4) panics while attaching iopsp(4). To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/dev/i2o/iop.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/i2o/iop.c diff -u src/sys/dev/i2o/iop.c:1.86 src/sys/dev/i2o/iop.c:1.87 --- src/sys/dev/i2o/iop.c:1.86 Fri Jul 25 08:10:37 2014 +++ src/sys/dev/i2o/iop.c Sun Aug 16 19:21:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: iop.c,v 1.86 2014/07/25 08:10:37 dholland Exp $ */ +/* $NetBSD: iop.c,v 1.87 2015/08/16 19:21:33 msaitoh Exp $ */ /*- * Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.86 2014/07/25 08:10:37 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.87 2015/08/16 19:21:33 msaitoh Exp $"); #include "iop.h" @@ -2088,10 +2088,10 @@ iop_msg_unmap(struct iop_softc *sc, stru /* Only the first DMA map is static. */ if (i != 0) bus_dmamap_destroy(sc->sc_dmat, ix->ix_map); - if ((++ix)->ix_size == 0) - break; if (++i >= IOP_MAX_MSG_XFERS) break; + if ((++ix)->ix_size == 0) + break; } }
CVS commit: src/sys/dev/i2o
Module Name:src
Committed By: christos
Date: Thu Mar 20 20:40:42 UTC 2014
Modified Files:
src/sys/dev/i2o: dpti.c
Log Message:
make this compile again.
XXX: 32 bit pointer issues.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/i2o/dpti.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/i2o/dpti.c
diff -u src/sys/dev/i2o/dpti.c:1.46 src/sys/dev/i2o/dpti.c:1.47
--- src/sys/dev/i2o/dpti.c:1.46 Sun Mar 16 01:20:27 2014
+++ src/sys/dev/i2o/dpti.c Thu Mar 20 16:40:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dpti.c,v 1.46 2014/03/16 05:20:27 dholland Exp $ */
+/* $NetBSD: dpti.c,v 1.47 2014/03/20 20:40:42 christos Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.46 2014/03/16 05:20:27 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.47 2014/03/20 20:40:42 christos Exp $");
#include
#include
@@ -90,40 +90,40 @@ __KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.4
#endif
static struct dpt_sig dpti_sig = {
- { 'd', 'P', 't', 'S', 'i', 'G'},
- SIG_VERSION,
+ .dsSignature = { 'd', 'P', 't', 'S', 'i', 'G'},
+ .dsSigVersion = SIG_VERSION,
#if defined(__i386__)
- PROC_INTEL,
+ .dsProcessorFamily = PROC_INTEL,
#elif defined(__powerpc__)
- PROC_POWERPC,
+ .dsProcessorFamily = PROC_POWERPC,
#elif defined(__alpha__)
- PROC_ALPHA,
+ .dsProcessorFamily = PROC_ALPHA,
#elif defined(__mips__)
- PROC_MIPS,
+ .dsProcessorFamily = PROC_MIPS,
#elif defined(__sparc64__)
- PROC_ULTRASPARC,
+ .dsProcessorFamily = PROC_ULTRASPARC,
#endif
#if defined(__i386__)
- PROC_386 | PROC_486 | PROC_PENTIUM | PROC_SEXIUM,
+ .dsProcessor = PROC_386 | PROC_486 | PROC_PENTIUM | PROC_SEXIUM,
#else
- 0,
+ .dsProcessor = 0,
#endif
- FT_HBADRVR,
- 0,
- OEM_DPT,
- OS_FREE_BSD, /* XXX */
- CAP_ABOVE16MB,
- DEV_ALL,
- ADF_ALL_SC5,
- 0,
- 0,
- DPTI_VERSION,
- DPTI_REVISION,
- DPTI_SUBREVISION,
- DPTI_MONTH,
- DPTI_DAY,
- DPTI_YEAR,
- "" /* Will be filled later */
+ .dsFiletype = FT_HBADRVR,
+ .dsFiletypeFlags = 0,
+ .dsOEM = OEM_DPT,
+ .dsOS = (uint32_t)OS_FREE_BSD, /* XXX */
+ .dsCapabilities = CAP_ABOVE16MB,
+ .dsDeviceSupp = DEV_ALL,
+ .dsAdapterSupp = ADF_ALL_SC5,
+ .dsApplication = 0,
+ .dsRequirements = 0,
+ .dsVersion = DPTI_VERSION,
+ .dsRevision = DPTI_REVISION,
+ .dsSubRevision = DPTI_SUBREVISION,
+ .dsMonth = DPTI_MONTH,
+ .dsDay = DPTI_DAY,
+ .dsYear = DPTI_YEAR,
+ .dsDescription = { '\0' }, /* Will be filled later */
};
void dpti_attach(device_t, device_t, void *);
@@ -583,7 +583,8 @@ dpti_passthrough(struct dpti_softc *sc,
goto bad;
}
-bufs[nbuf].db_ptr = (void *)p[1];
+// XXX: 32 bits
+bufs[nbuf].db_ptr = (void *)(intptr_t)p[1];
bufs[nbuf].db_proc = proc;
bufs[nbuf].db_size = p[0] & 0x00ff;
@@ -608,8 +609,9 @@ dpti_passthrough(struct dpti_softc *sc,
bufs[nbuf].db_frags[nfrag].iov_len =
p[0] & 0x00ff;
+// XXX: 32 bits
bufs[nbuf].db_frags[nfrag].iov_base =
-(void *)p[1];
+(void *)(intptr_t)p[1];
sz += p[0] & 0x00ff;
nfrag++;
CVS commit: src/sys/dev/i2o
Module Name:src
Committed By: christos
Date: Thu Oct 17 21:16:13 UTC 2013
Modified Files:
src/sys/dev/i2o: iop.c
Log Message:
remove unused variables and __USE a debugging variable
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/i2o/iop.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/i2o/iop.c
diff -u src/sys/dev/i2o/iop.c:1.83 src/sys/dev/i2o/iop.c:1.84
--- src/sys/dev/i2o/iop.c:1.83 Sat Sep 14 09:08:31 2013
+++ src/sys/dev/i2o/iop.c Thu Oct 17 17:16:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: iop.c,v 1.83 2013/09/14 13:08:31 joerg Exp $ */
+/* $NetBSD: iop.c,v 1.84 2013/10/17 21:16:12 christos Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.83 2013/09/14 13:08:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.84 2013/10/17 21:16:12 christos Exp $");
#include "iop.h"
@@ -607,14 +607,12 @@ static void
iop_reconf_thread(void *cookie)
{
struct iop_softc *sc;
- struct lwp *l;
struct i2o_lct lct;
u_int32_t chgind;
int rv;
sc = cookie;
chgind = sc->sc_chgind + 1;
- l = curlwp;
for (;;) {
DPRINTF(("%s: async reconfig: requested 0x%08x\n",
@@ -2239,11 +2237,13 @@ iop_msg_wait(struct iop_softc *sc, struc
if (rv != 0) {
printf("iop_msg_wait: tsleep() == %d\n", rv);
if (iop_status_get(sc, 0) != 0)
- printf("iop_msg_wait: unable to retrieve status\n");
+ printf("%s: unable to retrieve status\n", __func__);
else
- printf("iop_msg_wait: IOP state = %d\n",
+ printf("%s: IOP state = %d\n", __func__,
(le32toh(sc->sc_status.segnumber) >> 16) & 0xff);
}
+#else
+ __USE(rv);
#endif
}
CVS commit: src/sys/dev/i2o
Module Name:src
Committed By: joerg
Date: Sat Sep 14 13:08:31 UTC 2013
Modified Files:
src/sys/dev/i2o: iop.c
Log Message:
#if 0 iop_status, but keep it for documentation purposes.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/i2o/iop.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/i2o/iop.c
diff -u src/sys/dev/i2o/iop.c:1.82 src/sys/dev/i2o/iop.c:1.83
--- src/sys/dev/i2o/iop.c:1.82 Sat Oct 27 17:18:17 2012
+++ src/sys/dev/i2o/iop.c Sat Sep 14 13:08:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: iop.c,v 1.82 2012/10/27 17:18:17 chs Exp $ */
+/* $NetBSD: iop.c,v 1.83 2013/09/14 13:08:31 joerg Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.82 2012/10/27 17:18:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.83 2013/09/14 13:08:31 joerg Exp $");
#include "iop.h"
@@ -180,6 +180,7 @@ static struct iop_class {
},
};
+#ifdef I2ODEBUG
static const char * const iop_status[] = {
"success",
"abort (dirty)",
@@ -194,6 +195,7 @@ static const char * const iop_status[] =
"process abort (partial transfer)",
"transaction error",
};
+#endif
static inline u_int32_t iop_inl(struct iop_softc *, int);
static inline void iop_outl(struct iop_softc *, int, u_int32_t);
CVS commit: src/sys/dev/i2o
Module Name:src
Committed By: bouyer
Date: Sun Feb 21 18:50:11 UTC 2010
Modified Files:
src/sys/dev/i2o: iop.c
Log Message:
Fix confusion about PRE/POST in previous; and another place that has the
same issue. Also add a BUS_DMASYNC_POSTWRITE to the POLL operation.
Problem pointed out by tsut...@.
Still not perfect (a BUS_DMASYNC_PREREAD would be needed after the
testing the condition in the POLL() macro), but closer.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/i2o/iop.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/i2o/iop.c
diff -u src/sys/dev/i2o/iop.c:1.79 src/sys/dev/i2o/iop.c:1.80
--- src/sys/dev/i2o/iop.c:1.79 Sun Feb 21 14:16:47 2010
+++ src/sys/dev/i2o/iop.c Sun Feb 21 18:50:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: iop.c,v 1.79 2010/02/21 14:16:47 bouyer Exp $ */
+/* $NetBSD: iop.c,v 1.80 2010/02/21 18:50:10 bouyer Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.79 2010/02/21 14:16:47 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.80 2010/02/21 18:50:10 bouyer Exp $");
#include "iop.h"
@@ -990,17 +990,17 @@
mb[0] += 2 << 16;
bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_PREWRITE);
+ BUS_DMASYNC_POSTWRITE);
*sw = 0;
bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_POSTWRITE);
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
if ((rv = iop_post(sc, mb)) != 0)
return (rv);
POLL(5000,
(bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_POSTREAD),
+ BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD),
*sw == htole32(I2O_EXEC_OUTBOUND_INIT_COMPLETE)));
if (*sw != htole32(I2O_EXEC_OUTBOUND_INIT_COMPLETE)) {
@@ -1535,17 +1535,17 @@
mf.statushigh = (u_int32_t)((u_int64_t)pa >> 32);
bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_PREWRITE);
+ BUS_DMASYNC_POSTWRITE);
*sw = htole32(0);
bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_POSTWRITE);
+ BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
if ((rv = iop_post(sc, (u_int32_t *)&mf)))
return (rv);
POLL(2500,
(bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_POSTREAD), *sw != 0));
+ BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD), *sw != 0));
if (*sw != htole32(I2O_RESET_IN_PROGRESS)) {
aprint_error_dev(&sc->sc_dv, "reset rejected, status 0x%x\n",
le32toh(*sw));
CVS commit: src/sys/dev/i2o
Module Name:src Committed By: bouyer Date: Sun Feb 21 14:16:47 UTC 2010 Modified Files: src/sys/dev/i2o: iop.c Log Message: Fix bus_dmamap_sync(): it should be a BUS_DMASYNC_POSTWRITE after writing to DMA memory. Found by code inspection. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/dev/i2o/iop.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/i2o/iop.c diff -u src/sys/dev/i2o/iop.c:1.78 src/sys/dev/i2o/iop.c:1.79 --- src/sys/dev/i2o/iop.c:1.78 Fri Feb 19 12:36:15 2010 +++ src/sys/dev/i2o/iop.c Sun Feb 21 14:16:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: iop.c,v 1.78 2010/02/19 12:36:15 asau Exp $ */ +/* $NetBSD: iop.c,v 1.79 2010/02/21 14:16:47 bouyer Exp $ */ /*- * Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.78 2010/02/19 12:36:15 asau Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.79 2010/02/21 14:16:47 bouyer Exp $"); #include "iop.h" @@ -1538,7 +1538,7 @@ BUS_DMASYNC_PREWRITE); *sw = htole32(0); bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw), - BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); + BUS_DMASYNC_POSTWRITE); if ((rv = iop_post(sc, (u_int32_t *)&mf))) return (rv);
CVS commit: src/sys/dev/i2o
Module Name:src Committed By: asau Date: Fri Feb 19 12:36:15 UTC 2010 Modified Files: src/sys/dev/i2o: iop.c Log Message: Don't mix BUS_DMASYNC_PREREAD and BUS_DMASYNC_POSTWRITE. Suggested by , fixes PR kern/42662 To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/dev/i2o/iop.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/i2o/iop.c diff -u src/sys/dev/i2o/iop.c:1.77 src/sys/dev/i2o/iop.c:1.78 --- src/sys/dev/i2o/iop.c:1.77 Wed Oct 21 21:12:05 2009 +++ src/sys/dev/i2o/iop.c Fri Feb 19 12:36:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: iop.c,v 1.77 2009/10/21 21:12:05 rmind Exp $ */ +/* $NetBSD: iop.c,v 1.78 2010/02/19 12:36:15 asau Exp $ */ /*- * Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.77 2009/10/21 21:12:05 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.78 2010/02/19 12:36:15 asau Exp $"); #include "iop.h" @@ -928,7 +928,7 @@ BUS_DMASYNC_PREWRITE); memset(st, 0, sizeof(*st)); bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*st), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTWRITE); if ((rv = iop_post(sc, (u_int32_t *)&mf)) != 0) return (rv); @@ -993,7 +993,7 @@ BUS_DMASYNC_PREWRITE); *sw = 0; bus_dmamap_sync(sc->sc_dmat, sc->sc_scr_dmamap, 0, sizeof(*sw), - BUS_DMASYNC_PREREAD|BUS_DMASYNC_POSTWRITE); + BUS_DMASYNC_POSTWRITE); if ((rv = iop_post(sc, mb)) != 0) return (rv);
CVS commit: src/sys/dev/i2o
Module Name:src
Committed By: cegger
Date: Tue May 12 14:23:47 UTC 2009
Modified Files:
src/sys/dev/i2o: dpti.c iop.c iopsp.c iopvar.h
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/i2o/dpti.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/i2o/iop.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/i2o/iopsp.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/i2o/iopvar.h
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/i2o/dpti.c
diff -u src/sys/dev/i2o/dpti.c:1.41 src/sys/dev/i2o/dpti.c:1.42
--- src/sys/dev/i2o/dpti.c:1.41 Tue May 12 12:14:18 2009
+++ src/sys/dev/i2o/dpti.c Tue May 12 14:23:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dpti.c,v 1.41 2009/05/12 12:14:18 cegger Exp $ */
+/* $NetBSD: dpti.c,v 1.42 2009/05/12 14:23:47 cegger Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.41 2009/05/12 12:14:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.42 2009/05/12 14:23:47 cegger Exp $");
#include
#include
@@ -128,10 +128,10 @@
"" /* Will be filled later */
};
-void dpti_attach(struct device *, struct device *, void *);
+void dpti_attach(device_t, device_t, void *);
int dpti_blinkled(struct dpti_softc *);
int dpti_ctlrinfo(struct dpti_softc *, int, void *);
-int dpti_match(struct device *, cfdata_t, void *);
+int dpti_match(device_t, cfdata_t, void *);
int dpti_passthrough(struct dpti_softc *, void *, struct proc *);
int dpti_sysinfo(struct dpti_softc *, int, void *);
@@ -149,7 +149,7 @@
dpti_match, dpti_attach, NULL, NULL);
int
-dpti_match(struct device *parent, cfdata_t match, void *aux)
+dpti_match(device_t parent, cfdata_t match, void *aux)
{
struct iop_attach_args *ia;
struct iop_softc *iop;
@@ -167,7 +167,7 @@
}
void
-dpti_attach(struct device *parent, struct device *self, void *aux)
+dpti_attach(device_t parent, device_t self, void *aux)
{
struct iop_softc *iop;
struct dpti_softc *sc;
Index: src/sys/dev/i2o/iop.c
diff -u src/sys/dev/i2o/iop.c:1.75 src/sys/dev/i2o/iop.c:1.76
--- src/sys/dev/i2o/iop.c:1.75 Sun Sep 14 18:12:16 2008
+++ src/sys/dev/i2o/iop.c Tue May 12 14:23:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: iop.c,v 1.75 2008/09/14 18:12:16 mhitch Exp $ */
+/* $NetBSD: iop.c,v 1.76 2009/05/12 14:23:47 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.75 2008/09/14 18:12:16 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.76 2009/05/12 14:23:47 cegger Exp $");
#include "iop.h"
@@ -203,7 +203,7 @@
static inline u_int32_t iop_inl_msg(struct iop_softc *, int);
static inline void iop_outl_msg(struct iop_softc *, int, u_int32_t);
-static void iop_config_interrupts(struct device *);
+static void iop_config_interrupts(device_t);
static void iop_configure_devices(struct iop_softc *, int, int);
static void iop_devinfo(int, char *, size_t);
static int iop_print(void *, const char *);
@@ -213,7 +213,7 @@
static int iop_handle_reply(struct iop_softc *, u_int32_t);
static int iop_hrt_get(struct iop_softc *);
static int iop_hrt_get0(struct iop_softc *, struct i2o_hrt *, int);
-static void iop_intr_event(struct device *, struct iop_msg *, void *);
+static void iop_intr_event(device_t, struct iop_msg *, void *);
static int iop_lct_get0(struct iop_softc *, struct i2o_lct *, int,
u_int32_t);
static void iop_msg_poll(struct iop_softc *, struct iop_msg *, int);
@@ -417,7 +417,7 @@
* Defer further configuration until (a) interrupts are working and
* (b) we have enough information to build the system table.
*/
- config_interrupts((struct device *)sc, iop_config_interrupts);
+ config_interrupts((device_t)sc, iop_config_interrupts);
/* Configure shutdown hook before we start any device activity. */
if (iop_sdh == NULL)
@@ -461,7 +461,7 @@
* Perform autoconfiguration tasks.
*/
static void
-iop_config_interrupts(struct device *self)
+iop_config_interrupts(device_t self)
{
struct iop_attach_args ia;
struct iop_softc *sc, *iop;
@@ -770,7 +770,7 @@
struct iop_attach_args ia;
struct iop_initiator *ii;
const struct i2o_lct_entry *le;
- struct device *dv;
+ device_t dv;
int i, j, nent;
u_int usertid;
int locs[IOPCF_NLOCS];
@@ -1803,7 +1803,7 @@
* Handle an event signalled by the executive.
*/
static void
-iop_intr_event(struct device *dv, struct iop_msg *im, void *reply)
+iop_intr_event(device_t dv, struct iop_msg *im, void *reply)
{
struct i2o_util_event_register_reply *rb;
u_int event;
Index: src/sys/dev/i2o/iopsp.c
diff -u src/sys/dev/i2o/iopsp.c:1.34 src/sys/dev/i2o/iopsp.c:1.35
--- src/sys/dev/i2o/iopsp.c:1.34 Tue May 12 12:14:18 2009
+++ src/sys/dev/i2o/iopsp.c Tue May 12 14:23:47 2009
@@ -1
CVS commit: src/sys/dev/i2o
Module Name:src
Committed By: cegger
Date: Tue May 12 12:14:18 UTC 2009
Modified Files:
src/sys/dev/i2o: dpti.c iopsp.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/i2o/dpti.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/i2o/iopsp.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/i2o/dpti.c
diff -u src/sys/dev/i2o/dpti.c:1.40 src/sys/dev/i2o/dpti.c:1.41
--- src/sys/dev/i2o/dpti.c:1.40 Mon Sep 8 23:36:54 2008
+++ src/sys/dev/i2o/dpti.c Tue May 12 12:14:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dpti.c,v 1.40 2008/09/08 23:36:54 gmcgarry Exp $ */
+/* $NetBSD: dpti.c,v 1.41 2009/05/12 12:14:18 cegger Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.40 2008/09/08 23:36:54 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.41 2009/05/12 12:14:18 cegger Exp $");
#include
#include
@@ -131,7 +131,7 @@
void dpti_attach(struct device *, struct device *, void *);
int dpti_blinkled(struct dpti_softc *);
int dpti_ctlrinfo(struct dpti_softc *, int, void *);
-int dpti_match(struct device *, struct cfdata *, void *);
+int dpti_match(struct device *, cfdata_t, void *);
int dpti_passthrough(struct dpti_softc *, void *, struct proc *);
int dpti_sysinfo(struct dpti_softc *, int, void *);
@@ -149,7 +149,7 @@
dpti_match, dpti_attach, NULL, NULL);
int
-dpti_match(struct device *parent, struct cfdata *match, void *aux)
+dpti_match(struct device *parent, cfdata_t match, void *aux)
{
struct iop_attach_args *ia;
struct iop_softc *iop;
Index: src/sys/dev/i2o/iopsp.c
diff -u src/sys/dev/i2o/iopsp.c:1.33 src/sys/dev/i2o/iopsp.c:1.34
--- src/sys/dev/i2o/iopsp.c:1.33 Mon Sep 8 23:36:54 2008
+++ src/sys/dev/i2o/iopsp.c Tue May 12 12:14:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: iopsp.c,v 1.33 2008/09/08 23:36:54 gmcgarry Exp $ */
+/* $NetBSD: iopsp.c,v 1.34 2009/05/12 12:14:18 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.33 2008/09/08 23:36:54 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.34 2009/05/12 12:14:18 cegger Exp $");
#include
#include
@@ -67,7 +67,7 @@
static void iopsp_intr(struct device *, struct iop_msg *, void *);
static int iopsp_ioctl(struct scsipi_channel *, u_long,
void *, int, struct proc *);
-static int iopsp_match(struct device *, struct cfdata *, void *);
+static int iopsp_match(struct device *, cfdata_t, void *);
static int iopsp_rescan(struct iopsp_softc *);
static int iopsp_reconfig(struct device *);
static void iopsp_scsipi_request(struct scsipi_channel *,
@@ -80,7 +80,7 @@
* Match a supported device.
*/
static int
-iopsp_match(struct device *parent, struct cfdata *match, void *aux)
+iopsp_match(struct device *parent, cfdata_t match, void *aux)
{
struct iop_attach_args *ia;
struct {
