diff --git a/sys/arch/alpha/alpha/api_up1000.c b/sys/arch/alpha/alpha/api_up1000.c index fb9800f9c819..8a7030a90478 100644 --- a/sys/arch/alpha/alpha/api_up1000.c +++ b/sys/arch/alpha/alpha/api_up1000.c @@ -1,4 +1,4 @@ -/* $NetBSD: api_up1000.c,v 1.22 2007/03/04 05:59:08 christos Exp $ */ +/* $NetBSD: api_up1000.c,v 1.23 2007/03/04 15:18:09 yamt Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -34,7 +34,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.22 2007/03/04 05:59:08 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.23 2007/03/04 15:18:09 yamt Exp $"); #include #include @@ -115,7 +115,7 @@ api_up1000_cons_init() icp = &irongate_configuration; irongate_init(icp, 0); - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_PRINTERPORT: diff --git a/sys/arch/alpha/alpha/dec_1000a.c b/sys/arch/alpha/alpha/dec_1000a.c index 1f9004816f8b..e9f87b9557a6 100644 --- a/sys/arch/alpha/alpha/dec_1000a.c +++ b/sys/arch/alpha/alpha/dec_1000a.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_1000a.c,v 1.24 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_1000a.c,v 1.25 2007/03/04 15:18:09 yamt Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.24 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.25 2007/03/04 15:18:09 yamt Exp $"); #include #include @@ -188,7 +188,7 @@ dec_1000a_cons_init() pcichipset = &acp->ac_pc; } - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_PRINTERPORT: diff --git a/sys/arch/alpha/alpha/dec_2000_300.c b/sys/arch/alpha/alpha/dec_2000_300.c index 13beca5bf53d..d67f9a4091ce 100644 --- a/sys/arch/alpha/alpha/dec_2000_300.c +++ b/sys/arch/alpha/alpha/dec_2000_300.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_2000_300.c,v 1.12 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_2000_300.c,v 1.13 2007/03/04 15:18:10 yamt Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_2000_300.c,v 1.12 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_2000_300.c,v 1.13 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -135,7 +135,7 @@ dec_2000_300_cons_init(void) jcp = &jensenio_configuration; jensenio_init(jcp, 0); - ctb = (struct ctb_tt *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb_tt *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); /* * The Jensen uses an older (pre-Type 4) CTB format. The diff --git a/sys/arch/alpha/alpha/dec_2100_a50.c b/sys/arch/alpha/alpha/dec_2100_a50.c index 250603059ab2..b30655cc2ca5 100644 --- a/sys/arch/alpha/alpha/dec_2100_a50.c +++ b/sys/arch/alpha/alpha/dec_2100_a50.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_2100_a50.c,v 1.60 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_2100_a50.c,v 1.61 2007/03/04 15:18:10 yamt Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -34,7 +34,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.60 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.61 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -139,7 +139,7 @@ dec_2100_a50_cons_init() acp = &apecs_configuration; apecs_init(acp, 0); - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_PRINTERPORT: diff --git a/sys/arch/alpha/alpha/dec_2100_a500.c b/sys/arch/alpha/alpha/dec_2100_a500.c index 04f9a3328115..879c707982e5 100644 --- a/sys/arch/alpha/alpha/dec_2100_a500.c +++ b/sys/arch/alpha/alpha/dec_2100_a500.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_2100_a500.c,v 1.16 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_2100_a500.c,v 1.17 2007/03/04 15:18:10 yamt Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.16 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.17 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -159,7 +159,7 @@ dec_2100_a500_cons_init(void) u_int64_t ctbslot; struct ttwoga_config *tcp; - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); ctbslot = ctb->ctb_turboslot; tcp = ttwoga_init(0, 0); diff --git a/sys/arch/alpha/alpha/dec_3000_300.c b/sys/arch/alpha/alpha/dec_3000_300.c index fea1345f7f7b..823bb1f6d61c 100644 --- a/sys/arch/alpha/alpha/dec_3000_300.c +++ b/sys/arch/alpha/alpha/dec_3000_300.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3000_300.c,v 1.42 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_3000_300.c,v 1.43 2007/03/04 15:18:10 yamt Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -33,7 +33,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.42 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.43 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -94,7 +94,7 @@ dec_3000_300_cons_init() { struct ctb *ctb; - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_GRAPHICS: diff --git a/sys/arch/alpha/alpha/dec_3000_500.c b/sys/arch/alpha/alpha/dec_3000_500.c index 26ddab43f5d0..206fd1cda4c3 100644 --- a/sys/arch/alpha/alpha/dec_3000_500.c +++ b/sys/arch/alpha/alpha/dec_3000_500.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3000_500.c,v 1.41 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_3000_500.c,v 1.42 2007/03/04 15:18:10 yamt Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -32,7 +32,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.41 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.42 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -114,7 +114,7 @@ dec_3000_500_cons_init() { struct ctb *ctb; - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_GRAPHICS: diff --git a/sys/arch/alpha/alpha/dec_550.c b/sys/arch/alpha/alpha/dec_550.c index bd5f909c8950..0e30646c418b 100644 --- a/sys/arch/alpha/alpha/dec_550.c +++ b/sys/arch/alpha/alpha/dec_550.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_550.c,v 1.29 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_550.c,v 1.30 2007/03/04 15:18:10 yamt Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -34,7 +34,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.29 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.30 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -126,7 +126,7 @@ dec_550_cons_init() ccp = &cia_configuration; cia_init(ccp, 0); - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_PRINTERPORT: diff --git a/sys/arch/alpha/alpha/dec_6600.c b/sys/arch/alpha/alpha/dec_6600.c index 1d9813c0545f..78b77a3ad27e 100644 --- a/sys/arch/alpha/alpha/dec_6600.c +++ b/sys/arch/alpha/alpha/dec_6600.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_6600.c,v 1.25 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_6600.c,v 1.26 2007/03/04 15:18:10 yamt Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -31,7 +31,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.25 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.26 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -111,7 +111,7 @@ dec_6600_cons_init() u_int64_t ctbslot; struct tsp_config *tsp; - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); ctbslot = ctb->ctb_turboslot; /* Console hose defaults to hose 0. */ diff --git a/sys/arch/alpha/alpha/dec_alphabook1.c b/sys/arch/alpha/alpha/dec_alphabook1.c index a1c8079e803a..f601acb59951 100644 --- a/sys/arch/alpha/alpha/dec_alphabook1.c +++ b/sys/arch/alpha/alpha/dec_alphabook1.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_alphabook1.c,v 1.20 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_alphabook1.c,v 1.21 2007/03/04 15:18:10 yamt Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -34,7 +34,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.20 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.21 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -119,7 +119,7 @@ dec_alphabook1_cons_init() lcp = &lca_configuration; lca_init(lcp, 0); - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_PRINTERPORT: diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c index 30df14165c46..b694f8c04ad2 100644 --- a/sys/arch/alpha/alpha/dec_axppci_33.c +++ b/sys/arch/alpha/alpha/dec_axppci_33.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_axppci_33.c,v 1.60 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_axppci_33.c,v 1.61 2007/03/04 15:18:10 yamt Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -34,7 +34,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.60 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.61 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -173,7 +173,7 @@ dec_axppci_33_cons_init() lcp = lca_preinit(); - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_PRINTERPORT: diff --git a/sys/arch/alpha/alpha/dec_eb64plus.c b/sys/arch/alpha/alpha/dec_eb64plus.c index a0ca3cf72053..ba1b3aa53eba 100644 --- a/sys/arch/alpha/alpha/dec_eb64plus.c +++ b/sys/arch/alpha/alpha/dec_eb64plus.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_eb64plus.c,v 1.35 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_eb64plus.c,v 1.36 2007/03/04 15:18:10 yamt Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -34,7 +34,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.35 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.36 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -129,7 +129,7 @@ dec_eb64plus_cons_init() acp = &apecs_configuration; apecs_init(acp, 0); - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_PRINTERPORT: diff --git a/sys/arch/alpha/alpha/dec_eb66.c b/sys/arch/alpha/alpha/dec_eb66.c index 5e2bb7f028dc..37fac255a52d 100644 --- a/sys/arch/alpha/alpha/dec_eb66.c +++ b/sys/arch/alpha/alpha/dec_eb66.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_eb66.c,v 1.21 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_eb66.c,v 1.22 2007/03/04 15:18:10 yamt Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -34,7 +34,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.21 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.22 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -126,7 +126,7 @@ dec_eb66_cons_init() lcp = &lca_configuration; lca_init(lcp, 0); - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_PRINTERPORT: diff --git a/sys/arch/alpha/alpha/dec_kn20aa.c b/sys/arch/alpha/alpha/dec_kn20aa.c index 917cf3fa1d66..61edb2078e29 100644 --- a/sys/arch/alpha/alpha/dec_kn20aa.c +++ b/sys/arch/alpha/alpha/dec_kn20aa.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_kn20aa.c,v 1.58 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_kn20aa.c,v 1.59 2007/03/04 15:18:10 yamt Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -34,7 +34,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.58 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.59 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -128,7 +128,7 @@ dec_kn20aa_cons_init() ccp = &cia_configuration; cia_init(ccp, 0); - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_PRINTERPORT: diff --git a/sys/arch/alpha/alpha/dec_kn300.c b/sys/arch/alpha/alpha/dec_kn300.c index f4c025c1697f..1d30d9680e47 100644 --- a/sys/arch/alpha/alpha/dec_kn300.c +++ b/sys/arch/alpha/alpha/dec_kn300.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_kn300.c,v 1.33 2007/03/04 05:59:09 christos Exp $ */ +/* $NetBSD: dec_kn300.c,v 1.34 2007/03/04 15:18:10 yamt Exp $ */ /* * Copyright (c) 1998 by Matthew Jacob @@ -34,7 +34,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.33 2007/03/04 05:59:09 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.34 2007/03/04 15:18:10 yamt Exp $"); #include #include @@ -165,7 +165,7 @@ dec_kn300_cons_init() ccp = &mcpcia_console_configuration; /* It's already initialized. */ - ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off); + ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case CTB_PRINTERPORT: diff --git a/sys/dev/scsipi/if_se.c b/sys/dev/scsipi/if_se.c index 64a78ba63b31..f758d7a68a67 100644 --- a/sys/dev/scsipi/if_se.c +++ b/sys/dev/scsipi/if_se.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_se.c,v 1.64 2007/03/04 06:02:42 christos Exp $ */ +/* $NetBSD: if_se.c,v 1.65 2007/03/04 15:17:20 yamt Exp $ */ /* * Copyright (c) 1997 Ian W. Dall @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.64 2007/03/04 06:02:42 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.65 2007/03/04 15:17:20 yamt Exp $"); #include "opt_inet.h" #include "opt_atalk.h" @@ -606,7 +606,7 @@ se_get(sc, data, totlen) } if (m == m0) { - void *newdata = (void *) + char *newdata = (char *) ALIGN(m->m_data + sizeof(struct ether_header)) - sizeof(struct ether_header); len -= newdata - m->m_data;