Rename printf -> kprintf in sys/ and add some defines where necessary
authorSascha Wildner <swildner@dragonflybsd.org>
Fri, 22 Dec 2006 23:44:57 +0000 (23:44 +0000)
committerSascha Wildner <swildner@dragonflybsd.org>
Fri, 22 Dec 2006 23:44:57 +0000 (23:44 +0000)
(files which are used in userland, too).

103 files changed:
sys/net/accf_http/accf_http.c
sys/net/altq/altq_cbq.c
sys/net/altq/altq_hfsc.c
sys/net/altq/altq_priq.c
sys/net/altq/altq_red.c
sys/net/altq/altq_rio.c
sys/net/altq/altq_rmclass.c
sys/net/altq/altq_rmclass.h
sys/net/altq/altq_subr.c
sys/net/bpf.c
sys/net/bridge/if_bridge.c
sys/net/bsd_comp.c
sys/net/disc/if_disc.c
sys/net/dummynet/ip_dummynet.c
sys/net/ef/if_ef.c
sys/net/gre/if_gre.c
sys/net/hostcache.c
sys/net/i4b/capi/capi_l4if.c
sys/net/i4b/capi/capi_llif.c
sys/net/i4b/capi/capi_msgs.c
sys/net/i4b/capi/iavc/iavc_isa.c
sys/net/i4b/capi/iavc/iavc_lli.c
sys/net/i4b/capi/iavc/iavc_pci.c
sys/net/i4b/driver/i4b_ctl.c
sys/net/i4b/driver/i4b_ing.c
sys/net/i4b/driver/i4b_ipr.c
sys/net/i4b/driver/i4b_isppp.c
sys/net/i4b/driver/i4b_rbch.c
sys/net/i4b/driver/i4b_tel.c
sys/net/i4b/driver/i4b_trace.c
sys/net/i4b/include/i386/i4b_debug.h
sys/net/i4b/layer1/i4b_l1dmux.c
sys/net/i4b/layer1/i4b_l1lib.c
sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c
sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c
sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c
sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c
sys/net/i4b/layer1/isic/i4b_avm_a1.c
sys/net/i4b/layer1/isic/i4b_bchan.c
sys/net/i4b/layer1/isic/i4b_ctx_s0P.c
sys/net/i4b/layer1/isic/i4b_diva.c
sys/net/i4b/layer1/isic/i4b_drn_ngo.c
sys/net/i4b/layer1/isic/i4b_dynalink.c
sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c
sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c
sys/net/i4b/layer1/isic/i4b_hscx.c
sys/net/i4b/layer1/isic/i4b_isac.c
sys/net/i4b/layer1/isic/i4b_isic.c
sys/net/i4b/layer1/isic/i4b_isic_isa.c
sys/net/i4b/layer1/isic/i4b_isic_pnp.c
sys/net/i4b/layer1/isic/i4b_itk_ix1.c
sys/net/i4b/layer1/isic/i4b_sws.c
sys/net/i4b/layer1/isic/i4b_tel_s016.c
sys/net/i4b/layer1/isic/i4b_tel_s0163.c
sys/net/i4b/layer1/isic/i4b_tel_s08.c
sys/net/i4b/layer1/isic/i4b_usr_sti.c
sys/net/i4b/layer1/itjc/i4b_itjc_pci.c
sys/net/i4b/layer1/iwic/i4b_iwic_fsm.c
sys/net/i4b/layer1/iwic/i4b_iwic_pci.c
sys/net/i4b/layer2/i4b_mbuf.c
sys/net/i4b/layer2/i4b_util.c
sys/net/i4b/layer4/i4b_i4bdrv.c
sys/net/i4b/layer4/i4b_l4mgmt.c
sys/net/if.c
sys/net/if_arcsubr.c
sys/net/if_atmsubr.c
sys/net/if_ethersubr.c
sys/net/if_fddisubr.c
sys/net/if_iso88025subr.c
sys/net/if_loop.c
sys/net/if_media.c
sys/net/ip6fw/ip6_fw.c
sys/net/ip_mroute/ip_mroute.c
sys/net/ipfw/ip_fw.c
sys/net/ipfw/ip_fw2.c
sys/net/netisr.c
sys/net/pf/if_pflog.c
sys/net/pf/if_pfsync.c
sys/net/pf/pf.c
sys/net/pf/pf_if.c
sys/net/pf/pf_ioctl.c
sys/net/pf/pf_norm.c
sys/net/pf/pf_osfp.c
sys/net/pf/pf_table.c
sys/net/ppp/if_ppp.c
sys/net/ppp_layer/ppp_deflate.c
sys/net/ppp_layer/ppp_tty.c
sys/net/radix.c
sys/net/route.c
sys/net/sl/if_sl.c
sys/net/sppp/if_spppsubr.c
sys/net/stf/if_stf.c
sys/net/vlan/if_vlan.c
sys/netgraph/eiface/ng_eiface.c
sys/netgraph/fec/ng_fec.c
sys/netgraph/iface/ng_iface.c
sys/netgraph/netgraph/ng_base.c
sys/netgraph/ng_device.c
sys/netgraph/pppoe/ng_pppoe.c

index 48321ed..afd13e9 100644 (file)
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *     $FreeBSD: src/sys/netinet/accf_http.c,v 1.1.2.4 2002/05/01 08:34:37 alfred Exp $
- *     $DragonFly: src/sys/net/accf_http/accf_http.c,v 1.2 2003/06/17 04:28:51 dillon Exp $
+ *     $DragonFly: src/sys/net/accf_http/accf_http.c,v 1.3 2006/12/22 23:44:55 swildner Exp $
  */
 
 #define ACCEPT_FILTER_MOD
@@ -89,7 +89,7 @@ SYSCTL_INT(_net_inet_accf_http, OID_AUTO, parsehttpversion, CTLFLAG_RW,
 #ifdef ACCF_HTTP_DEBUG
 #define DPRINT(fmt, args...) \
        do {    \
-               printf("%s:%d: " fmt "\n", __func__, __LINE__ , ##args);        \
+               kprintf("%s:%d: " fmt "\n", __func__, __LINE__ , ##args);       \
        } while (0)
 #else
 #define DPRINT(fmt, args...)
index f58ecd5..60cd22f 100644 (file)
@@ -1,5 +1,5 @@
 /*     $KAME: altq_cbq.c,v 1.20 2004/04/17 10:54:48 kjc Exp $  */
-/*     $DragonFly: src/sys/net/altq/altq_cbq.c,v 1.5 2006/10/24 17:16:13 dillon Exp $ */
+/*     $DragonFly: src/sys/net/altq/altq_cbq.c,v 1.6 2006/12/22 23:44:55 swildner Exp $ */
 
 /*
  * Copyright (c) Sun Microsystems, Inc. 1993-1998 All rights reserved.
@@ -306,12 +306,12 @@ cbq_add_queue(struct pf_altq *a)
         * borrow at all.  Hence, borrow can be null.
         */
        if (parent == NULL && (opts->flags & CBQCLF_ROOTCLASS) == 0) {
-               printf("cbq_add_queue: no parent class!\n");
+               kprintf("cbq_add_queue: no parent class!\n");
                return (EINVAL);
        }
 
        if ((borrow != parent)  && (borrow != NULL)) {
-               printf("cbq_add_class: borrow class != parent\n");
+               kprintf("cbq_add_class: borrow class != parent\n");
                return (EINVAL);
        }
 
index b25e00e..e81dba8 100644 (file)
@@ -1,5 +1,5 @@
 /*     $KAME: altq_hfsc.c,v 1.25 2004/04/17 10:54:48 kjc Exp $ */
-/*     $DragonFly: src/sys/net/altq/altq_hfsc.c,v 1.7 2006/10/24 17:16:13 dillon Exp $ */
+/*     $DragonFly: src/sys/net/altq/altq_hfsc.c,v 1.8 2006/12/22 23:44:55 swildner Exp $ */
 
 /*
  * Copyright (c) 1997-1999 Carnegie Mellon University. All Rights Reserved.
@@ -350,7 +350,7 @@ hfsc_class_create(struct hfsc_if *hif, struct service_curve *rsc,
 #ifndef ALTQ_RED
        if (flags & HFCF_RED) {
 #ifdef ALTQ_DEBUG
-               printf("hfsc_class_create: RED not configured for HFSC!\n");
+               kprintf("hfsc_class_create: RED not configured for HFSC!\n");
 #endif
                return (NULL);
        }
@@ -708,7 +708,7 @@ hfsc_dequeue(struct ifaltq *ifq, struct mbuf *mpolled, int op)
                                if (cl == NULL) {
 #ifdef ALTQ_DEBUG
                                        if (fits > 0)
-                                               printf("%d fit but none found\n",fits);
+                                               kprintf("%d fit but none found\n",fits);
 #endif
                                        m = NULL;
                                        goto done;
index 86fe965..1f31864 100644 (file)
@@ -1,5 +1,5 @@
 /*     $KAME: altq_priq.c,v 1.12 2004/04/17 10:54:48 kjc Exp $ */
-/*     $DragonFly: src/sys/net/altq/altq_priq.c,v 1.7 2006/10/24 17:16:13 dillon Exp $ */
+/*     $DragonFly: src/sys/net/altq/altq_priq.c,v 1.8 2006/12/22 23:44:55 swildner Exp $ */
 
 /*
  * Copyright (C) 2000-2003
@@ -254,7 +254,7 @@ priq_class_create(struct priq_if *pif, int pri, int qlimit, int flags, int qid)
 #ifndef ALTQ_RED
        if (flags & PRCF_RED) {
 #ifdef ALTQ_DEBUG
-               printf("priq_class_create: RED not configured for PRIQ!\n");
+               kprintf("priq_class_create: RED not configured for PRIQ!\n");
 #endif
                return (NULL);
        }
index a335483..3163ea2 100644 (file)
@@ -1,5 +1,5 @@
 /*     $KAME: altq_red.c,v 1.19 2004/04/17 10:54:49 kjc Exp $  */
-/*     $DragonFly: src/sys/net/altq/altq_red.c,v 1.3 2006/09/05 00:55:47 dillon Exp $ */
+/*     $DragonFly: src/sys/net/altq/altq_red.c,v 1.4 2006/12/22 23:44:55 swildner Exp $ */
 
 /*
  * Copyright (C) 1997-2003
@@ -214,7 +214,7 @@ red_alloc(int weight, int inv_pmax, int th_min, int th_max, int flags, int pktti
        rp->red_wshift = i;
        w = 1 << rp->red_wshift;
        if (w != rp->red_weight) {
-               printf("invalid weight value %d for red! use %d\n",
+               kprintf("invalid weight value %d for red! use %d\n",
                       rp->red_weight, w);
                rp->red_weight = w;
        }
index 963f80a..040d97b 100644 (file)
@@ -1,5 +1,5 @@
 /*     $KAME: altq_rio.c,v 1.17 2003/07/10 12:07:49 kjc Exp $  */
-/*     $DragonFly: src/sys/net/altq/altq_rio.c,v 1.2 2006/09/05 00:55:47 dillon Exp $ */
+/*     $DragonFly: src/sys/net/altq/altq_rio.c,v 1.3 2006/12/22 23:44:55 swildner Exp $ */
 
 /*
  * Copyright (C) 1998-2003
@@ -193,7 +193,7 @@ rio_alloc(int weight, struct redparams *params, int flags, int pkttime)
        rp->rio_wshift = i;
        w = 1 << rp->rio_wshift;
        if (w != rp->rio_weight) {
-               printf("invalid weight value %d for red! use %d\n",
+               kprintf("invalid weight value %d for red! use %d\n",
                       rp->rio_weight, w);
                rp->rio_weight = w;
        }
index a8a910e..93705f2 100644 (file)
@@ -1,5 +1,5 @@
 /*     $KAME: altq_rmclass.c,v 1.18 2003/11/06 06:32:53 kjc Exp $      */
-/*     $DragonFly: src/sys/net/altq/altq_rmclass.c,v 1.7 2006/09/05 00:55:47 dillon Exp $ */
+/*     $DragonFly: src/sys/net/altq/altq_rmclass.c,v 1.8 2006/12/22 23:44:55 swildner Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Regents of the University of California.
@@ -202,7 +202,7 @@ rmc_newclass(int pri, struct rm_ifdat *ifd, u_int nsecPerByte,
 #ifndef ALTQ_RED
        if (flags & RMCF_RED) {
 #ifdef ALTQ_DEBUG
-               printf("rmc_newclass: RED not configured for CBQ!\n");
+               kprintf("rmc_newclass: RED not configured for CBQ!\n");
 #endif
                return (NULL);
        }
@@ -210,7 +210,7 @@ rmc_newclass(int pri, struct rm_ifdat *ifd, u_int nsecPerByte,
 #ifndef ALTQ_RIO
        if (flags & RMCF_RIO) {
 #ifdef ALTQ_DEBUG
-               printf("rmc_newclass: RIO not configured for CBQ!\n");
+               kprintf("rmc_newclass: RIO not configured for CBQ!\n");
 #endif
                return (NULL);
        }
@@ -700,7 +700,7 @@ rmc_init(struct ifaltq *ifq, struct rm_ifdat *ifd, u_int nsecPerByte,
        ifd->root_ = rmc_newclass(0, ifd, nsecPerByte, rmc_root_overlimit,
                                  maxq, 0, 0, maxidle, minidle, offtime, 0, 0);
        if (ifd->root_ == NULL) {
-               printf("rmc_init: root class not allocated\n");
+               kprintf("rmc_init: root class not allocated\n");
                return ;
        }
        ifd->root_->depth_ = 0;
@@ -1643,11 +1643,11 @@ cbqtrace_dump(int counter)
        p = (int *)&cbqtrace_buffer[counter];
 
        for (i=0; i<20; i++) {
-               printf("[0x%x] ", *p++);
-               printf("%s: ", rmc_funcname((void *)*p++));
+               kprintf("[0x%x] ", *p++);
+               kprintf("%s: ", rmc_funcname((void *)*p++));
                cp = (char *)p++;
-               printf("%c%c%c%c: ", cp[0], cp[1], cp[2], cp[3]);
-               printf("%d\n",*p++);
+               kprintf("%c%c%c%c: ", cp[0], cp[1], cp[2], cp[3]);
+               kprintf("%d\n",*p++);
 
                if (p >= (int *)&cbqtrace_buffer[NCBQTRACE])
                        p = (int *)cbqtrace_buffer;
index fa20242..b2fd9d9 100644 (file)
@@ -1,5 +1,5 @@
 /*     $KAME: altq_rmclass.h,v 1.10 2003/08/20 23:30:23 itojun Exp $   */
-/*     $DragonFly: src/sys/net/altq/altq_rmclass.h,v 1.1 2005/02/11 22:25:57 joerg Exp $ */
+/*     $DragonFly: src/sys/net/altq/altq_rmclass.h,v 1.2 2006/12/22 23:44:55 swildner Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Regents of the University of California.
@@ -79,7 +79,7 @@ struct red;
                switch (xxs) { \
                default: \
                        /* if (xxs < 0) \
-                               printf("rm_class: bogus time values\n"); */ \
+                               kprintf("rm_class: bogus time values\n"); */ \
                        delta = 0; \
                        /* fall through */ \
                case 2: \
index 606fd4b..74c99c6 100644 (file)
@@ -1,5 +1,5 @@
 /*     $KAME: altq_subr.c,v 1.23 2004/04/20 16:10:06 itojun Exp $      */
-/*     $DragonFly: src/sys/net/altq/altq_subr.c,v 1.8 2006/09/05 00:55:47 dillon Exp $ */
+/*     $DragonFly: src/sys/net/altq/altq_subr.c,v 1.9 2006/12/22 23:44:55 swildner Exp $ */
 
 /*
  * Copyright (C) 1997-2003
@@ -247,7 +247,7 @@ tbr_set(struct ifaltq *ifq, struct tb_profile *profile)
        if (machclk_freq == 0)
                init_machclk();
        if (machclk_freq == 0) {
-               printf("tbr_set: no cpu clock available!\n");
+               kprintf("tbr_set: no cpu clock available!\n");
                return (ENXIO);
        }
 
@@ -601,7 +601,7 @@ read_dsfield(struct mbuf *m, struct altq_pktattr *pktattr)
                /* ick, pattr_hdr is stale */
                pktattr->pattr_af = AF_UNSPEC;
 #ifdef ALTQ_DEBUG
-               printf("read_dsfield: can't locate header!\n");
+               kprintf("read_dsfield: can't locate header!\n");
 #endif
                return ((uint8_t)0);
        }
@@ -646,7 +646,7 @@ write_dsfield(struct mbuf *m, struct altq_pktattr *pktattr, uint8_t dsfield)
                /* ick, pattr_hdr is stale */
                pktattr->pattr_af = AF_UNSPEC;
 #ifdef ALTQ_DEBUG
-               printf("write_dsfield: can't locate header!\n");
+               kprintf("write_dsfield: can't locate header!\n");
 #endif
                return;
        }
@@ -724,7 +724,7 @@ init_machclk(void)
                machclk_freq = 1000000 << MACHCLK_SHIFT;
                machclk_per_tick = machclk_freq / hz;
 #ifdef ALTQ_DEBUG
-               printf("altq: emulate %uHz cpu clock\n", machclk_freq);
+               kprintf("altq: emulate %uHz cpu clock\n", machclk_freq);
 #endif
                return;
        }
@@ -763,7 +763,7 @@ init_machclk(void)
        machclk_per_tick = machclk_freq / hz;
 
 #ifdef ALTQ_DEBUG
-       printf("altq: CPU clock: %uHz\n", machclk_freq);
+       kprintf("altq: CPU clock: %uHz\n", machclk_freq);
 #endif
 }
 
index afdd61e..eb10c30 100644 (file)
@@ -38,7 +38,7 @@
  *      @(#)bpf.c      8.2 (Berkeley) 3/28/94
  *
  * $FreeBSD: src/sys/net/bpf.c,v 1.59.2.12 2002/04/14 21:41:48 luigi Exp $
- * $DragonFly: src/sys/net/bpf.c,v 1.34 2006/09/10 01:26:39 dillon Exp $
+ * $DragonFly: src/sys/net/bpf.c,v 1.35 2006/12/22 23:44:54 swildner Exp $
  */
 
 #include "use_bpf.h"
@@ -1318,7 +1318,7 @@ bpfdetach(struct ifnet *ifp)
        /* Interface wasn't attached */
        if (bp->bif_ifp == NULL) {
                crit_exit();
-               printf("bpfdetach: %s was not attached\n", ifp->if_xname);
+               kprintf("bpfdetach: %s was not attached\n", ifp->if_xname);
                return;
        }
 
index 76fea15..d0393a7 100644 (file)
@@ -66,7 +66,7 @@
  * $OpenBSD: if_bridge.c,v 1.60 2001/06/15 03:38:33 itojun Exp $
  * $NetBSD: if_bridge.c,v 1.31 2005/06/01 19:45:34 jdc Exp $
  * $FreeBSD: src/sys/net/if_bridge.c,v 1.26 2005/10/13 23:05:55 thompsa Exp $
- * $DragonFly: src/sys/net/bridge/if_bridge.c,v 1.14 2006/12/19 00:11:13 dillon Exp $
+ * $DragonFly: src/sys/net/bridge/if_bridge.c,v 1.15 2006/12/22 23:44:55 swildner Exp $
  */
 
 /*
@@ -2381,7 +2381,7 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir)
        if ((*mp)->m_len < i) {
            *mp = m_pullup(*mp, i);
            if (*mp == NULL) {
-               printf("%s: m_pullup failed\n", __func__);
+               kprintf("%s: m_pullup failed\n", __func__);
                return (-1);
            }
        }
index f8e6232..9764ff2 100644 (file)
@@ -41,7 +41,7 @@
  * This version is for use with mbufs on BSD-derived systems.
  *
  * $FreeBSD: src/sys/net/bsd_comp.c,v 1.11.2.1 2002/04/14 21:41:48 luigi Exp $
- * $DragonFly: src/sys/net/bsd_comp.c,v 1.10 2006/09/05 00:55:46 dillon Exp $
+ * $DragonFly: src/sys/net/bsd_comp.c,v 1.11 2006/12/22 23:44:54 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -836,7 +836,7 @@ bsd_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp)
      */
     if (seq != db->seqno) {
        if (db->debug)
-           printf("bsd_decomp%d: bad sequence # %d, expected %d\n",
+           kprintf("bsd_decomp%d: bad sequence # %d, expected %d\n",
                   db->unit, seq, db->seqno - 1);
        return DECOMP_ERROR;
     }
@@ -905,7 +905,7 @@ bsd_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp)
                if (len > 0) {
                    m_freem(mret);
                    if (db->debug)
-                       printf("bsd_decomp%d: bad CLEAR\n", db->unit);
+                       kprintf("bsd_decomp%d: bad CLEAR\n", db->unit);
                    return DECOMP_FATALERROR;   /* probably a bug */
                }
            }
@@ -918,9 +918,9 @@ bsd_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp)
            || (incode > max_ent && oldcode == CLEAR)) {
            m_freem(mret);
            if (db->debug) {
-               printf("bsd_decomp%d: bad code 0x%x oldcode=0x%x ",
+               kprintf("bsd_decomp%d: bad code 0x%x oldcode=0x%x ",
                       db->unit, incode, oldcode);
-               printf("max_ent=0x%x explen=%d seqno=%d\n",
+               kprintf("max_ent=0x%x explen=%d seqno=%d\n",
                       max_ent, explen, db->seqno);
            }
            return DECOMP_FATALERROR;   /* probably a bug */
@@ -940,11 +940,11 @@ bsd_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp)
        if (explen > db->mru + 1) {
            m_freem(mret);
            if (db->debug) {
-               printf("bsd_decomp%d: ran out of mru\n", db->unit);
+               kprintf("bsd_decomp%d: ran out of mru\n", db->unit);
 #ifdef DEBUG
                while ((cmp = cmp->m_next) != NULL)
                    len += cmp->m_len;
-               printf("  len=%d, finchar=0x%x, codelen=%d, explen=%d\n",
+               kprintf("  len=%d, finchar=0x%x, codelen=%d, explen=%d\n",
                       len, finchar, codelen, explen);
 #endif
            }
@@ -993,7 +993,7 @@ bsd_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp)
 
 #ifdef DEBUG
        if (--codelen != 0)
-           printf("bsd_decomp%d: short by %d after code 0x%x, max_ent=0x%x\n",
+           kprintf("bsd_decomp%d: short by %d after code 0x%x, max_ent=0x%x\n",
                   db->unit, codelen, incode, max_ent);
 #endif
 
@@ -1059,7 +1059,7 @@ bsd_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp)
     db->bytes_out += ilen;
     db->in_count += explen;
     if (bsd_check(db) && db->debug) {
-       printf("bsd_decomp%d: peer should have cleared dictionary\n",
+       kprintf("bsd_decomp%d: peer should have cleared dictionary\n",
               db->unit);
     }
 
@@ -1074,13 +1074,13 @@ bsd_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp)
 #ifdef DEBUG
  bad:
     if (codelen <= 0) {
-       printf("bsd_decomp%d: fell off end of chain ", db->unit);
-       printf("0x%x at 0x%x by 0x%x, max_ent=0x%x\n",
+       kprintf("bsd_decomp%d: fell off end of chain ", db->unit);
+       kprintf("0x%x at 0x%x by 0x%x, max_ent=0x%x\n",
               incode, finchar, db->dict[finchar].cptr, max_ent);
     } else if (dictp->codem1 != finchar-1) {
-       printf("bsd_decomp%d: bad code chain 0x%x finchar=0x%x ",
+       kprintf("bsd_decomp%d: bad code chain 0x%x finchar=0x%x ",
               db->unit, incode, finchar);
-       printf("oldcode=0x%x cptr=0x%x codem1=0x%x\n", oldcode,
+       kprintf("oldcode=0x%x cptr=0x%x codem1=0x%x\n", oldcode,
               db->dict[finchar].cptr, dictp->codem1);
     }
     m_freem(mret);
index c5fe367..040b88f 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     From: @(#)if_loop.c     8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/if_disc.c,v 1.26.2.2 2001/12/20 10:30:16 ru Exp $
- * $DragonFly: src/sys/net/disc/if_disc.c,v 1.9 2005/12/11 13:00:16 swildner Exp $
+ * $DragonFly: src/sys/net/disc/if_disc.c,v 1.10 2006/12/22 23:44:55 swildner Exp $
  */
 
 /*
@@ -97,7 +97,7 @@ disc_modevent(module_t mod, int type, void *data)
                discattach();
                break; 
        case MOD_UNLOAD: 
-               printf("if_disc module unload - not possible for this module type\n"); 
+               kprintf("if_disc module unload - not possible for this module type\n"); 
                return EINVAL; 
        } 
        return 0; 
index 8689129..cd916ab 100644 (file)
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.24.2.22 2003/05/13 09:31:06 maxim Exp $
- * $DragonFly: src/sys/net/dummynet/ip_dummynet.c,v 1.21 2006/09/05 03:48:12 dillon Exp $
+ * $DragonFly: src/sys/net/dummynet/ip_dummynet.c,v 1.22 2006/12/22 23:44:55 swildner Exp $
  */
 
 #if !defined(KLD_MODULE)
@@ -176,7 +176,7 @@ rt_unref(struct rtentry *rt)
     if (rt == NULL)
        return ;
     if (rt->rt_refcnt <= 0)
-       printf("-- warning, refcnt now %ld, decreasing\n", rt->rt_refcnt);
+       kprintf("-- warning, refcnt now %ld, decreasing\n", rt->rt_refcnt);
     RTFREE(rt);
 }
 
@@ -205,7 +205,7 @@ heap_init(struct dn_heap *h, int new_size)
     struct dn_heap_entry *p;
 
     if (h->size >= new_size ) {
-       printf("heap_init, Bogus call, have %d want %d\n",
+       kprintf("heap_init, Bogus call, have %d want %d\n",
                h->size, new_size);
        return 0 ;
     }
@@ -279,7 +279,7 @@ heap_extract(struct dn_heap *h, void *obj)
     int child, father, max = h->elements - 1 ;
 
     if (max < 0) {
-       printf("warning, extract from empty heap 0x%p\n", h);
+       kprintf("warning, extract from empty heap 0x%p\n", h);
        return ;
     }
     father = 0 ; /* default: move up smallest child */
@@ -288,7 +288,7 @@ heap_extract(struct dn_heap *h, void *obj)
            panic("*** heap_extract from middle not supported on this heap!!!\n");
        father = *((int *)((char *)obj + h->offset)) ;
        if (father < 0 || father >= h->elements) {
-           printf("dummynet: heap_extract, father %d out of bound 0..%d\n",
+           kprintf("dummynet: heap_extract, father %d out of bound 0..%d\n",
                father, h->elements);
            panic("heap_extract");
        }
@@ -438,7 +438,7 @@ transmit_event(struct dn_pipe *pipe)
 
                if (pkt->dn_m->m_len < ETHER_HDR_LEN &&
                    (pkt->dn_m = m_pullup(pkt->dn_m, ETHER_HDR_LEN)) == NULL) {
-                   printf("dummynet: pullup fail, dropping pkt\n");
+                   kprintf("dummynet: pullup fail, dropping pkt\n");
                    break;
                }
                /*
@@ -455,7 +455,7 @@ transmit_event(struct dn_pipe *pipe)
            break;
 
        default:
-           printf("dummynet: bad switch %d!\n", pkt->dn_dir);
+           kprintf("dummynet: bad switch %d!\n", pkt->dn_dir);
            m_freem(pkt->dn_m);
            break ;
        }
@@ -515,7 +515,7 @@ ready_event(struct dn_flow_queue *q)
     int p_was_empty ;
 
     if (p == NULL) {
-       printf("ready_event- pipe is gone\n");
+       kprintf("ready_event- pipe is gone\n");
        return ;
     }
     p_was_empty = (p->head == NULL) ;
@@ -584,7 +584,7 @@ ready_event_wfq(struct dn_pipe *p)
        if (p->ifp && p->ifp->if_snd.ifq_head != NULL)
            return ;
        else {
-           DEB(printf("pipe %d ready from %s --\n",
+           DEB(kprintf("pipe %d ready from %s --\n",
                p->pipe_nr, p->if_name);)
        }
     }
@@ -707,7 +707,7 @@ dummynet(void * __unused unused)
        h = heaps[i];
        while (h->elements > 0 && DN_KEY_LEQ(h->p[0].key, curr_time) ) {
            DDB(if (h->p[0].key > curr_time)
-               printf("-- dummynet: warning, heap %d is %d ticks late\n",
+               kprintf("-- dummynet: warning, heap %d is %d ticks late\n",
                    i, (int)(curr_time - h->p[0].key));)
            p = h->p[0].object ; /* store a copy before heap_extract */
            heap_extract(h, NULL); /* need to extract before processing */
@@ -716,7 +716,7 @@ dummynet(void * __unused unused)
            else if (i == 1) {
                struct dn_pipe *pipe = p;
                if (pipe->if_name[0] != '\0')
-                   printf("*** bad ready_event_wfq for pipe %s\n",
+                   kprintf("*** bad ready_event_wfq for pipe %s\n",
                        pipe->if_name);
                else
                    ready_event_wfq(p) ;
@@ -753,12 +753,12 @@ if_tx_rdy(struct ifnet *ifp)
        for (p = all_pipes; p ; p = p->next )
            if (!strcmp(p->if_name, ifp->if_xname) ) {
                p->ifp = ifp ;
-               DEB(printf("++ tx rdy from %s (now found)\n", ifp->if_xname);)
+               DEB(kprintf("++ tx rdy from %s (now found)\n", ifp->if_xname);)
                break ;
            }
     }
     if (p != NULL) {
-       DEB(printf("++ tx rdy from %s - qlen %d\n", ifp->if_xname,
+       DEB(kprintf("++ tx rdy from %s - qlen %d\n", ifp->if_xname,
                ifp->if_snd.ifq_len);)
        p->numbytes = 0 ; /* mark ready for I/O */
        ready_event_wfq(p);
@@ -919,7 +919,7 @@ red_drops(struct dn_flow_set *fs, struct dn_flow_queue *q, int len)
     /* queue in bytes or packets ? */
     u_int q_size = (fs->flags_fs & DN_QSIZE_IS_BYTES) ? q->len_bytes : q->len;
 
-    DEB(printf("\n%d q: %2u ", (int) curr_time, q_size);)
+    DEB(kprintf("\n%d q: %2u ", (int) curr_time, q_size);)
 
     /* average queue size estimation */
     if (q_size != 0) {
@@ -945,7 +945,7 @@ red_drops(struct dn_flow_set *fs, struct dn_flow_queue *q, int len)
                    SCALE_MUL(q->avg, fs->w_q_lookup[t]) : 0;
        }
     }
-    DEB(printf("avg: %u ", SCALE_VAL(q->avg));)
+    DEB(kprintf("avg: %u ", SCALE_VAL(q->avg));)
 
     /* should i drop ? */
 
@@ -964,7 +964,7 @@ red_drops(struct dn_flow_set *fs, struct dn_flow_queue *q, int len)
            p_b = SCALE_MUL((int64_t) fs->c_3, (int64_t) q->avg) - fs->c_4;
        } else {
            q->count = -1;
-           printf("- drop");
+           kprintf("- drop");
            return 1 ;
        }
     } else if (q->avg > fs->min_th) {
@@ -986,7 +986,7 @@ red_drops(struct dn_flow_set *fs, struct dn_flow_queue *q, int len)
         */
        if (SCALE_MUL(p_b, SCALE((int64_t) q->count)) > q->random) {
            q->count = 0;
-           DEB(printf("- red drop");)
+           DEB(kprintf("- red drop");)
            /* after a drop we calculate a new random value */
            q->random = krandom() & 0xffff;
            return 1;    /* drop */
@@ -1088,7 +1088,7 @@ dummynet_io(struct mbuf *m, int pipe_nr, int dir, struct ip_fw_args *fwa)
        if (pipe != NULL)
            fs->pipe = pipe ;
        else {
-           printf("No pipe %d for queue %d, drop pkt\n",
+           kprintf("No pipe %d for queue %d, drop pkt\n",
                fs->parent_nr, fs->fs_nr);
            goto dropit ;
        }
@@ -1208,14 +1208,14 @@ dummynet_io(struct mbuf *m, int pipe_nr, int dir, struct ip_fw_args *fwa)
         */
        if (DN_KEY_GT(q->S, pipe->V) ) { /* not eligible */
            if (pipe->scheduler_heap.elements == 0)
-               printf("++ ouch! not eligible but empty scheduler!\n");
+               kprintf("++ ouch! not eligible but empty scheduler!\n");
            heap_insert(&(pipe->not_eligible_heap), q->S, q);
        } else {
            heap_insert(&(pipe->scheduler_heap), q->F, q);
            if (pipe->numbytes >= 0) { /* pipe is idle */
                if (pipe->scheduler_heap.elements != 1)
-                   printf("*** OUCH! pipe should have been idle!\n");
-               DEB(printf("Waking up pipe %d at %d\n",
+                   kprintf("*** OUCH! pipe should have been idle!\n");
+               DEB(kprintf("Waking up pipe %d at %d\n",
                        pipe->pipe_nr, (int)(q->F >> MY_M)); )
                pipe->sched_time = curr_time ;
                ready_event_wfq(pipe);
@@ -1409,7 +1409,7 @@ config_red(struct dn_flow_set *p, struct dn_flow_set * x)
        x->w_q_lookup = NULL ;
     }
     if (red_lookup_depth == 0) {
-       printf("\nnet.inet.ip.dummynet.red_lookup_depth must be > 0");
+       kprintf("\nnet.inet.ip.dummynet.red_lookup_depth must be > 0");
        kfree(x, M_DUMMYNET);
        return EINVAL;
     }
@@ -1683,7 +1683,7 @@ delete_pipe(struct dn_pipe *p)
        /* remove all references to this pipe from flow_sets */
        for (fs = all_flow_sets; fs; fs= fs->next )
            if (fs->pipe == b) {
-               printf("++ ref to pipe %d from fs %d\n",
+               kprintf("++ ref to pipe %d from fs %d\n",
                        p->pipe_nr, fs->fs_nr);
                fs->pipe = NULL ;
                purge_flow_set(fs, 0);
@@ -1739,10 +1739,10 @@ dn_copy_set(struct dn_flow_set *set, char *bp)
     for (i = 0 ; i <= set->rq_size ; i++)
        for (q = set->rq[i] ; q ; q = q->next, qp++ ) {
            if (q->hash_slot != i)
-               printf("++ at %d: wrong slot (have %d, "
+               kprintf("++ at %d: wrong slot (have %d, "
                    "should be %d)\n", copied, q->hash_slot, i);
            if (q->fs != set)
-               printf("++ at %d: wrong fs ptr (have %p, should be %p)\n",
+               kprintf("++ at %d: wrong fs ptr (have %p, should be %p)\n",
                        i, q->fs, set);
            copied++ ;
            bcopy(q, qp, sizeof( *q ) );
@@ -1752,7 +1752,7 @@ dn_copy_set(struct dn_flow_set *set, char *bp)
            qp->fs = NULL ;
        }
     if (copied != set->rq_elements)
-       printf("++ wrong count, have %d should be %d\n",
+       kprintf("++ wrong count, have %d should be %d\n",
            copied, set->rq_elements);
     return (char *)qp ;
 }
@@ -1842,7 +1842,7 @@ ip_dn_ctl(struct sockopt *sopt)
 
     switch (sopt->sopt_name) {
     default :
-       printf("ip_dn_ctl -- unknown option %d", sopt->sopt_name);
+       kprintf("ip_dn_ctl -- unknown option %d", sopt->sopt_name);
        return EINVAL ;
 
     case IP_DUMMYNET_GET :
@@ -1876,7 +1876,7 @@ ip_dn_ctl(struct sockopt *sopt)
 static void
 ip_dn_init(void)
 {
-    printf("DUMMYNET initialized (011031)\n");
+    kprintf("DUMMYNET initialized (011031)\n");
     all_pipes = NULL ;
     all_flow_sets = NULL ;
     ready_heap.size = ready_heap.elements = 0 ;
@@ -1902,7 +1902,7 @@ dummynet_modevent(module_t mod, int type, void *data)
                crit_enter();
                if (DUMMYNET_LOADED) {
                    crit_exit();
-                   printf("DUMMYNET already loaded\n");
+                   kprintf("DUMMYNET already loaded\n");
                    return EEXIST ;
                }
                ip_dn_init();
@@ -1911,7 +1911,7 @@ dummynet_modevent(module_t mod, int type, void *data)
 
        case MOD_UNLOAD:
 #if !defined(KLD_MODULE)
-               printf("dummynet statically compiled, cannot unload\n");
+               kprintf("dummynet statically compiled, cannot unload\n");
                return EINVAL ;
 #else
                crit_enter();
index 3c316bd..b7c989c 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/net/if_ef.c,v 1.2.2.4 2001/02/22 09:27:04 bp Exp $
- * $DragonFly: src/sys/net/ef/if_ef.c,v 1.21 2006/12/20 18:14:42 dillon Exp $
+ * $DragonFly: src/sys/net/ef/if_ef.c,v 1.22 2006/12/22 23:44:55 swildner Exp $
  */
 
 #include "opt_inet.h"
 #define        EF_NFT                  4       /* total number of frame types */
 
 #ifdef EF_DEBUG
-#define EFDEBUG(format, args...) printf("%s: "format, __func__ ,## args)
+#define EFDEBUG(format, args...) kprintf("%s: "format, __func__ ,## args)
 #else
 #define EFDEBUG(format, args...)
 #endif
 
-#define EFERROR(format, args...) printf("%s: "format, __func__ ,## args)
+#define EFERROR(format, args...) kprintf("%s: "format, __func__ ,## args)
 
 struct efnet {
        struct arpcom   ef_ac;
index abd3cf7..f8b64e4 100644 (file)
@@ -1,6 +1,6 @@
 /*     $NetBSD: if_gre.c,v 1.42 2002/08/14 00:23:27 itojun Exp $ */
 /*     $FreeBSD: src/sys/net/if_gre.c,v 1.9.2.3 2003/01/23 21:06:44 sam Exp $ */
-/*     $DragonFly: src/sys/net/gre/if_gre.c,v 1.18 2006/10/25 20:56:03 dillon Exp $ */
+/*     $DragonFly: src/sys/net/gre/if_gre.c,v 1.19 2006/12/22 23:44:55 swildner Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -223,7 +223,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
         * We'll prevent this by introducing upper limit.
         */
        if (++(sc->called) > max_gre_nesting) {
-               printf("%s: gre_output: recursively called too many "
+               kprintf("%s: gre_output: recursively called too many "
                       "times(%d)\n", if_name(&sc->sc_if), sc->called);
                m_freem(m);
                error = EIO;    /* is there better errno? */
@@ -505,7 +505,7 @@ gre_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cr)
                            sintosa(&dm), (sc->g_proto == IPPROTO_GRE) ?
                                &in_gre_protosw : &in_mobile_protosw, sc);
                        if (sc->encap == NULL)
-                               printf("%s: unable to attach encap\n",
+                               kprintf("%s: unable to attach encap\n",
                                    if_name(&sc->sc_if));
 #endif
                        if (sc->route.ro_rt != 0) /* free old route */
@@ -657,7 +657,7 @@ gre_compute_route(struct gre_softc *sc)
        }
 
 #ifdef DIAGNOSTIC
-       printf("%s: searching a route to %s", if_name(&sc->sc_if),
+       kprintf("%s: searching a route to %s", if_name(&sc->sc_if),
            inet_ntoa(((struct sockaddr_in *)&ro->ro_dst)->sin_addr));
 #endif
 
@@ -670,9 +670,9 @@ gre_compute_route(struct gre_softc *sc)
        if (ro->ro_rt == NULL || ro->ro_rt->rt_ifp->if_softc == sc) {
 #ifdef DIAGNOSTIC
                if (ro->ro_rt == NULL)
-                       printf(" - no route found!\n");
+                       kprintf(" - no route found!\n");
                else
-                       printf(" - route loops back to ourself!\n");
+                       kprintf(" - route loops back to ourself!\n");
 #endif
                return EADDRNOTAVAIL;
        }
@@ -685,9 +685,9 @@ gre_compute_route(struct gre_softc *sc)
                ((struct sockaddr_in *)&ro->ro_dst)->sin_addr = sc->g_dst;
 
 #ifdef DIAGNOSTIC
-       printf(", choosing %s with gateway %s", if_name(ro->ro_rt->rt_ifp),
+       kprintf(", choosing %s with gateway %s", if_name(ro->ro_rt->rt_ifp),
            inet_ntoa(((struct sockaddr_in *)(ro->ro_rt->rt_gateway))->sin_addr));
-       printf("\n");
+       kprintf("\n");
 #endif
 
        return 0;
index a49a46e..e0c29c8 100644 (file)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/net/hostcache.c,v 1.6.2.1 2002/04/14 21:41:48 luigi Exp $
- * $DragonFly: src/sys/net/Attic/hostcache.c,v 1.8 2006/09/05 00:55:46 dillon Exp $
+ * $DragonFly: src/sys/net/Attic/hostcache.c,v 1.9 2006/12/22 23:44:54 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -130,7 +130,7 @@ hc_rele(struct hcentry *hc)
 {
        crit_enter();
 #ifdef DIAGNOSTIC
-       printf("hc_rele: %p: negative refcnt!\n", (void *)hc);
+       kprintf("hc_rele: %p: negative refcnt!\n", (void *)hc);
 #endif
        hc->hc_refcnt--;
        if (hc->hc_refcnt == 0) {
index 11555cc..ec8a0aa 100644 (file)
@@ -25,7 +25,7 @@
  * capi/capi_l4if.c    The CAPI i4b L4/device interface.
  *
  * $FreeBSD: src/sys/i4b/capi/capi_l4if.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $
- * $DragonFly: src/sys/net/i4b/capi/capi_l4if.c,v 1.9 2006/01/14 11:05:17 swildner Exp $
+ * $DragonFly: src/sys/net/i4b/capi/capi_l4if.c,v 1.10 2006/12/22 23:44:55 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -120,7 +120,7 @@ i4b_capi_bch_start_tx(int unit, int chan)
     crit_enter();
     if (sc->sc_bchan[chan].state != B_CONNECTED) {
        crit_exit();
-       printf("capi%d: start_tx on unconnected channel\n", sc->sc_unit);
+       kprintf("capi%d: start_tx on unconnected channel\n", sc->sc_unit);
        return;
     }
 
@@ -193,7 +193,7 @@ capi_ll_attach(capi_softc_t *sc)
     int i;
 
     if (ncapi == (sizeof(capi_sc) / sizeof(capi_sc[0]))) {
-       printf("capi%d: too many units, increase MAX_CONTROLLERS\n", ncapi);
+       kprintf("capi%d: too many units, increase MAX_CONTROLLERS\n", ncapi);
        return (ENXIO);
     }
 
@@ -263,7 +263,7 @@ capi_ll_attach(capi_softc_t *sc)
     capi_sc[ncapi++] = sc;
     sc->ctrl_unit = nctrl++;
 
-    printf("capi%d: card type %d attached\n", sc->sc_unit, sc->card_type);
+    kprintf("capi%d: card type %d attached\n", sc->sc_unit, sc->card_type);
 
     return(0);
 }
@@ -278,7 +278,7 @@ n_mgmt_command(int unit, int op, void *arg)
 {
     capi_softc_t *sc = capi_sc[unit];
 
-    printf("capi%d: mgmt command %d\n", sc->sc_unit, op);
+    kprintf("capi%d: mgmt command %d\n", sc->sc_unit, op);
 
     switch(op) {
     case CMR_DOPEN:
@@ -311,7 +311,7 @@ n_connect_request(u_int cdid)
     int bch;
 
     if (!cd) {
-       printf("capi?: invalid cdid %d\n", cdid);
+       kprintf("capi?: invalid cdid %d\n", cdid);
        return;
     }
 
@@ -327,7 +327,7 @@ n_connect_request(u_int cdid)
 
     if (bch == sc->sc_nbch) {
        crit_exit();
-       printf("capi%d: no free B channel\n", sc->sc_unit);
+       kprintf("capi%d: no free B channel\n", sc->sc_unit);
        return;
     }
 
@@ -352,7 +352,7 @@ n_connect_response(u_int cdid, int response, int cause)
     int bch;
 
     if (!cd) {
-       printf("capi?: invalid cdid %d\n", cdid);
+       kprintf("capi?: invalid cdid %d\n", cdid);
        return;
     }
 
@@ -383,7 +383,7 @@ n_disconnect_request(u_int cdid, int cause)
     int bch;
 
     if (!cd) {
-       printf("capi?: invalid cdid %d\n", cdid);
+       kprintf("capi?: invalid cdid %d\n", cdid);
        return;
     }
 
@@ -409,7 +409,7 @@ n_alert_request(u_int cdid)
     capi_softc_t *sc;
 
     if (!cd) {
-       printf("capi?: invalid cdid %d\n", cdid);
+       kprintf("capi?: invalid cdid %d\n", cdid);
        return;
     }
 
index d8116cf..64f297d 100644 (file)
@@ -25,7 +25,7 @@
  * capi/capi_llif.c    The i4b CAPI link layer interface.
  *
  * $FreeBSD: src/sys/i4b/capi/capi_llif.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $
- * $DragonFly: src/sys/net/i4b/capi/capi_llif.c,v 1.5 2004/04/16 15:40:20 joerg Exp $
+ * $DragonFly: src/sys/net/i4b/capi/capi_llif.c,v 1.6 2006/12/22 23:44:55 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -85,7 +85,7 @@ capi_ll_control(capi_softc_t *sc, int op, int arg)
        break;
 
     default:
-       printf("capi%d: unknown control %d\n", sc->sc_unit, op);
+       kprintf("capi%d: unknown control %d\n", sc->sc_unit, op);
     }
 
     return 0;
@@ -136,7 +136,7 @@ capi_ll_receive(capi_softc_t *sc, struct mbuf *m)
     capimsg_getu16(p + 6, &msgid);
 
 #if 0
-    printf("capi%d: ll_receive hdr %04x %04x %04x %04x\n", sc->sc_unit,
+    kprintf("capi%d: ll_receive hdr %04x %04x %04x %04x\n", sc->sc_unit,
           len, applid, cmd, msgid);
 #endif
 
@@ -144,11 +144,11 @@ capi_ll_receive(capi_softc_t *sc, struct mbuf *m)
        struct capi_cmdtab *e;
        for (e = i4b_capi_handlers; e->cmd && e->cmd != cmd; e++);
        if (e->cmd) (*e->handler)(sc, m);
-       else printf("capi%d: unknown message %04x\n", sc->sc_unit, cmd);
+       else kprintf("capi%d: unknown message %04x\n", sc->sc_unit, cmd);
 
     } else {
        /* XXX we could handle arbitrary ApplIds here XXX */
-       printf("capi%d: message %04x for unknown applid %d\n", sc->sc_unit,
+       kprintf("capi%d: message %04x for unknown applid %d\n", sc->sc_unit,
               cmd, applid);
     }
 
index 2a191c1..0a6bbf0 100644 (file)
@@ -25,7 +25,7 @@
  * capi/capi_msgs.c    The CAPI i4b message handlers.
  *
  * $FreeBSD: src/sys/i4b/capi/capi_msgs.c,v 1.1.2.2 2001/12/10 10:28:25 hm Exp $
- * $DragonFly: src/sys/net/i4b/capi/capi_msgs.c,v 1.7 2006/01/14 11:05:17 swildner Exp $
+ * $DragonFly: src/sys/net/i4b/capi/capi_msgs.c,v 1.8 2006/12/22 23:44:55 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -60,7 +60,7 @@ capi_listen_req(capi_softc_t *sc, u_int32_t CIP)
     u_int16_t msgid;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for listen_req\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for listen_req\n", sc->sc_unit);
        return;
     }
 
@@ -100,7 +100,7 @@ capi_listen_conf(capi_softc_t *sc, struct mbuf *m_in)
 
     } else {
        /* XXX sc->sc_state = C_DOWN ? XXX */
-       printf("capi%d: can't listen, info=%04x\n", sc->sc_unit, Info);
+       kprintf("capi%d: can't listen, info=%04x\n", sc->sc_unit, Info);
     }
 }
 
@@ -113,7 +113,7 @@ capi_info_ind(capi_softc_t *sc, struct mbuf *m_in)
     u_int32_t PLCI;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for info_resp\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for info_resp\n", sc->sc_unit);
        return;
     }
 
@@ -142,7 +142,7 @@ capi_alert_req(capi_softc_t *sc, call_desc_t *cd)
     u_int32_t PLCI;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for alert_req\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for alert_req\n", sc->sc_unit);
        return;
     }
 
@@ -169,7 +169,7 @@ capi_alert_conf(capi_softc_t *sc, struct mbuf *m_in)
     msg = capimsg_getu16(msg + 12, &Info);
 
     if (Info) {
-       printf("capi%d: can't alert, info=%04x\n", sc->sc_unit, Info);
+       kprintf("capi%d: can't alert, info=%04x\n", sc->sc_unit, Info);
     }
 }
 
@@ -200,7 +200,7 @@ capi_connect_req(capi_softc_t *sc, call_desc_t *cd)
 
     m = i4b_Dgetmbuf(8 + 27 + slen + dlen);
     if (!m) {
-       printf("capi%d: can't get mbuf for connect_req\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for connect_req\n", sc->sc_unit);
        return;
     }
 
@@ -284,7 +284,7 @@ capi_connect_conf(capi_softc_t *sc, struct mbuf *m_in)
 
     if ((bch == sc->sc_nbch) ||
        (cd = cd_by_cdid(sc->sc_bchan[bch].cdid)) == NULL) {
-       printf("capi%d: can't find channel for connect_conf PLCI %x\n",
+       kprintf("capi%d: can't find channel for connect_conf PLCI %x\n",
               sc->sc_unit, PLCI);
        return;
     }
@@ -303,7 +303,7 @@ capi_connect_conf(capi_softc_t *sc, struct mbuf *m_in)
        sc->sc_bchan[bch].state = B_FREE;
        ctrl_desc[sc->ctrl_unit].bch_state[bch] = BCH_ST_FREE;
 
-       printf("capi%d: can't connect out, info=%04x\n", sc->sc_unit, Info);
+       kprintf("capi%d: can't connect out, info=%04x\n", sc->sc_unit, Info);
     }
 }
 
@@ -318,7 +318,7 @@ capi_connect_active_ind(capi_softc_t *sc, struct mbuf *m_in)
     int bch;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for active_ind\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for active_ind\n", sc->sc_unit);
        return;
     }
 
@@ -333,7 +333,7 @@ capi_connect_active_ind(capi_softc_t *sc, struct mbuf *m_in)
 
     if ((bch == sc->sc_nbch) ||
        (cd = cd_by_cdid(sc->sc_bchan[bch].cdid)) == NULL) {
-       printf("capi%d: can't find channel for active_resp, PLCI %x\n",
+       kprintf("capi%d: can't find channel for active_resp, PLCI %x\n",
               sc->sc_unit, PLCI);
        return;
     }
@@ -364,7 +364,7 @@ capi_connect_b3_req(capi_softc_t *sc, call_desc_t *cd)
     u_int32_t PLCI;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for connect_b3_req\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for connect_b3_req\n", sc->sc_unit);
        return;
     }
 
@@ -404,7 +404,7 @@ capi_connect_b3_conf(capi_softc_t *sc, struct mbuf *m_in)
 
     if ((bch == sc->sc_nbch) ||
        (cd = cd_by_cdid(sc->sc_bchan[bch].cdid)) == NULL) {
-       printf("capi%d: can't find channel for connect_b3_conf NCCI %x\n",
+       kprintf("capi%d: can't find channel for connect_b3_conf NCCI %x\n",
               sc->sc_unit, NCCI);
        return;
     }
@@ -420,7 +420,7 @@ capi_connect_b3_conf(capi_softc_t *sc, struct mbuf *m_in)
 
        ctrl_desc[sc->ctrl_unit].bch_state[bch] = BCH_ST_RSVD;
 
-       printf("capi%d: can't connect_b3 out, info=%04x\n", sc->sc_unit, Info);
+       kprintf("capi%d: can't connect_b3 out, info=%04x\n", sc->sc_unit, Info);
 
        capi_disconnect_req(sc, cd);
     }
@@ -437,7 +437,7 @@ capi_connect_b3_active_ind(capi_softc_t *sc, struct mbuf *m_in)
     int bch;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for b3_active_ind\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for b3_active_ind\n", sc->sc_unit);
        return;
     }
 
@@ -452,7 +452,7 @@ capi_connect_b3_active_ind(capi_softc_t *sc, struct mbuf *m_in)
 
     if ((bch == sc->sc_nbch) ||
        (cd = cd_by_cdid(sc->sc_bchan[bch].cdid)) == NULL) {
-       printf("capi%d: can't find channel for b3_active_resp NCCI %x\n",
+       kprintf("capi%d: can't find channel for b3_active_resp NCCI %x\n",
               sc->sc_unit, NCCI);
        return;
     }
@@ -498,7 +498,7 @@ capi_connect_ind(capi_softc_t *sc, struct mbuf *m_in)
     int bch;
 
     if ((cd = reserve_cd()) == NULL) {
-       printf("capi%d: can't get cd for connect_ind\n", sc->sc_unit);
+       kprintf("capi%d: can't get cd for connect_ind\n", sc->sc_unit);
        return;
     }
 
@@ -578,7 +578,7 @@ capi_connect_resp(capi_softc_t *sc, call_desc_t *cd)
 
     m = i4b_Dgetmbuf(8 + 21 + dlen);
     if (!m) {
-       printf("capi%d: can't get mbuf for connect_resp\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for connect_resp\n", sc->sc_unit);
        return;
     }
 
@@ -655,7 +655,7 @@ capi_connect_b3_ind(capi_softc_t *sc, struct mbuf *m_in)
     int bch;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for connect_b3_resp\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for connect_b3_resp\n", sc->sc_unit);
        return;
     }
 
@@ -676,7 +676,7 @@ capi_connect_b3_ind(capi_softc_t *sc, struct mbuf *m_in)
     msg = capimsg_setu32(msg, NCCI);
 
     if (bch == sc->sc_nbch) {
-       printf("capi%d: can't get cd for connect_b3_resp NCCI %x\n",
+       kprintf("capi%d: can't get cd for connect_b3_resp NCCI %x\n",
               sc->sc_unit, NCCI);
        msg = capimsg_setu16(msg, 8); /* Reject, destination OOO */
 
@@ -704,7 +704,7 @@ capi_data_b3_req(capi_softc_t *sc, int chan, struct mbuf *m_b3)
     u_int16_t msgid;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for data_b3_req\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for data_b3_req\n", sc->sc_unit);
        return;
     }
 
@@ -744,7 +744,7 @@ capi_data_b3_conf(capi_softc_t *sc, struct mbuf *m_in)
        capi_start_tx(sc, handle);
 
     } else {
-       printf("capi%d: data_b3_conf NCCI %x handle %x info=%04x\n",
+       kprintf("capi%d: data_b3_conf NCCI %x handle %x info=%04x\n",
               sc->sc_unit, NCCI, handle, Info);
     }
 }
@@ -760,7 +760,7 @@ capi_data_b3_ind(capi_softc_t *sc, struct mbuf *m_in)
     int bch;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for data_b3_resp\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for data_b3_resp\n", sc->sc_unit);
        return;
     }
 
@@ -775,7 +775,7 @@ capi_data_b3_ind(capi_softc_t *sc, struct mbuf *m_in)
            break;
 
     if (bch == sc->sc_nbch) {
-       printf("capi%d: can't find channel for data_b3_ind NCCI %x\n",
+       kprintf("capi%d: can't find channel for data_b3_ind NCCI %x\n",
               sc->sc_unit, NCCI);
 
     } else {
@@ -828,7 +828,7 @@ capi_disconnect_req(capi_softc_t *sc, call_desc_t *cd)
     u_int32_t PLCI;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for disconnect_req\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for disconnect_req\n", sc->sc_unit);
        return;
     }
 
@@ -864,14 +864,14 @@ capi_disconnect_conf(capi_softc_t *sc, struct mbuf *m_in)
            break;
 
     if (bch == sc->sc_nbch) {
-       printf("capi%d: can't find channel for disconnect_conf PLCI %x\n",
+       kprintf("capi%d: can't find channel for disconnect_conf PLCI %x\n",
               sc->sc_unit, PLCI);
        return;
     }
 
     cd = cd_by_cdid(sc->sc_bchan[bch].cdid);
     if (!cd) {
-       printf("capi%d: can't find cd for disconnect_conf PLCI %x\n",
+       kprintf("capi%d: can't find cd for disconnect_conf PLCI %x\n",
               sc->sc_unit, PLCI);
     } else {
        i4b_l4_disconnect_ind(cd);
@@ -891,7 +891,7 @@ capi_disconnect_b3_ind(capi_softc_t *sc, struct mbuf *m_in)
     u_int32_t NCCI;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for disconnect_b3_resp\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for disconnect_b3_resp\n", sc->sc_unit);
        return;
     }
 
@@ -923,7 +923,7 @@ capi_disconnect_ind(capi_softc_t *sc, struct mbuf *m_in)
     int bch;
 
     if (!m) {
-       printf("capi%d: can't get mbuf for disconnect_resp\n", sc->sc_unit);
+       kprintf("capi%d: can't get mbuf for disconnect_resp\n", sc->sc_unit);
        return;
     }
 
index 83dce4c..ea20c23 100644 (file)
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i4b/capi/iavc/iavc_isa.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $
- * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_isa.c,v 1.9 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_isa.c,v 1.10 2006/12/22 23:44:55 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -101,7 +101,7 @@ iavc_isa_probe(device_t dev)
        
        if (unit >= IAVC_MAXUNIT)
        {
-               printf("iavc%d: too many units\n", unit);
+               kprintf("iavc%d: too many units\n", unit);
                return(ENXIO);  
        }
 
@@ -114,7 +114,7 @@ iavc_isa_probe(device_t dev)
                        &sc->sc_resources.io_rid[0],
                        0UL, ~0UL, B1_IOLENGTH, RF_ACTIVE)))
        {
-               printf("iavc%d: can't allocate io region\n", unit);
+               kprintf("iavc%d: can't allocate io region\n", unit);
                return(ENXIO);                                       
        }
 
@@ -128,7 +128,7 @@ iavc_isa_probe(device_t dev)
                case 0x340:
                        break;
                default:
-                       printf("iavc%d: ERROR, invalid i/o base addr 0x%x configured!\n", sc->sc_unit, sc->sc_iobase);
+                       kprintf("iavc%d: ERROR, invalid i/o base addr 0x%x configured!\n", sc->sc_unit, sc->sc_iobase);
                        bus_release_resource(dev, SYS_RES_IOPORT,
                                        sc->sc_resources.io_rid[0],
                                        sc->sc_resources.io_base[0]);
@@ -153,7 +153,7 @@ iavc_isa_probe(device_t dev)
 
        if(ret)
        {
-               printf("iavc%d: no card ? b1_detect returns %0x02x\n", sc->sc_unit, ret);
+               kprintf("iavc%d: no card ? b1_detect returns %0x02x\n", sc->sc_unit, ret);
                return(ENXIO);
        }
 
@@ -165,7 +165,7 @@ iavc_isa_probe(device_t dev)
 
        if(bootverbose)
        {
-               printf("iavc%d: class = 0x%02x, rev = 0x%02x\n", sc->sc_unit,
+               kprintf("iavc%d: class = 0x%02x, rev = 0x%02x\n", sc->sc_unit,
                        iavc_read_port(sc, B1_ANALYSE),
                        iavc_read_port(sc, B1_REVISION));
        }
@@ -195,7 +195,7 @@ iavc_isa_attach(device_t dev)
                        &sc->sc_resources.irq_rid,
                        0UL, ~0UL, 1, RF_ACTIVE)))
        {
-               printf("iavc%d: can't allocate irq\n",unit);
+               kprintf("iavc%d: can't allocate irq\n",unit);
                bus_release_resource(dev, SYS_RES_IOPORT,
                                sc->sc_resources.io_rid[0],
                                sc->sc_resources.io_base[0]);
@@ -206,7 +206,7 @@ iavc_isa_attach(device_t dev)
 
        if(b1_irq_table[irq] == 0)
        {
-               printf("iavc%d: ERROR, illegal irq %d configured!\n",unit, irq);
+               kprintf("iavc%d: ERROR, illegal irq %d configured!\n",unit, irq);
                bus_release_resource(dev, SYS_RES_IOPORT,
                                sc->sc_resources.io_rid[0],
                                sc->sc_resources.io_base[0]);
@@ -233,7 +233,7 @@ iavc_isa_attach(device_t dev)
 
        if (capi_ll_attach(&sc->sc_capi))
        {
-               printf("iavc%d: capi attach failed\n", unit);
+               kprintf("iavc%d: capi attach failed\n", unit);
                return(ENXIO);
        }
 
@@ -243,7 +243,7 @@ iavc_isa_attach(device_t dev)
                              (void(*)(void*))iavc_isa_intr,
                              sc, &ih, NULL);
        if (error) {
-               printf("iavc%d: irq setup failed\n", unit);
+               kprintf("iavc%d: irq setup failed\n", unit);
                bus_release_resource(dev, SYS_RES_IOPORT,
                                sc->sc_resources.io_rid[0],
                                sc->sc_resources.io_base[0]);
@@ -267,7 +267,7 @@ b1isa_setup_irq(struct iavc_softc *sc)
        int irq = rman_get_start(sc->sc_resources.irq);
        
        if(bootverbose)
-               printf("iavc%d: using irq %d\n", sc->sc_unit, irq);
+               kprintf("iavc%d: using irq %d\n", sc->sc_unit, irq);
 
        /* enable the interrupt */
 
index 95bb6bb..e87fd56 100644 (file)
@@ -26,7 +26,7 @@
  *             The AVM ISDN controllers' Low Level Interface.
  *
  * $FreeBSD: src/sys/i4b/capi/iavc/iavc_lli.c,v 1.2.2.1 2001/08/10 14:08:34 obrien Exp $
- * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_lli.c,v 1.9 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_lli.c,v 1.10 2006/12/22 23:44:55 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -89,7 +89,7 @@ iavc_load(capi_softc_t *capi_sc, int len, u_int8_t *cp)
     u_int8_t val;
 
     if(bootverbose)
-       printf("iavc%d: reset card ....\n", sc->sc_unit);
+       kprintf("iavc%d: reset card ....\n", sc->sc_unit);
 
     if (sc->sc_dma)
        b1dma_reset(sc);        /* PCI cards */
@@ -101,19 +101,19 @@ iavc_load(capi_softc_t *capi_sc, int len, u_int8_t *cp)
     DELAY(1000);
 
     if(bootverbose)
-           printf("iavc%d: start loading %d bytes firmware ....\n", sc->sc_unit, len);
+           kprintf("iavc%d: start loading %d bytes firmware ....\n", sc->sc_unit, len);
     
     while (len && b1io_save_put_byte(sc, *cp++) == 0)
        len--;
 
     if (len) {
-       printf("iavc%d: loading failed, can't write to card, len = %d\n",
+       kprintf("iavc%d: loading failed, can't write to card, len = %d\n",
               sc->sc_unit, len);
        return (EIO);
     }
 
     if(bootverbose)
-       printf("iavc%d: firmware loaded, wait for ACK ....\n", sc->sc_unit);
+       kprintf("iavc%d: firmware loaded, wait for ACK ....\n", sc->sc_unit);
     
     if(sc->sc_capi.card_type == CARD_TYPEC_AVM_B1_ISA)
            iavc_put_byte(sc, SEND_POLL);
@@ -124,7 +124,7 @@ iavc_load(capi_softc_t *capi_sc, int len, u_int8_t *cp)
        DELAY(100);
     
     if (!iavc_rx_full(sc)) {
-       printf("iavc%d: loading failed, no ack\n", sc->sc_unit);
+       kprintf("iavc%d: loading failed, no ack\n", sc->sc_unit);
        return (EIO);
     }
     
@@ -132,12 +132,12 @@ iavc_load(capi_softc_t *capi_sc, int len, u_int8_t *cp)
 
     if ((sc->sc_dma && val != RECEIVE_POLLDWORD) ||
        (!sc->sc_dma && val != RECEIVE_POLL)) {
-       printf("iavc%d: loading failed, bad ack = %02x\n", sc->sc_unit, val);
+       kprintf("iavc%d: loading failed, bad ack = %02x\n", sc->sc_unit, val);
        return (EIO);
     }
 
     if(bootverbose)
-           printf("iavc%d: got ACK = 0x%02x\n", sc->sc_unit, val);    
+           kprintf("iavc%d: got ACK = 0x%02x\n", sc->sc_unit, val);    
 
     if (sc->sc_dma) {
        /* Start the DMA engine */
@@ -178,7 +178,7 @@ iavc_register(capi_softc_t *capi_sc, int applid, int nchan)
     u_int8_t *p;
 
     if (!m) {
-       printf("iavc%d: can't get memory\n", sc->sc_unit);
+       kprintf("iavc%d: can't get memory\n", sc->sc_unit);
        return (ENOMEM);
     }
 
@@ -219,7 +219,7 @@ iavc_release(capi_softc_t *capi_sc, int applid)
     u_int8_t *p;
 
     if (!m) {
-       printf("iavc%d: can't get memory\n", sc->sc_unit);
+       kprintf("iavc%d: can't get memory\n", sc->sc_unit);
        return (ENOMEM);
     }
 
@@ -245,7 +245,7 @@ iavc_send(capi_softc_t *capi_sc, struct mbuf *m)
     iavc_softc_t *sc = (iavc_softc_t*) capi_sc->ctx;
 
     if (sc->sc_state != IAVC_UP) {
-       printf("iavc%d: attempt to send before device up\n", sc->sc_unit);
+       kprintf("iavc%d: attempt to send before device up\n", sc->sc_unit);
 
        if (m->m_next) i4b_Bfreembuf(m->m_next);
        i4b_Dfreembuf(m);
@@ -256,7 +256,7 @@ iavc_send(capi_softc_t *capi_sc, struct mbuf *m)
     if (IF_QFULL(&sc->sc_txq)) {
        IF_DROP(&sc->sc_txq);
 
-       printf("iavc%d: tx overflow, message dropped\n", sc->sc_unit);
+       kprintf("iavc%d: tx overflow, message dropped\n", sc->sc_unit);
 
        if (m->m_next) i4b_Bfreembuf(m->m_next);
        i4b_Dfreembuf(m);
@@ -286,7 +286,7 @@ iavc_send_init(iavc_softc_t *sc)
     u_int8_t *p;
 
     if (!m) {
-       printf("iavc%d: can't get memory\n", sc->sc_unit);
+       kprintf("iavc%d: can't get memory\n", sc->sc_unit);
        return (ENOMEM);
     }
 
@@ -360,13 +360,13 @@ iavc_receive_init(iavc_softc_t *sc, u_int8_t *dmabuf)
 #if 0
     {
        int len = 0;
-       printf("iavc%d: rx_init: ", sc->sc_unit);
+       kprintf("iavc%d: rx_init: ", sc->sc_unit);
            while (len < Length) {
-               printf(" %02x", p[len]);
-               if (len && (len % 16) == 0) printf("\n");
+               kprintf(" %02x", p[len]);
+               if (len && (len % 16) == 0) kprintf("\n");
                len++;
            }
-           if (len % 16) printf("\n");
+           if (len % 16) kprintf("\n");
     }
 #endif
 
@@ -386,16 +386,16 @@ iavc_receive_init(iavc_softc_t *sc, u_int8_t *dmabuf)
     if (cardtype && serial && profile) {
        int nbch = ((profile[3]<<8) | profile[2]);
 
-       printf("iavc%d: AVM %s, s/n %s, %d chans, f/w rev %s, prot %s\n",
+       kprintf("iavc%d: AVM %s, s/n %s, %d chans, f/w rev %s, prot %s\n",
                sc->sc_unit, cardtype, serial, nbch, version, prot);
 
        if(bootverbose)
-               printf("iavc%d: %s\n", sc->sc_unit, caps);
+               kprintf("iavc%d: %s\n", sc->sc_unit, caps);
 
         capi_ll_control(&sc->sc_capi, CAPI_CTRL_PROFILE, (int) profile);
 
     } else {
-       printf("iavc%d: no profile data in info response?\n", sc->sc_unit);
+       kprintf("iavc%d: no profile data in info response?\n", sc->sc_unit);
     }
 
     sc->sc_blocked = TRUE; /* controller will send START when ready */
@@ -409,10 +409,10 @@ iavc_receive_start(iavc_softc_t *sc, u_int8_t *dmabuf)
     u_int8_t *p;
 
     if (sc->sc_blocked && sc->sc_state == IAVC_UP)
-       printf("iavc%d: receive_start\n", sc->sc_unit);
+       kprintf("iavc%d: receive_start\n", sc->sc_unit);
 
     if (!m) {
-       printf("iavc%d: can't get memory\n", sc->sc_unit);
+       kprintf("iavc%d: can't get memory\n", sc->sc_unit);
        return (ENOMEM);
     }
 
@@ -445,7 +445,7 @@ iavc_receive_start(iavc_softc_t *sc, u_int8_t *dmabuf)
 static int
 iavc_receive_stop(iavc_softc_t *sc, u_int8_t *dmabuf)
 {
-    printf("iavc%d: receive_stop\n", sc->sc_unit);
+    kprintf("iavc%d: receive_stop\n", sc->sc_unit);
     sc->sc_blocked = TRUE;
     return 0;
 }
@@ -491,7 +491,7 @@ iavc_receive_task_ready(iavc_softc_t *sc, u_int8_t *dmabuf)
 {
     u_int32_t TaskId, Length;
     u_int8_t *p;
-    printf("iavc%d: receive_task_ready\n", sc->sc_unit);
+    kprintf("iavc%d: receive_task_ready\n", sc->sc_unit);
     
     if (sc->sc_dma) {
        p = amcc_get_word(dmabuf, &TaskId);
@@ -511,7 +511,7 @@ iavc_receive_debugmsg(iavc_softc_t *sc, u_int8_t *dmabuf)
 {
     u_int32_t Length;
     u_int8_t *p;
-    printf("iavc%d: receive_debugmsg\n", sc->sc_unit);
+    kprintf("iavc%d: receive_debugmsg\n", sc->sc_unit);
     
     if (sc->sc_dma) {
        p = amcc_get_word(dmabuf, &Length);
@@ -557,7 +557,7 @@ iavc_receive(iavc_softc_t *sc, u_int8_t *dmabuf, int b3data)
 
     m = i4b_Dgetmbuf(Length);
     if (!m) {
-       printf("iavc%d: can't get memory for receive\n", sc->sc_unit);
+       kprintf("iavc%d: can't get memory for receive\n", sc->sc_unit);
        return (ENOMEM);
     }
 
@@ -567,13 +567,13 @@ iavc_receive(iavc_softc_t *sc, u_int8_t *dmabuf, int b3data)
        {
            u_int8_t *p = mtod(m, u_int8_t*);
            int len = 0;
-           printf("iavc%d: applid=%d, len=%d\n", sc->sc_unit, ApplId, Length);
+           kprintf("iavc%d: applid=%d, len=%d\n", sc->sc_unit, ApplId, Length);
            while (len < m->m_len) {
-               printf(" %02x", p[len]);
-               if (len && (len % 16) == 0) printf("\n");
+               kprintf(" %02x", p[len]);
+               if (len && (len % 16) == 0) kprintf("\n");
                len++;
            }
-           if (len % 16) printf("\n");
+           if (len % 16) kprintf("\n");
        }
 #endif
 
@@ -587,7 +587,7 @@ iavc_receive(iavc_softc_t *sc, u_int8_t *dmabuf, int b3data)
 
        m->m_next = i4b_Bgetmbuf(Length);
        if (!m->m_next) {
-           printf("iavc%d: can't get memory for receive\n", sc->sc_unit);
+           kprintf("iavc%d: can't get memory for receive\n", sc->sc_unit);
            i4b_Dfreembuf(m);
            return (ENOMEM);
        }
@@ -709,7 +709,7 @@ iavc_handle_rx(iavc_softc_t *sc)
        break;
 
     default:
-       printf("iavc%d: unknown msg %02x\n", sc->sc_unit, cmd);
+       kprintf("iavc%d: unknown msg %02x\n", sc->sc_unit, cmd);
     }
 }
 
@@ -779,10 +779,10 @@ iavc_start_tx(iavc_softc_t *sc)
        u_int8_t *p = mtod(m, u_int8_t*);
        int len;
        for (len = 0; len < m->m_len; len++) {
-           printf(" %02x", *p++);
-           if (len && (len % 16) == 0) printf("\n");
+           kprintf(" %02x", *p++);
+           if (len && (len % 16) == 0) kprintf("\n");
        }
-       if (len % 16) printf("\n");
+       if (len % 16) kprintf("\n");
     }
 #endif
 
@@ -805,12 +805,12 @@ iavc_start_tx(iavc_softc_t *sc)
     {
        u_int8_t *p = mtod(m, u_int8_t*) + 2;
        int len;
-       printf("iavc%d: tx BDC msg, len = %d, msg =", sc->sc_unit, m->m_len-2);
+       kprintf("iavc%d: tx BDC msg, len = %d, msg =", sc->sc_unit, m->m_len-2);
        for (len = 0; len < m->m_len-2; len++) {
-           printf(" %02x", *p++);
-           if (len && (len % 16) == 0) printf("\n");
+           kprintf(" %02x", *p++);
+           if (len && (len % 16) == 0) kprintf("\n");
        }
-       if (len % 16) printf("\n");
+       if (len % 16) kprintf("\n");
     }
 #endif
 
@@ -975,7 +975,7 @@ b1io_get_byte(iavc_softc_t *sc)
     }
     if (b1io_rx_full(sc))
        return bus_space_read_1(sc->sc_io_bt, sc->sc_io_bh, B1_READ);
-    printf("iavc%d: rx not completed\n", sc->sc_unit);
+    kprintf("iavc%d: rx not completed\n", sc->sc_unit);
     return 0xff;
 }
 
@@ -990,7 +990,7 @@ b1io_put_byte(iavc_softc_t *sc, u_int8_t val)
        bus_space_write_1(sc->sc_io_bt, sc->sc_io_bh, B1_WRITE, val);
        return 0;
     }
-    printf("iavc%d: tx not emptied\n", sc->sc_unit);
+    kprintf("iavc%d: tx not emptied\n", sc->sc_unit);
     return -1;
 }
 
@@ -1005,6 +1005,6 @@ b1io_save_put_byte(iavc_softc_t *sc, u_int8_t val)
        b1io_outp(sc, B1_WRITE, val);
        return 0;
     }
-    printf("iavc%d: tx not emptied\n", sc->sc_unit);
+    kprintf("iavc%d: tx not emptied\n", sc->sc_unit);
     return -1;
 }
index 2c90873..7f8e59d 100644 (file)
@@ -26,7 +26,7 @@
  *             The AVM ISDN controllers' PCI bus attachment handling.
  *
  * $FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $
- * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_pci.c,v 1.9 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_pci.c,v 1.10 2006/12/22 23:44:55 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -128,7 +128,7 @@ iavc_pci_attach(device_t dev)
     /* check max unit range */
        
     if (unit >= IAVC_MAXUNIT) {
-       printf("iavc%d: too many units\n", unit);
+       kprintf("iavc%d: too many units\n", unit);
        return(ENXIO);  
     }  
 
@@ -144,7 +144,7 @@ iavc_pci_attach(device_t dev)
         bus_alloc_resource(dev, SYS_RES_IOPORT,
                            &sc->sc_resources.io_rid[0],
                            0UL, ~0UL, 1, RF_ACTIVE))) {
-       printf("iavc%d: can't allocate io region\n", unit);
+       kprintf("iavc%d: can't allocate io region\n", unit);
        return(ENXIO);                                       
     }
 
@@ -160,7 +160,7 @@ iavc_pci_attach(device_t dev)
         bus_alloc_resource(dev, SYS_RES_MEMORY,
                            &sc->sc_resources.mem_rid,
                            0UL, ~0UL, 1, RF_ACTIVE))) {
-       printf("iavc%d: can't allocate memory region\n", unit);
+       kprintf("iavc%d: can't allocate memory region\n", unit);
        return(ENXIO);                                       
     }
 
@@ -180,9 +180,9 @@ iavc_pci_attach(device_t dev)
        ret = t1_detect(sc);
        if (ret) {
            if (ret < 6) {
-               printf("iavc%d: no card detected?\n", sc->sc_unit);
+               kprintf("iavc%d: no card detected?\n", sc->sc_unit);
            } else {
-               printf("iavc%d: black box not on\n", sc->sc_unit);
+               kprintf("iavc%d: black box not on\n", sc->sc_unit);
            }
            return(ENXIO);
        } else {
@@ -197,7 +197,7 @@ iavc_pci_attach(device_t dev)
        if (ret) {
            ret = b1_detect(sc);
            if (ret) {
-               printf("iavc%d: no card detected?\n", sc->sc_unit);
+               kprintf("iavc%d: no card detected?\n", sc->sc_unit);
                return(ENXIO);
            }
        } else {
@@ -219,7 +219,7 @@ iavc_pci_attach(device_t dev)
         bus_alloc_resource(dev, SYS_RES_IRQ,
                            &sc->sc_resources.irq_rid,
                            0UL, ~0UL, 1, RF_SHAREABLE|RF_ACTIVE))) {
-       printf("iavc%d: can't allocate irq\n",unit);
+       kprintf("iavc%d: can't allocate irq\n",unit);
        return(ENXIO);
     }
 
@@ -241,7 +241,7 @@ iavc_pci_attach(device_t dev)
     sc->sc_capi.ctx = (void*) sc;
 
     if (capi_ll_attach(&sc->sc_capi)) {
-       printf("iavc%d: capi attach failed\n", unit);
+       kprintf("iavc%d: capi attach failed\n", unit);
        return(ENXIO);
     }
 
@@ -251,7 +251,7 @@ iavc_pci_attach(device_t dev)
                          (void(*)(void*))iavc_pci_intr,
                          sc, &ih, NULL);
     if (error) {
-       printf("iavc%d: irq setup failed\n", unit);
+       kprintf("iavc%d: irq setup failed\n", unit);
        return(ENXIO);
     }
 
index f21bb7e..fb06ae6 100644 (file)
@@ -30,7 +30,7 @@
  *     $Id: i4b_ctl.c,v 1.37 2000/05/31 08:04:43 hm Exp $
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_ctl.c,v 1.10.2.3 2001/08/12 16:22:48 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_ctl.c,v 1.13 2006/09/10 01:26:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_ctl.c,v 1.14 2006/12/22 23:44:55 swildner Exp $
  *
  *     last edit-date: [Sat Aug 11 18:06:38 2001]
  *
@@ -103,7 +103,7 @@ PDEVSTATIC void
 i4bctlattach(void *dummy)
 {
 #ifndef HACK_NO_PSEUDO_ATTACH_MSG
-       printf("i4bctl: ISDN system control port attached\n");
+       kprintf("i4bctl: ISDN system control port attached\n");
 #endif
 }
 
index 4ed11c0..78d74a0 100644 (file)
@@ -28,7 +28,7 @@
  *     -------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_ing.c,v 1.10.2.4 2002/07/02 23:44:02 archie Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_ing.c,v 1.9 2006/12/20 18:14:42 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_ing.c,v 1.10 2006/12/22 23:44:55 swildner Exp $
  *
  *     last edit-date: [Tue Jan  1 10:43:58 2002]
  *
@@ -236,7 +236,7 @@ i4bingattach(void *dummy)
        int i;
        int ret;
 
-       printf("i4bing: %d i4b NetGraph ISDN B-channel device(s) attached\n", NI4BING);
+       kprintf("i4bing: %d i4b NetGraph ISDN B-channel device(s) attached\n", NI4BING);
        
        for(i=0; i < NI4BING; sc++, i++)
        {
@@ -273,7 +273,7 @@ i4bingattach(void *dummy)
 
                if ((ret = ng_make_node_common(&typestruct, &sc->node)))
                {
-                       printf("ing: ng_make_node_common, ret = %d\n!", ret);
+                       kprintf("ing: ng_make_node_common, ret = %d\n!", ret);
                }
 
                sc->node->private = sc;
index 3deeb31..e324a5f 100644 (file)
@@ -28,7 +28,7 @@
  *     ---------------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_ipr.c,v 1.8.2.3 2001/10/27 15:48:17 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_ipr.c,v 1.19 2006/09/05 00:55:47 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_ipr.c,v 1.20 2006/12/22 23:44:55 swildner Exp $
  *
  *     last edit-date: [Fri Oct 26 19:32:38 2001]
  *
@@ -213,9 +213,9 @@ i4biprattach(void *dummy)
        int i;
 
 #ifdef IPR_VJ
-       printf("i4bipr: %d IP over raw HDLC ISDN device(s) attached (VJ header compression)\n", NI4BIPR);
+       kprintf("i4bipr: %d IP over raw HDLC ISDN device(s) attached (VJ header compression)\n", NI4BIPR);
 #else
-       printf("i4bipr: %d IP over raw HDLC ISDN device(s) attached\n", NI4BIPR);
+       kprintf("i4bipr: %d IP over raw HDLC ISDN device(s) attached\n", NI4BIPR);
 #endif
        
        for(i=0; i < NI4BIPR; sc++, i++)
@@ -311,7 +311,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
        
        if(dst->sa_family != AF_INET)
        {
-               printf(IPR_FMT "af%d not supported\n", IPR_ARG(sc), dst->sa_family);
+               kprintf(IPR_FMT "af%d not supported\n", IPR_ARG(sc), dst->sa_family);
                m_freem(m);
                crit_exit();
                sc->sc_if.if_noproto++;
@@ -841,7 +841,7 @@ ipr_rx_data_rdy(int unit)
                        if(len <= 0)
                        {
 #ifdef DEBUG_IPR_VJ
-                               printf("i4b_ipr, ipr_rx_data_rdy: len <= 0 IPR_COMPRESS!\n");
+                               kprintf("i4b_ipr, ipr_rx_data_rdy: len <= 0 IPR_COMPRESS!\n");
 #endif
                                goto error;
                        }
@@ -859,7 +859,7 @@ ipr_rx_data_rdy(int unit)
                        if(len <= 0)
                        {
 #ifdef DEBUG_IPR_VJ
-                               printf("i4b_ipr, ipr_rx_data_rdy: len <= 0 IPR_AUTOCOMP!\n");
+                               kprintf("i4b_ipr, ipr_rx_data_rdy: len <= 0 IPR_AUTOCOMP!\n");
 #endif
                                goto error;
                        }
@@ -869,7 +869,7 @@ ipr_rx_data_rdy(int unit)
                else
                {
 #ifdef DEBUG_IPR_VJ
-                       printf("i4b_ipr, ipr_input: invalid ip packet!\n");
+                       kprintf("i4b_ipr, ipr_input: invalid ip packet!\n");
 #endif
 
 error:
index 5ca76ac..a1a044b 100644 (file)
@@ -37,7 +37,7 @@
  *     $Id: i4b_isppp.c,v 1.44 2000/08/31 07:07:26 hm Exp $
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_isppp.c,v 1.7.2.3 2003/02/06 14:50:53 gj Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_isppp.c,v 1.15 2005/11/28 17:13:45 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_isppp.c,v 1.16 2006/12/22 23:44:55 swildner Exp $
  *
  *     last edit-date: [Thu Aug 31 09:02:27 2000]
  *
@@ -173,9 +173,9 @@ i4bispppattach(void *dummy)
 
 #ifndef HACK_NO_PSEUDO_ATTACH_MSG
 #ifdef SPPP_VJ
-       printf("i4bisppp: %d ISDN SyncPPP device(s) attached (VJ header compression)\n", NI4BISPPP);
+       kprintf("i4bisppp: %d ISDN SyncPPP device(s) attached (VJ header compression)\n", NI4BISPPP);
 #else
-       printf("i4bisppp: %d ISDN SyncPPP device(s) attached\n", NI4BISPPP);
+       kprintf("i4bisppp: %d ISDN SyncPPP device(s) attached\n", NI4BISPPP);
 #endif
 #endif
 
@@ -359,7 +359,7 @@ i4bisppp_watchdog(struct ifnet *ifp)
        sc->sc_if.if_timer = I4BISPPPACCTINTVL;         
 
 #if 0 /* old stuff, keep it around */
-       printf(ISPPP_FMT "transmit timeout\n", ISPPP_ARG(sc));
+       kprintf(ISPPP_FMT "transmit timeout\n", ISPPP_ARG(sc));
        i4bisppp_start(ifp);
 #endif
 }
@@ -597,7 +597,7 @@ i4bisppp_rx_data_rdy(int unit)
 #endif
        
 #ifdef I4BISPPPDEBUG
-       printf("i4bisppp_rx_data_ready: received packet!\n");
+       kprintf("i4bisppp_rx_data_ready: received packet!\n");
 #endif
 
        BPF_MTAP(&sc->sc_if, m);
index ad85f5b..67ea726 100644 (file)
@@ -28,7 +28,7 @@
  *     ---------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.10.2.3 2001/08/12 16:22:48 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_rbch.c,v 1.21 2006/09/10 01:26:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_rbch.c,v 1.22 2006/12/22 23:44:55 swildner Exp $
  *
  *     last edit-date: [Sat Aug 11 18:06:57 2001]
  *
@@ -163,7 +163,7 @@ i4brbchattach(void *dummy)
        int i;
 
 #ifndef HACK_NO_PSEUDO_ATTACH_MSG
-       printf("i4brbch: %d raw B channel access device(s) attached\n", NI4BRBCH);
+       kprintf("i4brbch: %d raw B channel access device(s) attached\n", NI4BRBCH);
 #endif
        
        for(i=0; i < NI4BRBCH; i++)
index 6dce1ec..33ae303 100644 (file)
@@ -28,7 +28,7 @@
  *     --------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_tel.c,v 1.10.2.4 2001/12/16 15:12:57 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_tel.c,v 1.14 2006/09/10 01:26:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_tel.c,v 1.15 2006/12/22 23:44:55 swildner Exp $
  *
  *     last edit-date: [Sat Aug 11 18:07:05 2001]
  *
@@ -187,7 +187,7 @@ i4btelattach(void *dummy)
 {
        int i, j;
 
-       printf("i4btel: %d ISDN telephony interface device(s) attached\n", NI4BTEL);
+       kprintf("i4btel: %d ISDN telephony interface device(s) attached\n", NI4BTEL);
        
        for(i=0; i < NI4BTEL; i++)
        {
@@ -656,7 +656,7 @@ tel_tone(tel_sc_t *sc)
        int i;
 
        if((m = i4b_Bgetmbuf(NTONESAMP)) == NULL) {
-               printf("no mbuf in tel_tone\n");
+               kprintf("no mbuf in tel_tone\n");
                return;
        }
        p = m->m_data;
index 15a919e..d61349d 100644 (file)
@@ -30,7 +30,7 @@
  *     last edit-date: [Sat Aug 11 18:07:15 2001]
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_trace.c,v 1.9.2.3 2001/08/12 16:22:48 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_trace.c,v 1.16 2006/09/10 01:26:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_trace.c,v 1.17 2006/12/22 23:44:55 swildner Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -113,7 +113,7 @@ i4btrcattach(void *dummy)
 {
        int i;
 
-       printf("i4btrc: %d ISDN trace device(s) attached\n", NI4BTRC);
+       kprintf("i4btrc: %d ISDN trace device(s) attached\n", NI4BTRC);
        
        for(i=0; i < NI4BTRC; i++)
        {
@@ -170,7 +170,7 @@ get_trace_data_from_l1(i4b_trace_hdr_t *hdr, int len, char *buf)
        
        if((unit = hdr->unit) > NI4BTRC)
        {
-               printf("i4b_trace: get_trace_data_from_l1 - unit > NI4BTRC!\n"); 
+               kprintf("i4b_trace: get_trace_data_from_l1 - unit > NI4BTRC!\n"); 
                return(0);
        }
 
@@ -178,7 +178,7 @@ get_trace_data_from_l1(i4b_trace_hdr_t *hdr, int len, char *buf)
        
        if(!(m = i4b_Bgetmbuf(totlen)))
        {
-               printf("i4b_trace: get_trace_data_from_l1 - i4b_getmbuf() failed!\n");
+               kprintf("i4b_trace: get_trace_data_from_l1 - i4b_getmbuf() failed!\n");
                return(0);
        }
 
index 95b054f..ea9303d 100644 (file)
@@ -28,7 +28,7 @@
  *     -----------------------------------
  *
  * $FreeBSD: src/sys/i386/include/i4b_debug.h,v 1.6.2.1 2001/08/01 17:45:01 obrien Exp $
- * $DragonFly: src/sys/net/i4b/include/i386/i4b_debug.h,v 1.4 2005/02/17 13:59:59 joerg Exp $
+ * $DragonFly: src/sys/net/i4b/include/i386/i4b_debug.h,v 1.5 2006/12/22 23:44:55 swildner Exp $
  *
  *      last edit-date: [Mon May 21 10:05:34 2001]
  *
@@ -55,19 +55,19 @@ extern unsigned int i4b_l4_debug;
 
 #define NDBGL1(bits, fmt, args...)                                     \
        if(bits & i4b_l1_debug)                                         \
-       { printf("i4b-L1 %s: " fmt "\n", __func__ , ##args ); }
+       { kprintf("i4b-L1 %s: " fmt "\n", __func__ , ##args ); }
 
 #define NDBGL2(bits, fmt, args...)                                     \
        if(bits & i4b_l2_debug)                                         \
-       { printf("i4b-L2 %s: " fmt "\n", __func__ , ##args ); }
+       { kprintf("i4b-L2 %s: " fmt "\n", __func__ , ##args ); }
        
 #define NDBGL3(bits, fmt, args...)                                     \
        if(bits & i4b_l3_debug)                                         \
-       { printf("i4b-L3 %s: " fmt "\n", __func__ , ##args ); }
+       { kprintf("i4b-L3 %s: " fmt "\n", __func__ , ##args ); }
        
 #define NDBGL4(bits, fmt, args...)                                     \
        if(bits & i4b_l4_debug)                                         \
-       { printf("i4b-L4 %s: " fmt "\n", __func__ , ##args ); }
+       { kprintf("i4b-L4 %s: " fmt "\n", __func__ , ##args ); }
        
 #else /* !DO_I4B_DEBUG */
 
index 1d4e70a..6b27b34 100644 (file)
@@ -28,7 +28,7 @@
  *     --------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/i4b_l1dmux.c,v 1.3.2.2 2002/04/25 12:29:55 gj Exp $
- * $DragonFly: src/sys/net/i4b/layer1/i4b_l1dmux.c,v 1.5 2003/08/07 21:54:31 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/i4b_l1dmux.c,v 1.6 2006/12/22 23:44:55 swildner Exp $
  *
  *      last edit-date: [Wed Jan 10 16:43:24 2001]
  *
@@ -313,37 +313,37 @@ i4b_l1_mph_status_ind(int drv_unit, int status, int parm, struct i4b_l1mux_func
                        {
 #if NISIC > 0
                                case L1DRVR_ISIC:
-                                       printf("isic%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
+                                       kprintf("isic%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
                                        break;
 #endif
 #if NIWIC > 0
                                case L1DRVR_IWIC:
-                                       printf("iwic%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
+                                       kprintf("iwic%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
                                        break;
 #endif
 #if NIFPI > 0
                                case L1DRVR_IFPI:
-                                       printf("ifpi%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
+                                       kprintf("ifpi%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
                                        break;
 #endif
 #if NIFPI2 > 0
                                case L1DRVR_IFPI2:
-                                       printf("ifpi2-%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
+                                       kprintf("ifpi2-%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
                                        break;
 #endif
 #if NIFPNP > 0
                                case L1DRVR_IFPNP:
-                                       printf("ifpnp%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
+                                       kprintf("ifpnp%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
                                        break;
 #endif
 #if NIHFC > 0
                                case L1DRVR_IHFC:
-                                       printf("ihfc%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
+                                       kprintf("ihfc%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
                                        break;
 #endif
 #if NITJC > 0
                                case L1DRVR_ITJC:
-                                       printf("itjc%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
+                                       kprintf("itjc%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
                                        break;
 #endif
                        }
index 461ab10..b7f6c93 100644 (file)
@@ -30,7 +30,7 @@
  *     $Id: i4b_l1lib.c,v 1.3 2000/05/29 15:41:41 hm Exp $
  *
  * $FreeBSD: src/sys/i4b/layer1/i4b_l1lib.c,v 1.3.2.1 2001/08/10 14:08:36 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/i4b_l1lib.c,v 1.5 2003/08/07 21:54:31 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/i4b_l1lib.c,v 1.6 2006/12/22 23:44:55 swildner Exp $
  *
  *      last edit-date: [Mon May 29 15:24:21 2000]
  *
@@ -66,7 +66,7 @@ i4b_l1_bchan_tel_silence(unsigned char *data, int len)
        }
 
 #ifdef NOTDEF
-       printf("i4b_l1_bchan_tel_silence: got %d silence bytes in frame\n", j);
+       kprintf("i4b_l1_bchan_tel_silence: got %d silence bytes in frame\n", j);
 #endif
        
        if(j < (TEL_IDLE_MIN))
index 18e5305..d3fa49d 100644 (file)
@@ -30,7 +30,7 @@
  *     $Id: i4b_ifpi_isac.c,v 1.3 2000/05/29 15:41:41 hm Exp $ 
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.4.2.1 2001/08/10 14:08:36 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.6 2006/01/14 11:05:18 swildner Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.7 2006/12/22 23:44:55 swildner Exp $
  *
  *      last edit-date: [Mon May 29 15:22:52 2000]
  *
@@ -227,7 +227,7 @@ ifpi_isac_irq(struct l1_softc *sc, int ista)
                        sc->sc_ol = sc->sc_obuf->m_len;
                        sc->sc_obuf2 = NULL;
 #ifdef NOTDEF                  
-                       printf("ob2=%x, op=%x, ol=%d, f=%d #",
+                       kprintf("ob2=%x, op=%x, ol=%d, f=%d #",
                                sc->sc_obuf,
                                sc->sc_op,
                                sc->sc_ol,
@@ -237,7 +237,7 @@ ifpi_isac_irq(struct l1_softc *sc, int ista)
                else
                {
 #ifdef NOTDEF
-                       printf("ob=%x, op=%x, ol=%d, f=%d #",
+                       kprintf("ob=%x, op=%x, ol=%d, f=%d #",
                                sc->sc_obuf,
                                sc->sc_op,
                                sc->sc_ol,
index 257b6aa..b5b04dd 100644 (file)
@@ -36,7 +36,7 @@
  *     $Id: i4b_ifpi_pci.c,v 1.4 2000/06/02 11:58:56 hm Exp $
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.6.2.1 2001/08/10 14:08:37 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.14 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.15 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Fri Jan 12 17:01:26 2001]
  *
@@ -385,7 +385,7 @@ avma1pp_write_reg(struct l1_softc *sc, int what, bus_size_t offs, u_int8_t data)
                case ISIC_WHAT_ISAC:
                        reg_bank = (offs > MAX_LO_REG_OFFSET) ? ISAC_HI_REG_OFFSET:ISAC_LO_REG_OFFSET;
 #ifdef AVMA1PCI_DEBUG
-                       printf("write_reg bank %d  off %ld.. ", (int)reg_bank, (long)offs);
+                       kprintf("write_reg bank %d  off %ld.. ", (int)reg_bank, (long)offs);
 #endif
                        /* set the register bank */
                        bus_space_write_1(btag, bhandle, ADDR_REG_OFFSET, reg_bank);
@@ -425,7 +425,7 @@ avma1pp_read_reg(struct l1_softc *sc, int what, bus_size_t offs)
                case ISIC_WHAT_ISAC:
                        reg_bank = (offs > MAX_LO_REG_OFFSET) ? ISAC_HI_REG_OFFSET:ISAC_LO_REG_OFFSET;
 #ifdef AVMA1PCI_DEBUG
-                       printf("read_reg bank %d  off %ld.. ", (int)reg_bank, (long)offs);
+                       kprintf("read_reg bank %d  off %ld.. ", (int)reg_bank, (long)offs);
 #endif
                        /* set the register bank */
                        bus_space_write_1(btag, bhandle, ADDR_REG_OFFSET, reg_bank);
@@ -503,13 +503,13 @@ avma1pp_attach_avma1pp(device_t dev)
 
        /* probably not really required */
        if(unit > IFPI_MAXUNIT) {
-               printf("avma1pp%d: Error, unit > IFPI_MAXUNIT!\n", unit);
+               kprintf("avma1pp%d: Error, unit > IFPI_MAXUNIT!\n", unit);
                crit_exit();
                return(ENXIO);
        }
 
        if ((vid != PCI_AVMA1_VID) && (did != PCI_AVMA1_DID)) {
-               printf("avma1pp%d: unknown device!?\n", unit);
+               kprintf("avma1pp%d: unknown device!?\n", unit);
                goto fail;
        }
 
@@ -521,7 +521,7 @@ avma1pp_attach_avma1pp(device_t dev)
                0, ~0, 1, RF_ACTIVE);
 
        if (sc->sc_resources.io_base[0] == NULL) {
-               printf("avma1pp%d: couldn't map IO port\n", unit);
+               kprintf("avma1pp%d: couldn't map IO port\n", unit);
                error = ENXIO;
                goto fail;
        }
@@ -536,7 +536,7 @@ avma1pp_attach_avma1pp(device_t dev)
 
        if (sc->sc_resources.irq == NULL) {
                bus_release_resource(dev, SYS_RES_IOPORT, PCIR_MAPS+4, sc->sc_resources.io_base[0]);
-               printf("avma1pp%d: couldn't map interrupt\n", unit);
+               kprintf("avma1pp%d: couldn't map interrupt\n", unit);
                error = ENXIO;
                goto fail;
        }
@@ -547,7 +547,7 @@ avma1pp_attach_avma1pp(device_t dev)
        if (error) {
                bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_resources.irq);
                bus_release_resource(dev, SYS_RES_IOPORT, PCIR_MAPS+4, sc->sc_resources.io_base[0]);
-               printf("avma1pp%d: couldn't set up irq\n", unit);
+               kprintf("avma1pp%d: couldn't set up irq\n", unit);
                goto fail;
        }
 
@@ -586,40 +586,40 @@ avma1pp_attach_avma1pp(device_t dev)
        v = 0;
        v = ISAC_READ(I_STAR);
 #ifdef AVMA1PCI_DEBUG
-       printf("avma1pp_attach: I_STAR %x...", v);
+       kprintf("avma1pp_attach: I_STAR %x...", v);
 #endif
        v = ISAC_READ(I_MODE);
 #ifdef AVMA1PCI_DEBUG
-       printf("avma1pp_attach: I_MODE %x...", v);
+       kprintf("avma1pp_attach: I_MODE %x...", v);
 #endif
        v = ISAC_READ(I_ADF2);
 #ifdef AVMA1PCI_DEBUG
-       printf("avma1pp_attach: I_ADF2 %x...", v);
+       kprintf("avma1pp_attach: I_ADF2 %x...", v);
 #endif
        v = ISAC_READ(I_ISTA);
 #ifdef AVMA1PCI_DEBUG
-       printf("avma1pp_attach: I_ISTA %x...", v);
+       kprintf("avma1pp_attach: I_ISTA %x...", v);
 #endif
        if (v & ISAC_ISTA_EXI)
        {
                 v = ISAC_READ(I_EXIR);
 #ifdef AVMA1PCI_DEBUG
-                printf("avma1pp_attach: I_EXIR %x...", v);
+                kprintf("avma1pp_attach: I_EXIR %x...", v);
 #endif
        }
        v = ISAC_READ(I_CIRR);
 #ifdef AVMA1PCI_DEBUG
-       printf("avma1pp_attach: I_CIRR %x...", v);
+       kprintf("avma1pp_attach: I_CIRR %x...", v);
 #endif
        ISAC_WRITE(I_MASK, 0xff);
        /* the Linux driver does this to clear any pending HSCX interrupts */
        v = hscx_read_reg_int(0, HSCX_STAT, sc);
 #ifdef AVMA1PCI_DEBUG
-       printf("avma1pp_attach: 0 HSCX_STAT %x...", v);
+       kprintf("avma1pp_attach: 0 HSCX_STAT %x...", v);
 #endif
        v = hscx_read_reg_int(1, HSCX_STAT, sc);
 #ifdef AVMA1PCI_DEBUG
-       printf("avma1pp_attach: 1 HSCX_STAT %x\n", v);
+       kprintf("avma1pp_attach: 1 HSCX_STAT %x\n", v);
 #endif
 
        bus_space_write_1(btag, bhandle, STAT0_OFFSET, ASL_RESET_ALL|ASL_TIMERDISABLE);
@@ -630,15 +630,15 @@ avma1pp_attach_avma1pp(device_t dev)
        bus_space_write_1(btag, bhandle, STAT1_OFFSET, ASL1_ENABLE_IOM|sc->sc_irq);
        DELAY(SEC_DELAY/100); /* 10 ms */
        v = bus_space_read_1(btag, bhandle, STAT1_OFFSET);
-       printf("after reset: S1 %#x\n", v);
+       kprintf("after reset: S1 %#x\n", v);
 
        v = bus_space_read_4(btag, bhandle, 0);
-       printf("avma1pp_attach_avma1pp: v %#x\n", v);
+       kprintf("avma1pp_attach_avma1pp: v %#x\n", v);
 #endif
 
    /* from here to the end would normally be done in isic_pciattach */
 
-        printf("ifpi%d: ISAC %s (IOM-%c)\n", unit,
+        kprintf("ifpi%d: ISAC %s (IOM-%c)\n", unit,
                "2085 Version A1/A2 or 2086/2186 Version 1.1",
                 sc->sc_bustyp == BUS_TYPE_IOM1 ? '1' : '2');
 
@@ -1340,7 +1340,7 @@ avma1pp_hscx_fifo(l1_bchan_state_t *chan, struct l1_softc *sc)
                nextlen = min(chan->out_mbuf_cur_len, sc->sc_bfifolen - len);
 
 #ifdef NOTDEF
-               printf("i:mh=%p, mc=%p, mcp=%p, mcl=%d l=%d nl=%d # ",
+               kprintf("i:mh=%p, mc=%p, mcp=%p, mcl=%d l=%d nl=%d # ",
                        chan->out_mbuf_head,
                        chan->out_mbuf_cur,                     
                        chan->out_mbuf_cur_ptr,
index b979176..045aa44 100644 (file)
@@ -31,7 +31,7 @@
  *     $Id$ 
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.1.2.1 2002/04/25 20:26:50 gj Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.5 2003/08/07 21:54:31 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.6 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Mon May 29 15:22:52 2000]
  *
@@ -248,7 +248,7 @@ ifpi2_isacsx_irq(struct l1_softc *sc, int ista)
                        sc->sc_ol = sc->sc_obuf->m_len;
                        sc->sc_obuf2 = NULL;
 #ifdef NOTDEF                  
-                       printf("ob2=%x, op=%x, ol=%d, f=%d #",
+                       kprintf("ob2=%x, op=%x, ol=%d, f=%d #",
                                sc->sc_obuf,
                                sc->sc_op,
                                sc->sc_ol,
@@ -258,7 +258,7 @@ ifpi2_isacsx_irq(struct l1_softc *sc, int ista)
                else
                {
 #ifdef NOTDEF
-                       printf("ob=%x, op=%x, ol=%d, f=%d #",
+                       kprintf("ob=%x, op=%x, ol=%d, f=%d #",
                                sc->sc_obuf,
                                sc->sc_op,
                                sc->sc_ol,
index 33684aa..8ade538 100644 (file)
@@ -36,7 +36,7 @@
  *     $Id$
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.6.2.2 2002/05/15 08:12:42 gj Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.13 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.14 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Fri Jan 12 17:01:26 2001]
  *
@@ -459,13 +459,13 @@ avma1pp2_attach_avma1pp(device_t dev)
 
        /* probably not really required */
        if(unit > IFPI2_MAXUNIT) {
-               printf("ifpi2-%d: Error, unit > IFPI_MAXUNIT!\n", unit);
+               kprintf("ifpi2-%d: Error, unit > IFPI_MAXUNIT!\n", unit);
                crit_exit();
                return(ENXIO);
        }
 
        if ((vid != PCI_AVMA1_VID) && (did != PCI_AVMA1_V2_DID)) {
-               printf("ifpi2-%d: unknown device!?\n", unit);
+               kprintf("ifpi2-%d: unknown device!?\n", unit);
                goto fail;
        }
 
@@ -477,7 +477,7 @@ avma1pp2_attach_avma1pp(device_t dev)
                0, ~0, 1, RF_ACTIVE);
 
        if (sc->sc_resources.io_base[0] == NULL) {
-               printf("ifpi2-%d: couldn't map IO port\n", unit);
+               kprintf("ifpi2-%d: couldn't map IO port\n", unit);
                error = ENXIO;
                goto fail;
        }
@@ -492,7 +492,7 @@ avma1pp2_attach_avma1pp(device_t dev)
 
        if (sc->sc_resources.irq == NULL) {
                bus_release_resource(dev, SYS_RES_IOPORT, PCIR_MAPS+4, sc->sc_resources.io_base[0]);
-               printf("ifpi2-%d: couldn't map interrupt\n", unit);
+               kprintf("ifpi2-%d: couldn't map interrupt\n", unit);
                error = ENXIO;
                goto fail;
        }
@@ -503,7 +503,7 @@ avma1pp2_attach_avma1pp(device_t dev)
        if (error) {
                bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_resources.irq);
                bus_release_resource(dev, SYS_RES_IOPORT, PCIR_MAPS+4, sc->sc_resources.io_base[0]);
-               printf("ifpi2-%d: couldn't set up irq\n", unit);
+               kprintf("ifpi2-%d: couldn't set up irq\n", unit);
                goto fail;
        }
 
@@ -542,26 +542,26 @@ avma1pp2_attach_avma1pp(device_t dev)
        v = 0;
        v = ISAC_READ(I_RMODED);
 #ifdef AVMA1PCI_V2_DEBUG
-       printf("avma1pp2_attach: I_MODED %x...", v);
+       kprintf("avma1pp2_attach: I_MODED %x...", v);
 #endif
        v = ISAC_READ(I_ISTAD);
 #ifdef AVMA1PCI_V2_DEBUG
-       printf("avma1pp2_attach: I_ISTAD %x...", v);
+       kprintf("avma1pp2_attach: I_ISTAD %x...", v);
 #endif
        v = ISAC_READ(I_ISTA);
 #ifdef AVMA1PCI_V2_DEBUG
-       printf("avma1pp2_attach: I_ISTA %x...", v);
+       kprintf("avma1pp2_attach: I_ISTA %x...", v);
 #endif
        ISAC_WRITE(I_MASKD, 0xff);
        ISAC_WRITE(I_MASK, 0xff);
        /* the Linux driver does this to clear any pending HSCX interrupts */
        v = hscx_read_reg_int(0, sc);
 #ifdef AVMA1PCI_V2_DEBUG
-       printf("avma1pp2_attach: 0 HSCX_STAT %x...", v);
+       kprintf("avma1pp2_attach: 0 HSCX_STAT %x...", v);
 #endif
        v = hscx_read_reg_int(1, sc);
 #ifdef AVMA1PCI_V2_DEBUG
-       printf("avma1pp2_attach: 1 HSCX_STAT %x\n", v);
+       kprintf("avma1pp2_attach: 1 HSCX_STAT %x\n", v);
 #endif
 
        bus_space_write_1(btag, bhandle, STAT0_OFFSET, ASL_TIMERRESET);
@@ -571,7 +571,7 @@ avma1pp2_attach_avma1pp(device_t dev)
 
    /* from here to the end would normally be done in isic_pciattach */
 
-        printf("ifpi2-%d: ISACSX %s\n", unit, "PSB3186");
+        kprintf("ifpi2-%d: ISACSX %s\n", unit, "PSB3186");
 
        /* init the ISAC */
        ifpi2_isacsx_init(sc);
@@ -1281,7 +1281,7 @@ avma1pp2_hscx_fifo(l1_bchan_state_t *chan, struct l1_softc *sc)
                nextlen = min(chan->out_mbuf_cur_len, sc->sc_bfifolen - len);
 
 #ifdef NOTDEF
-               printf("i:mh=%p, mc=%p, mcp=%p, mcl=%d l=%d nl=%d # ",
+               kprintf("i:mh=%p, mc=%p, mcp=%p, mcl=%d l=%d nl=%d # ",
                        chan->out_mbuf_head,
                        chan->out_mbuf_cur,                     
                        chan->out_mbuf_cur_ptr,
@@ -1369,7 +1369,7 @@ ifpi2_isacsx_intr(struct l1_softc *sc)
 void
 ifpi2_recover(struct l1_softc *sc)
 {
-       printf("ifpi2_recover %d\n", sc->sc_unit);
+       kprintf("ifpi2_recover %d\n", sc->sc_unit);
 #if 0 /* fix me later */
        u_char byte;
        
index 280cf3a..e9da815 100644 (file)
@@ -34,7 +34,7 @@
  *     ---------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.5.2.1 2001/08/10 14:08:37 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.11 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.12 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Fri Jan 12 17:05:28 2001]
  *
@@ -471,7 +471,7 @@ avm_pnp_attach(device_t dev)
 
        /* probably not really required */
        if(unit > IFPNP_MAXUNIT) {
-               printf("avm_pnp%d: Error, unit > IFPNP_MAXUNIT!\n", unit);
+               kprintf("avm_pnp%d: Error, unit > IFPNP_MAXUNIT!\n", unit);
                crit_exit();
                return(ENXIO);
        }
@@ -485,11 +485,11 @@ avm_pnp_attach(device_t dev)
                                                &sc->sc_resources.io_rid[0],
                                                0UL, ~0UL, 1, RF_ACTIVE ) ))
        {
-               printf("avm_pnp_attach: Couldn't get my io_base.\n");
+               kprintf("avm_pnp_attach: Couldn't get my io_base.\n");
                return ENXIO;                                       
        }
        if (sc->sc_resources.io_base[0] == NULL) {
-               printf("avm_pnp%d: couldn't map IO port\n", unit);
+               kprintf("avm_pnp%d: couldn't map IO port\n", unit);
                error = ENXIO;
                goto fail;
        }
@@ -507,7 +507,7 @@ avm_pnp_attach(device_t dev)
                                           &sc->sc_resources.irq_rid,
                                           0UL, ~0UL, 1, RF_ACTIVE)))
        {
-               printf("avm_pnp%d: Could not get irq.\n",unit);
+               kprintf("avm_pnp%d: Could not get irq.\n",unit);
                error = ENXIO;                                       
                goto fail;
        }
@@ -571,11 +571,11 @@ avm_pnp_attach(device_t dev)
        bus_space_write_1(btag, bhandle, STAT0_OFFSET, ASL_TIMERRESET|ASL_ENABLE_INT|ASL_TIMERDISABLE);
        DELAY(SEC_DELAY/100); /* 10 ms */
 
-        printf("ifpnp%d: AVM Fritz!Card PnP Class %#x Revision %d \n", unit,
+        kprintf("ifpnp%d: AVM Fritz!Card PnP Class %#x Revision %d \n", unit,
                        bus_space_read_1(btag, bhandle, CLASS_OFFSET),
                        bus_space_read_1(btag, bhandle, REVISION_OFFSET));
 
-        printf("ifpnp%d: ISAC %s (IOM-%c)\n", unit,
+        kprintf("ifpnp%d: ISAC %s (IOM-%c)\n", unit,
                "2085 Version A1/A2 or 2086/2186 Version 1.1",
                 sc->sc_bustyp == BUS_TYPE_IOM1 ? '1' : '2');
 
@@ -1262,7 +1262,7 @@ avm_pnp_hscx_fifo(l1_bchan_state_t *chan, struct l1_softc *sc)
                nextlen = min(chan->out_mbuf_cur_len, sc->sc_bfifolen - len);
 
 #ifdef NOTDEF
-               printf("i:mh=%p, mc=%p, mcp=%p, mcl=%d l=%d nl=%d # ",
+               kprintf("i:mh=%p, mc=%p, mcp=%p, mcl=%d l=%d nl=%d # ",
                        chan->out_mbuf_head,
                        chan->out_mbuf_cur,                     
                        chan->out_mbuf_cur_ptr,
index 7b98679..5feb4b1 100644 (file)
@@ -31,7 +31,7 @@
  *     $Ust: src/i4b/layer1-nb/ifpnp/i4b_ifpnp_isac.c,v 1.4 2000/04/18 08:03:05 ust Exp $
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.4.2.1 2001/08/10 14:08:37 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.5 2006/01/14 11:05:18 swildner Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.6 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Mon May 29 15:24:49 2000]
  *
@@ -226,7 +226,7 @@ ifpnp_isac_irq(struct l1_softc *sc, int ista)
                        sc->sc_ol = sc->sc_obuf->m_len;
                        sc->sc_obuf2 = NULL;
 #ifdef NOTDEF                  
-                       printf("ob2=%x, op=%x, ol=%d, f=%d #",
+                       kprintf("ob2=%x, op=%x, ol=%d, f=%d #",
                                sc->sc_obuf,
                                sc->sc_op,
                                sc->sc_ol,
@@ -236,7 +236,7 @@ ifpnp_isac_irq(struct l1_softc *sc, int ista)
                else
                {
 #ifdef NOTDEF
-                       printf("ob=%x, op=%x, ol=%d, f=%d #",
+                       kprintf("ob=%x, op=%x, ol=%d, f=%d #",
                                sc->sc_obuf,
                                sc->sc_op,
                                sc->sc_ol,
index 56d84f4..1b88615 100644 (file)
@@ -33,7 +33,7 @@
  *     last edit-date: [Fri Jan 12 17:06:52 2001]
  *
  * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.9.2.1 2001/08/10 14:08:37 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.8 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.9 2006/12/22 23:44:56 swildner Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -299,7 +299,7 @@ ihfc_control(ihfc_sc_t *sc, int flag)
                         * until we configure the chips for normal      *
                         * operation.                                   */
 #ifdef IHFC_DEBUG
-                       printf("ihfc: GET_STAT value is: 0x%x\n", GET_STAT);
+                       kprintf("ihfc: GET_STAT value is: 0x%x\n", GET_STAT);
 #endif
                        SET_REG(0x30);
 
@@ -1599,7 +1599,7 @@ ihfc_test_Bwrite (ihfc_sc_t *sc, u_char chan)
 
        sendlen = /* (u_short)ihfc_Bsel_fifo(sc, chan, 0); */ 0;
 
-       if (sendlen == 0x5ff) printf("(send empty)");
+       if (sendlen == 0x5ff) kprintf("(send empty)");
 
        SET_REG(0xaa + chan);
 
@@ -1607,7 +1607,7 @@ ihfc_test_Bwrite (ihfc_sc_t *sc, u_char chan)
 
        tlen    = S_HDLC_CRC;
 
-       if (sendlen > 0x400) printf("(slow: %d)", sendlen);
+       if (sendlen > 0x400) kprintf("(slow: %d)", sendlen);
 
        fb = 0x80;
 
@@ -1709,7 +1709,7 @@ ihfc_test_Bread (ihfc_sc_t *sc, u_char chan)
                                        i4b_Bfreembuf(S_MBUF);
 
                                S_MBUF = NULL;
-                               printf("(error%d, %d, %d)", S_UNIT, ecount, toterrors++);
+                               kprintf("(error%d, %d, %d)", S_UNIT, ecount, toterrors++);
                        }
 
                        i4b_Bfreembuf(S_MBUF);
index 0335e6b..255f465 100644 (file)
@@ -36,7 +36,7 @@
  *      $Id: i4b_ihfc_pnp.c,v 1.9 2000/09/19 13:50:36 hm Exp $
  *
  * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.5.2.1 2001/08/10 14:08:37 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.8 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.9 2006/12/22 23:44:56 swildner Exp $
  *     
  *---------------------------------------------------------------------------*/
 
@@ -154,7 +154,7 @@ ihfc_pnp_probe(device_t dev)
 
        if (unit >= IHFC_MAXUNIT)
        {
-               printf("ihfc%d: Error, unit %d >= IHFC_MAXUNIT", unit, unit);
+               kprintf("ihfc%d: Error, unit %d >= IHFC_MAXUNIT", unit, unit);
                return ENXIO;
        }
 
@@ -223,7 +223,7 @@ ihfc_pnp_probe(device_t dev)
                                }
                                else
                                {
-                                       printf("ihfc%d: Chip seems corrupted. "
+                                       kprintf("ihfc%d: Chip seems corrupted. "
                                        "Please hard reboot your computer!\n",
                                        unit);                                  
                                }
@@ -323,7 +323,7 @@ ihfc_isa_probe(device_t dev)
 
        HFC_END;
 
-       printf("ihfc%d: Chip not found. "
+       kprintf("ihfc%d: Chip not found. "
        "A hard reboot may help!\n", unit);
 
        return ENXIO;   /* failure */
@@ -371,7 +371,7 @@ ihfc_pnp_shutdown(device_t dev)
 
        if (unit >= IHFC_MAXUNIT)
        {
-               printf("ihfc%d: Error, unit %d >= IHFC_MAXUNIT", unit, unit);
+               kprintf("ihfc%d: Error, unit %d >= IHFC_MAXUNIT", unit, unit);
                goto f0;
        }
 
@@ -399,7 +399,7 @@ ihfc_pnp_detach (device_t dev, u_int flag)
 
        if (unit >= IHFC_MAXUNIT)
        {
-               printf("ihfc%d: Error, unit %d >= IHFC_MAXUNIT", unit, unit);
+               kprintf("ihfc%d: Error, unit %d >= IHFC_MAXUNIT", unit, unit);
                return 0;
        }
 
index 3361363..f9b3c10 100644 (file)
@@ -36,7 +36,7 @@
  *     ------------------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_avm_a1.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_avm_a1.c,v 1.6 2005/10/12 17:35:55 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_avm_a1.c,v 1.7 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:25:23 2001]
  *
@@ -149,7 +149,7 @@ isic_alloc_port(device_t dev, int rid, u_int base, u_int len)
                                   &sc->sc_resources.io_rid[rid],
                                   0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Error, failed to reserve io #%d!\n", unit, rid);
+               kprintf("isic%d: Error, failed to reserve io #%d!\n", unit, rid);
                isic_detach_common(dev);
                return(ENXIO);
        }
@@ -174,7 +174,7 @@ isic_probe_avma1(device_t dev)
 
        if(unit >= ISIC_MAXUNIT)
        {
-               printf("isic%d: Error, unit %d >= ISIC_MAXUNIT for AVM A1/Fritz!\n",
+               kprintf("isic%d: Error, unit %d >= ISIC_MAXUNIT for AVM A1/Fritz!\n",
                                unit, unit);
                return(ENXIO);  
        }
@@ -189,7 +189,7 @@ isic_probe_avma1(device_t dev)
                                           &sc->sc_resources.io_rid[0],
                                           0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get iobase for AVM A1/Fritz!\n",
+               kprintf("isic%d: Could not get iobase for AVM A1/Fritz!\n",
                                unit);
                return(ENXIO);
        }
@@ -212,7 +212,7 @@ isic_probe_avma1(device_t dev)
                        break;
                        
                default:
-                       printf("isic%d: Error, invalid iobase 0x%x specified for AVM A1/Fritz!\n",
+                       kprintf("isic%d: Error, invalid iobase 0x%x specified for AVM A1/Fritz!\n",
                                unit, sc->sc_port);
                        return(ENXIO);
                        break;
@@ -246,7 +246,7 @@ isic_probe_avma1(device_t dev)
                                   &sc->sc_resources.irq_rid,
                                   0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get an irq for AVM A1/Fritz!\n",unit);
+               kprintf("isic%d: Could not get an irq for AVM A1/Fritz!\n",unit);
                isic_detach_common(dev);
                return ENXIO;
        }
@@ -278,7 +278,7 @@ isic_probe_avma1(device_t dev)
                        break;
                        
                default:
-                       printf("isic%d: Error, invalid IRQ [%d] specified for AVM A1/Fritz!\n",
+                       kprintf("isic%d: Error, invalid IRQ [%d] specified for AVM A1/Fritz!\n",
                                unit, sc->sc_irq);
                        isic_detach_common(dev);
                        return(ENXIO);
@@ -314,11 +314,11 @@ isic_probe_avma1(device_t dev)
             (((HSCX_READ(1, H_VSTR) & 0xf) != 0x5) &&
             ((HSCX_READ(1, H_VSTR) & 0xf) != 0x4)) )  
        {
-               printf("isic%d: HSCX VSTR test failed for AVM A1/Fritz\n",
+               kprintf("isic%d: HSCX VSTR test failed for AVM A1/Fritz\n",
                        unit);
-               printf("isic%d: HSC0: VSTR: %#x\n",
+               kprintf("isic%d: HSC0: VSTR: %#x\n",
                        unit, HSCX_READ(0, H_VSTR));
-               printf("isic%d: HSC1: VSTR: %#x\n",
+               kprintf("isic%d: HSC1: VSTR: %#x\n",
                        unit, HSCX_READ(1, H_VSTR));
                return(ENXIO);
        }                   
@@ -351,7 +351,7 @@ isic_probe_avma1(device_t dev)
 
        if((byte = bus_space_read_1(t, h, 0) & 0x38) != 0x00)
        {
-               printf("isic%d: Error, probe-1 failed, 0x%02x should be 0x00 for AVM A1/Fritz!\n",
+               kprintf("isic%d: Error, probe-1 failed, 0x%02x should be 0x00 for AVM A1/Fritz!\n",
                                unit, byte);
                bus_space_write_1(t, h, 0, savebyte);
                return(ENXIO);
@@ -365,7 +365,7 @@ isic_probe_avma1(device_t dev)
 
        if((byte = bus_space_read_1(t, h, 0) & 0x38) != 0x10)
        {
-               printf("isic%d: Error, probe-2 failed, 0x%02x should be 0x10 for AVM A1/Fritz!\n",
+               kprintf("isic%d: Error, probe-2 failed, 0x%02x should be 0x10 for AVM A1/Fritz!\n",
                                unit, byte);
                bus_space_write_1(t, h, 0, savebyte);
                return(ENXIO);
index 616083f..907379e 100644 (file)
@@ -28,7 +28,7 @@
  *     ----------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_bchan.c,v 1.7.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_bchan.c,v 1.6 2005/06/14 21:19:19 joerg Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_bchan.c,v 1.7 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:07:12 2001]
  *
@@ -210,7 +210,7 @@ isic_bchannel_start(int unit, int h_chan)
                        next_len = chan->out_mbuf_cur_len;
 
 #ifdef NOTDEF          
-               printf("b:mh=%x, mc=%x, mcp=%x, mcl=%d l=%d nl=%d # ",
+               kprintf("b:mh=%x, mc=%x, mcp=%x, mcl=%d l=%d nl=%d # ",
                        chan->out_mbuf_head,
                        chan->out_mbuf_cur,                     
                        chan->out_mbuf_cur_ptr,
index f2df781..2c98d2d 100644 (file)
@@ -28,7 +28,7 @@
  *     ============================================================
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_ctx_s0P.c,v 1.5.2.2 2001/12/10 12:18:11 hm Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_ctx_s0P.c,v 1.4 2004/05/04 12:03:49 hmp Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_ctx_s0P.c,v 1.5 2006/12/22 23:44:56 swildner Exp $
  *
  *     last edit-date: [Wed Jan 24 09:07:22 2001]
  *
@@ -128,7 +128,7 @@ isic_attach_Cs0P(device_t dev)
                                        &sc->sc_resources.io_rid[1],
                                        0UL, ~0UL, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get io area 1 for Creatix / Teles PnP!\n", unit);
+               kprintf("isic%d: Could not get io area 1 for Creatix / Teles PnP!\n", unit);
                isic_detach_common(dev);
                return ENXIO;
        }
@@ -147,7 +147,7 @@ isic_attach_Cs0P(device_t dev)
                                                &sc->sc_resources.io_rid[2],
                                                0UL, ~0UL, 1, RF_ACTIVE)))
                {
-                       printf("isic%d: Could not get cfg io area for Compaq Microcom 610\n", unit);
+                       kprintf("isic%d: Could not get cfg io area for Compaq Microcom 610\n", unit);
                        isic_detach_common(dev);
                        return ENXIO;
                }
@@ -193,7 +193,7 @@ isic_attach_Cs0P(device_t dev)
                                   &sc->sc_resources.io_rid[2],
                                   0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get io area 2 for Creatix / Teles PnP!\n", unit);
+               kprintf("isic%d: Could not get io area 2 for Creatix / Teles PnP!\n", unit);
                isic_detach_common(dev);
                return ENXIO;
        }
@@ -221,7 +221,7 @@ isic_attach_Cs0P(device_t dev)
                                   &sc->sc_resources.io_rid[3],
                                   0ul,~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get io area 3 for Creatix / Teles PnP!\n", unit);
+               kprintf("isic%d: Could not get io area 3 for Creatix / Teles PnP!\n", unit);
                isic_detach_common(dev);
                return ENXIO;
        }
@@ -237,7 +237,7 @@ isic_attach_Cs0P(device_t dev)
                                   &sc->sc_resources.io_rid[4],
                                   0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get io area 4 for Creatix / Teles PnP!\n", unit);
+               kprintf("isic%d: Could not get io area 4 for Creatix / Teles PnP!\n", unit);
                isic_detach_common(dev);
                return ENXIO;
        }
@@ -258,7 +258,7 @@ isic_attach_Cs0P(device_t dev)
                                           &sc->sc_resources.io_rid[5],
                                           0ul, ~0ul, 1, RF_ACTIVE)))
                {
-                       printf("isic%d: Could not get cfg io area for Compaq Microcom 610!\n", unit);
+                       kprintf("isic%d: Could not get cfg io area for Compaq Microcom 610!\n", unit);
                        isic_detach_common(dev);
                        return ENXIO;
                }
index 64e2f8a..3e4aa71 100644 (file)
@@ -28,7 +28,7 @@
  *     --------------------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_diva.c,v 1.1.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_diva.c,v 1.4 2003/08/07 21:54:31 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_diva.c,v 1.5 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Fri Jan 26 13:57:10 2001]
  *
@@ -380,11 +380,11 @@ isic_attach_diva(device_t dev)
        if( ((HSCX_READ(0, H_VSTR) & 0xf) != 0x5) || 
            ((HSCX_READ(1, H_VSTR) & 0xf) != 0x5) )
        {
-               printf("isic%d: HSCX VSTR test failed for Eicon DIVA 2.0\n",
+               kprintf("isic%d: HSCX VSTR test failed for Eicon DIVA 2.0\n",
                        sc->sc_unit);
-               printf("isic%d: HSC0: VSTR: %#x\n",
+               kprintf("isic%d: HSC0: VSTR: %#x\n",
                        sc->sc_unit, HSCX_READ(0, H_VSTR));
-               printf("isic%d: HSC1: VSTR: %#x\n",
+               kprintf("isic%d: HSC1: VSTR: %#x\n",
                        sc->sc_unit, HSCX_READ(1, H_VSTR));
                return ENXIO;
        }
index b9873fe..c52c6c0 100644 (file)
@@ -28,7 +28,7 @@
  *     --------------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_drn_ngo.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_drn_ngo.c,v 1.4 2003/08/07 21:54:31 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_drn_ngo.c,v 1.5 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:07:44 2001]
  *
@@ -230,7 +230,7 @@ isic_attach_drnngo(device_t dev)
                                        &sc->sc_resources.io_rid[1],
                                        0UL, ~0UL, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Failed to get second io base.\n", unit);
+               kprintf("isic%d: Failed to get second io base.\n", unit);
                isic_detach_common(dev);
                return ENXIO;
        }
index ffa01f3..26933b6 100644 (file)
@@ -34,7 +34,7 @@
  *     ==================================================
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_dynalink.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_dynalink.c,v 1.3 2003/08/07 21:17:26 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_dynalink.c,v 1.4 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:08:03 2001]
  *
@@ -213,11 +213,11 @@ isic_attach_Dyn(device_t dev)
        if( ((HSCX_READ(0, H_VSTR) & 0xf) != 0x5) || 
            ((HSCX_READ(1, H_VSTR) & 0xf) != 0x5) )
        {
-               printf("isic%d: HSCX VSTR test failed for Dynalink\n",
+               kprintf("isic%d: HSCX VSTR test failed for Dynalink\n",
                        sc->sc_unit);
-               printf("isic%d: HSC0: VSTR: %#x\n",
+               kprintf("isic%d: HSC0: VSTR: %#x\n",
                        sc->sc_unit, HSCX_READ(0, H_VSTR));
-               printf("isic%d: HSC1: VSTR: %#x\n",
+               kprintf("isic%d: HSC1: VSTR: %#x\n",
                        sc->sc_unit, HSCX_READ(1, H_VSTR));
                return ENXIO;
        }
index 940d3b6..dd13eb6 100644 (file)
@@ -28,7 +28,7 @@
  *     ================================================================
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.5.2.2 2001/10/24 14:17:20 hm Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.6 2005/10/12 17:35:55 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.7 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Oct 24 16:15:26 2001]
  *
@@ -228,7 +228,7 @@ isic_probe_Epcc16(device_t dev)
        /* check max unit range */
        if(unit >= ISIC_MAXUNIT)
        {
-               printf("isic%d: Error, unit %d >= ISIC_MAXUNIT for ELSA PCC-16!\n",
+               kprintf("isic%d: Error, unit %d >= ISIC_MAXUNIT for ELSA PCC-16!\n",
                                unit, unit);
                return(ENXIO);  
        }
@@ -243,7 +243,7 @@ isic_probe_Epcc16(device_t dev)
                                           &sc->sc_resources.io_rid[0],
                                           0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get iobase for ELSA PCC-16.\n",
+               kprintf("isic%d: Could not get iobase for ELSA PCC-16.\n",
                                unit);
                return(ENXIO);
        }
@@ -260,7 +260,7 @@ isic_probe_Epcc16(device_t dev)
                case 0x360:
                        break;
                default:
-                       printf("isic%d: Error, invalid iobase 0x%x specified for ELSA MicroLink ISDN/PCC-16!\n",
+                       kprintf("isic%d: Error, invalid iobase 0x%x specified for ELSA MicroLink ISDN/PCC-16!\n",
                                unit, sc->sc_port);
                        isic_detach_Epcc16(dev);
                        return(ENXIO);
@@ -304,18 +304,18 @@ isic_probe_Epcc16(device_t dev)
                if( ((HSCX_READ(0, H_VSTR) & 0xf) != 0x85) ||
                    ((HSCX_READ(1, H_VSTR) & 0xf) != 0x85) )
                {
-                       printf("isic%d: HSCX VSTR test failed for ELSA MicroLink ISDN/PCC-16\n",
+                       kprintf("isic%d: HSCX VSTR test failed for ELSA MicroLink ISDN/PCC-16\n",
                                unit);
                        isic_detach_Epcc16(dev);
-                       printf("isic%d: HSC0: VSTR: %#x\n",
+                       kprintf("isic%d: HSC0: VSTR: %#x\n",
                                unit, HSCX_READ(0, H_VSTR));
-                       printf("isic%d: HSC1: VSTR: %#x\n",
+                       kprintf("isic%d: HSC1: VSTR: %#x\n",
                                unit, HSCX_READ(1, H_VSTR));
                        return (ENXIO);
                }
                else
                {
-                       printf("isic%d: ELSA MicroLink ISDN/PCFpro found, going to tread it as PCC-16\n",
+                       kprintf("isic%d: ELSA MicroLink ISDN/PCFpro found, going to tread it as PCC-16\n",
                                unit);
                }
        }
@@ -327,7 +327,7 @@ isic_probe_Epcc16(device_t dev)
                                        &sc->sc_resources.irq_rid,
                                        0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get an irq.\n",unit);
+               kprintf("isic%d: Could not get an irq.\n",unit);
                isic_detach_Epcc16(dev);
                return ENXIO;
        }
@@ -348,7 +348,7 @@ isic_probe_Epcc16(device_t dev)
                        break;
                        
                default:
-                       printf("isic%d: Error, invalid IRQ [%d] specified for ELSA MicroLink ISDN/PCC-16!\n",
+                       kprintf("isic%d: Error, invalid IRQ [%d] specified for ELSA MicroLink ISDN/PCC-16!\n",
                                unit, sc->sc_irq);
                        isic_detach_Epcc16(dev);
                        return(ENXIO);
index ccd1101..eb67168 100644 (file)
@@ -28,7 +28,7 @@
  *     ==================================================================
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.6.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.7 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.8 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:09:28 2001]
  *
@@ -246,7 +246,7 @@ eqs1p_pci_attach(device_t dev)
        
        if(unit >= ISIC_MAXUNIT)
        {
-               printf("isic%d: Error, unit %d >= ISIC_MAXUNIT for ELSA MicroLink ISDN/PCI!\n",
+               kprintf("isic%d: Error, unit %d >= ISIC_MAXUNIT for ELSA MicroLink ISDN/PCI!\n",
                                unit, unit);
                return(ENXIO);  
        }       
@@ -264,7 +264,7 @@ eqs1p_pci_attach(device_t dev)
                                                &sc->sc_resources.io_rid[0],
                                                0UL, ~0UL, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Couldn't get first iobase for ELSA MicroLink ISDN/PCI!\n", unit);
+               kprintf("isic%d: Couldn't get first iobase for ELSA MicroLink ISDN/PCI!\n", unit);
                return(ENXIO);                                       
        }
 
@@ -275,7 +275,7 @@ eqs1p_pci_attach(device_t dev)
                                                &sc->sc_resources.io_rid[1],
                                                0UL, ~0UL, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Couldn't get second iobase for ELSA MicroLink ISDN/PCI!\n", unit);
+               kprintf("isic%d: Couldn't get second iobase for ELSA MicroLink ISDN/PCI!\n", unit);
                isic_detach_common(dev);
                return(ENXIO);                                       
        }
@@ -287,7 +287,7 @@ eqs1p_pci_attach(device_t dev)
                                           &sc->sc_resources.irq_rid,
                                           0UL, ~0UL, 1, RF_ACTIVE | RF_SHAREABLE)))
        {
-               printf("isic%d: Could not get irq for ELSA MicroLink ISDN/PCI!\n",unit);
+               kprintf("isic%d: Could not get irq for ELSA MicroLink ISDN/PCI!\n",unit);
                isic_detach_common(dev);
                return(ENXIO);                                       
        }
@@ -326,7 +326,7 @@ eqs1p_pci_attach(device_t dev)
                                (void(*)(void*))isicintr,
                                sc, &ih, NULL))
        {
-               printf("isic%d: Couldn't set up irq for ELSA MicroLink ISDN/PCI!\n", unit);
+               kprintf("isic%d: Couldn't set up irq for ELSA MicroLink ISDN/PCI!\n", unit);
                isic_detach_common(dev);
                return(ENXIO);
        }
index 18af987..7caf4e9 100644 (file)
@@ -28,7 +28,7 @@
  *     --------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_hscx.c,v 1.7.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_hscx.c,v 1.5 2005/06/14 21:19:19 joerg Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_hscx.c,v 1.6 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:09:42 2001]
  *
@@ -373,7 +373,7 @@ isic_hscx_irq(struct l1_softc *sc, u_char ista, int h_chan, u_char ex_irq)
                        nextlen = min(chan->out_mbuf_cur_len, sc->sc_bfifolen - len);
 
 #ifdef NOTDEF                  
-                       printf("i:mh=%x, mc=%x, mcp=%x, mcl=%d l=%d nl=%d # ",
+                       kprintf("i:mh=%x, mc=%x, mcp=%x, mcl=%d l=%d nl=%d # ",
                                chan->out_mbuf_head,
                                chan->out_mbuf_cur,                     
                                chan->out_mbuf_cur_ptr,
index 033dcae..5107e45 100644 (file)
@@ -28,7 +28,7 @@
  *     ---------------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isac.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isac.c,v 1.5 2006/01/14 11:05:18 swildner Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isac.c,v 1.6 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:10:36 2001]
  *
@@ -221,7 +221,7 @@ isic_isac_irq(struct l1_softc *sc, int ista)
                        sc->sc_ol = sc->sc_obuf->m_len;
                        sc->sc_obuf2 = NULL;
 #ifdef NOTDEF                  
-                       printf("ob2=%x, op=%x, ol=%d, f=%d #",
+                       kprintf("ob2=%x, op=%x, ol=%d, f=%d #",
                                sc->sc_obuf,
                                sc->sc_op,
                                sc->sc_ol,
@@ -231,7 +231,7 @@ isic_isac_irq(struct l1_softc *sc, int ista)
                else
                {
 #ifdef NOTDEF
-                       printf("ob=%x, op=%x, ol=%d, f=%d #",
+                       kprintf("ob=%x, op=%x, ol=%d, f=%d #",
                                sc->sc_obuf,
                                sc->sc_op,
                                sc->sc_ol,
index c3acd17..2e74ac0 100644 (file)
@@ -28,7 +28,7 @@
  *     ==============================
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic.c,v 1.4.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic.c,v 1.5 2004/09/16 04:36:32 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic.c,v 1.6 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:29:42 2001]
  *
@@ -295,7 +295,7 @@ isic_attach_common(device_t dev)
                                break;
 
                        default:
-                               printf("isic%d: Error, IPAC version %d unknown!\n",
+                               kprintf("isic%d: Error, IPAC version %d unknown!\n",
                                        unit, sc->sc_ipac_version);
                                return(0);
                                break;
@@ -314,7 +314,7 @@ isic_attach_common(device_t dev)
                                break;
        
                        default:
-                               printf("isic%d: Error, ISAC version %d unknown!\n",
+                               kprintf("isic%d: Error, ISAC version %d unknown!\n",
                                        unit, sc->sc_isac_version);
                                return ENXIO;
                                break;
@@ -331,7 +331,7 @@ isic_attach_common(device_t dev)
                                break;
                                
                        default:
-                               printf("isic%d: Error, HSCX version %d unknown!\n",
+                               kprintf("isic%d: Error, HSCX version %d unknown!\n",
                                        unit, sc->sc_hscx_version);
                                return ENXIO;
                                break;
@@ -415,7 +415,7 @@ isic_attach_common(device_t dev)
        }
 
        if(drvid)
-               printf("isic%d: %s\n", unit, drvid);
+               kprintf("isic%d: %s\n", unit, drvid);
        
        if(bootverbose)
        {
@@ -424,18 +424,18 @@ isic_attach_common(device_t dev)
                if(sc->sc_ipac)
                {
                        if(sc->sc_ipac_version == IPAC_V11)
-                               printf("isic%d: IPAC PSB2115 Version 1.1\n", unit);
+                               kprintf("isic%d: IPAC PSB2115 Version 1.1\n", unit);
                        else
-                               printf("isic%d: IPAC PSB2115 Version 1.2\n", unit);
+                               kprintf("isic%d: IPAC PSB2115 Version 1.2\n", unit);
                }
                else
                {
-                       printf("isic%d: ISAC %s (IOM-%c)\n",
+                       kprintf("isic%d: ISAC %s (IOM-%c)\n",
                                unit,
                                ISACversion[sc->sc_isac_version],
                                sc->sc_bustyp == BUS_TYPE_IOM1 ? '1' : '2');
 
-                       printf("isic%d: HSCX %s\n",
+                       kprintf("isic%d: HSCX %s\n",
                                unit,
                                HSCXversion[sc->sc_hscx_version]);
                }
index f823250..5d47502 100644 (file)
@@ -28,7 +28,7 @@
  *     ==================================
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_isa.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_isa.c,v 1.4 2003/08/07 21:54:31 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_isa.c,v 1.5 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:30:19 2001]
  *
@@ -129,7 +129,7 @@ isic_isa_probe(device_t dev)
 #endif
 
                default:
-                       printf("isic%d: probe, unknown flag: %d\n",
+                       kprintf("isic%d: probe, unknown flag: %d\n",
                                device_get_unit(dev), device_get_flags(dev));
                        break;
        }
@@ -195,7 +195,7 @@ isic_isa_attach(device_t dev)
 #endif
 
                default:
-                       printf("isic%d: attach, unknown flag: %d\n",
+                       kprintf("isic%d: attach, unknown flag: %d\n",
                                device_get_unit(dev), device_get_flags(dev));
                        break;
        }
index 863ed2f..1d87a5f 100644 (file)
@@ -38,7 +38,7 @@
  *     --------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_pnp.c,v 1.5.2.2 2001/12/10 12:18:11 hm Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_pnp.c,v 1.6 2005/10/12 17:35:55 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_pnp.c,v 1.7 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Fri Jan 26 14:01:04 2001]
  *
@@ -182,7 +182,7 @@ isic_pnp_attach(device_t dev)
        
        if(unit >= ISIC_MAXUNIT)
        {
-               printf("isic%d: Error, unit %d >= ISIC_MAXUNIT for %s\n", unit, unit, name);
+               kprintf("isic%d: Error, unit %d >= ISIC_MAXUNIT for %s\n", unit, unit, name);
                return ENXIO;
        }
 
@@ -196,7 +196,7 @@ isic_pnp_attach(device_t dev)
                                                &sc->sc_resources.io_rid[0],
                                                0UL, ~0UL, 1, RF_ACTIVE ) ))
        {
-               printf("isic_pnp_attach: Couldn't get my io_base.\n");
+               kprintf("isic_pnp_attach: Couldn't get my io_base.\n");
                return ENXIO;                                       
        }
        
@@ -211,7 +211,7 @@ isic_pnp_attach(device_t dev)
                                           &sc->sc_resources.irq_rid,
                                           0UL, ~0UL, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get irq.\n",unit);
+               kprintf("isic%d: Could not get irq.\n",unit);
                isic_detach_common(dev);
                return ENXIO;                                       
        }
@@ -296,7 +296,7 @@ isic_pnp_attach(device_t dev)
                        break;
 #endif
                default:
-                       printf("isic%d: Error, no driver for %s\n", unit, name);
+                       kprintf("isic%d: Error, no driver for %s\n", unit, name);
                        ret = ENXIO;
                        break;          
        }
index d490ec6..24fa7b9 100644 (file)
@@ -29,7 +29,7 @@
  *      last edit-date: [Wed Jan 24 09:27:06 2001]
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_itk_ix1.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_itk_ix1.c,v 1.5 2005/10/12 17:35:55 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_itk_ix1.c,v 1.6 2006/12/22 23:44:56 swildner Exp $
  *
  *---------------------------------------------------------------------------
  *
@@ -191,13 +191,13 @@ isic_probe_itkix1(device_t dev)
        int ret;
 
        #if defined(ITK_PROBE_DEBUG)
-       printf("Checking unit %u\n", unit);
+       kprintf("Checking unit %u\n", unit);
        #endif
 
        /* check max unit range */
        if(unit >= ISIC_MAXUNIT)
        {
-               printf("isic%d: Error, unit %d >= ISIC_MAXUNIT for ITK IX1!\n",
+               kprintf("isic%d: Error, unit %d >= ISIC_MAXUNIT for ITK IX1!\n",
                                unit, unit);
                return ENXIO;   
        }
@@ -206,7 +206,7 @@ isic_probe_itkix1(device_t dev)
        sc->sc_unit = unit;                     /* set unit */
        
        #if defined(ITK_PROBE_DEBUG)
-       printf("Allocating io base...");
+       kprintf("Allocating io base...");
        #endif
        
        if(!(sc->sc_resources.io_base[0] =
@@ -214,12 +214,12 @@ isic_probe_itkix1(device_t dev)
                                &sc->sc_resources.io_rid[0],
                                0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not allocate i/o port for ITK IX1.\n", unit);
+               kprintf("isic%d: Could not allocate i/o port for ITK IX1.\n", unit);
                return ENXIO;
        }
 
        #if defined(ITK_PROBE_DEBUG)
-       printf("done.\n");
+       kprintf("done.\n");
        #endif
 
        sc->sc_port = rman_get_start(sc->sc_resources.io_base[0]);
@@ -227,7 +227,7 @@ isic_probe_itkix1(device_t dev)
        h = rman_get_bushandle(sc->sc_resources.io_base[0]);
 
        #if defined(ITK_PROBE_DEBUG)
-       printf("Allocating irq...");
+       kprintf("Allocating irq...");
        #endif
 
        /* get our irq */
@@ -236,7 +236,7 @@ isic_probe_itkix1(device_t dev)
                                                &sc->sc_resources.irq_rid,
                                                0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not allocate irq for ITK IX1.\n", unit);
+               kprintf("isic%d: Could not allocate irq for ITK IX1.\n", unit);
                bus_release_resource(dev,SYS_RES_IOPORT,
                                sc->sc_resources.io_rid[0],
                                sc->sc_resources.io_base[0]);
@@ -244,14 +244,14 @@ isic_probe_itkix1(device_t dev)
        }
 
        #if defined(ITK_PROBE_DEBUG)
-       printf("done.\n");
+       kprintf("done.\n");
        #endif
 
        /* get the irq number */
        sc->sc_irq = rman_get_start(sc->sc_resources.irq);
 
        #if defined(ITK_PROBE_DEBUG)
-       printf("Setting up access routines...");
+       kprintf("Setting up access routines...");
        #endif
        
        /* setup access routines */
@@ -271,13 +271,13 @@ isic_probe_itkix1(device_t dev)
        sc->sc_bfifolen = HSCX_FIFO_LEN;
 
        #if defined(ITK_PROBE_DEBUG)
-       printf("done.\n");
+       kprintf("done.\n");
        #endif
 
        /* register interupt routine */
 
        #if defined(ITK_PROBE_DEBUG)
-       printf("Setting up access interupt...");
+       kprintf("Setting up access interupt...");
        #endif
 
        bus_setup_intr(dev, sc->sc_resources.irq,
@@ -285,9 +285,9 @@ isic_probe_itkix1(device_t dev)
                       sc, &ih, NULL);
 
        #if defined(ITK_PROBE_DEBUG)
-       printf("done.\n");
+       kprintf("done.\n");
 
-       printf("Doing probe stuff...");
+       kprintf("Doing probe stuff...");
        #endif
        
        /* save old value of this port, we're stomping over it */
@@ -317,9 +317,9 @@ isic_probe_itkix1(device_t dev)
                bus_space_write_1(t, h, ITK_ALE, saveale);
 
        #if defined(ITK_PROBE_DEBUG)
-       printf("done.\n");
+       kprintf("done.\n");
 
-       printf("Doing second probe stuff...");
+       kprintf("Doing second probe stuff...");
        #endif
 
        hv1 = HSCX_READ(0, H_VSTR) & 0xf;
@@ -327,22 +327,22 @@ isic_probe_itkix1(device_t dev)
        /* Read HSCX A/B VSTR.  Expected value is 0x05 (V2.1) or 0x04 (V2.0). */
        if((hv1 != 0x05 && hv1 != 0x04) || (hv2 != 0x05 && hv2 != 0x04))
        {
-               printf("isic%d: HSCX VSTR test failed for ITK ix1 micro\n",
+               kprintf("isic%d: HSCX VSTR test failed for ITK ix1 micro\n",
                        unit);
-               printf("isic%d: HSC0: VSTR: %#x\n",
+               kprintf("isic%d: HSC0: VSTR: %#x\n",
                        unit, HSCX_READ(0, H_VSTR));
-               printf("isic%d: HSC1: VSTR: %#x\n",
+               kprintf("isic%d: HSC1: VSTR: %#x\n",
                        unit, HSCX_READ(1, H_VSTR));
                isic_detach_common(dev);
                return ENXIO;
        }  
 
        #if defined(ITK_PROBE_DEBUG)
-       printf("done.\n");
+       kprintf("done.\n");
        #endif
 
 #if defined(ITK_PROBE_DEBUG)
-       printf("\nITK ix1 micro probe: hscx = 0x%02x, v1 = 0x%02x, v2 = 0x%02x, would have %s\n",
+       kprintf("\nITK ix1 micro probe: hscx = 0x%02x, v1 = 0x%02x, v2 = 0x%02x, would have %s\n",
                hd, hv1, hv2, ret ? "succeeded" : "failed");
        isic_detach_common(dev);
        return ENXIO;
index 76acf59..b04c9b8 100644 (file)
@@ -45,7 +45,7 @@
  *     ====================================================
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_sws.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_sws.c,v 1.3 2003/08/07 21:17:26 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_sws.c,v 1.4 2006/12/22 23:44:56 swildner Exp $
  *
  *     last edit-date: [Wed Jan 24 08:58:57 2001]
  *
@@ -193,11 +193,11 @@ isic_attach_sws(device_t dev)
        if( ((HSCX_READ(0, H_VSTR) & 0xf) != 0x5) ||
             ((HSCX_READ(1, H_VSTR) & 0xf) != 0x5) )
        {
-               printf("isic%d: HSCX VSTR test failed for SWS PnP\n",
+               kprintf("isic%d: HSCX VSTR test failed for SWS PnP\n",
                        sc->sc_unit);
-               printf("isic%d: HSC0: VSTR: %#x\n",
+               kprintf("isic%d: HSC0: VSTR: %#x\n",
                        sc->sc_unit, HSCX_READ(0, H_VSTR));
-               printf("isic%d: HSC1: VSTR: %#x\n",
+               kprintf("isic%d: HSC1: VSTR: %#x\n",
                        sc->sc_unit, HSCX_READ(1, H_VSTR));
                return (ENXIO);
        }                   
index 62dbafb..cd8963a 100644 (file)
@@ -38,7 +38,7 @@
  *     =================================================================
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s016.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s016.c,v 1.6 2005/10/12 17:35:55 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s016.c,v 1.7 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:27:24 2001]
  *
@@ -140,7 +140,7 @@ isic_probe_s016(device_t dev)
 
        if(unit >= ISIC_MAXUNIT)
        {
-               printf("isic%d: Error, unit %d >= ISIC_MAXUNIT for Teles S0/16!\n",
+               kprintf("isic%d: Error, unit %d >= ISIC_MAXUNIT for Teles S0/16!\n",
                                unit, unit);
                return(ENXIO);  
        }
@@ -155,7 +155,7 @@ isic_probe_s016(device_t dev)
                                           &sc->sc_resources.io_rid[0],
                                           0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not allocate i/o port for Teles S0/16.\n", unit);
+               kprintf("isic%d: Could not allocate i/o port for Teles S0/16.\n", unit);
                return(ENXIO);
        }
 
@@ -173,7 +173,7 @@ isic_probe_s016(device_t dev)
                        break;
 
                default:
-                       printf("isic%d: Error, invalid iobase 0x%x specified for Teles S0/16!\n",
+                       kprintf("isic%d: Error, invalid iobase 0x%x specified for Teles S0/16!\n",
                                unit, sc->sc_port);
                        isic_detach_common(dev);
                        return(ENXIO);
@@ -188,7 +188,7 @@ isic_probe_s016(device_t dev)
                                        0ul, ~0ul, TELES_S016_MEMSIZE,
                                        RF_ACTIVE)))
        {
-               printf("isic%d: Could not allocate memory for Teles S0/16.\n", unit);
+               kprintf("isic%d: Could not allocate memory for Teles S0/16.\n", unit);
                isic_detach_common(dev);
                return(ENXIO);
        }
@@ -222,7 +222,7 @@ isic_probe_s016(device_t dev)
                        break;
 
                default:
-                       printf("isic%d: Error, invalid memory address 0x%llx for Teles S0/16!\n",
+                       kprintf("isic%d: Error, invalid memory address 0x%llx for Teles S0/16!\n",
                                unit, kvtop(sc->sc_vmem_addr));
                        isic_detach_common(dev);
                        return(ENXIO);
@@ -269,7 +269,7 @@ isic_probe_s016(device_t dev)
        /* check signature bytes */
        if(b0 != 0x51)
        {
-               printf("isic%d: Error, signature 1 0x%x != 0x51 for Teles S0/16!\n",
+               kprintf("isic%d: Error, signature 1 0x%x != 0x51 for Teles S0/16!\n",
                        unit, b0);
                isic_detach_common(dev);
                return(ENXIO);
@@ -277,7 +277,7 @@ isic_probe_s016(device_t dev)
        
        if(b1 != 0x93)
        {
-               printf("isic%d: Error, signature 2 0x%x != 0x93 for Teles S0/16!\n",
+               kprintf("isic%d: Error, signature 2 0x%x != 0x93 for Teles S0/16!\n",
                        unit, b1);
                isic_detach_common(dev);
                return(ENXIO);
@@ -285,7 +285,7 @@ isic_probe_s016(device_t dev)
        
        if((b2 != 0x1e) && (b2 != 0x1f))
        {
-               printf("isic%d: Error, signature 3 0x%x != 0x1e or 0x1f for Teles S0/16!\n",
+               kprintf("isic%d: Error, signature 3 0x%x != 0x1e or 0x1f for Teles S0/16!\n",
                        unit, b2);
                isic_detach_common(dev);
                return(ENXIO);
@@ -298,7 +298,7 @@ isic_probe_s016(device_t dev)
                                                &sc->sc_resources.irq_rid,
                                                0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not allocate irq for Teles S0/16.\n", unit);
+               kprintf("isic%d: Could not allocate irq for Teles S0/16.\n", unit);
                isic_detach_common(dev);
                return ENXIO;
        }
@@ -317,7 +317,7 @@ isic_probe_s016(device_t dev)
 
        if((intr_no[sc->sc_irq]) == 1)
        {
-               printf("isic%d: Error, invalid IRQ [%d] specified for Teles S0/16!\n",
+               kprintf("isic%d: Error, invalid IRQ [%d] specified for Teles S0/16!\n",
                        unit, sc->sc_irq);
                isic_detach_common(dev);
                return(ENXIO);
index 568a17a..78e560c 100644 (file)
@@ -38,7 +38,7 @@
  *     ========================================================
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s0163.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s0163.c,v 1.5 2005/10/12 17:35:55 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s0163.c,v 1.6 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:27:40 2001]
  *
@@ -128,7 +128,7 @@ isic_probe_s0163(device_t dev)
 
        if(unit >= ISIC_MAXUNIT)
        {
-               printf("isic%d: Error, unit %d >= ISIC_MAXUNIT for Teles 16.3!\n",
+               kprintf("isic%d: Error, unit %d >= ISIC_MAXUNIT for Teles 16.3!\n",
                                unit, unit);
                return(ENXIO);  
        }
@@ -143,7 +143,7 @@ isic_probe_s0163(device_t dev)
                                           &sc->sc_resources.io_rid[0],
                                           0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get iobase for Teles S0/16.3.\n",
+               kprintf("isic%d: Could not get iobase for Teles S0/16.3.\n",
                                unit);
                return(ENXIO);
        }
@@ -165,16 +165,16 @@ isic_probe_s0163(device_t dev)
                case 0x180:
                case 0x280:
                case 0x380:
-                       printf("isic%d: Error, instead of using iobase 0x%x for your Teles S0/16.3,\n",
+                       kprintf("isic%d: Error, instead of using iobase 0x%x for your Teles S0/16.3,\n",
                                unit, sc->sc_port);
-                       printf("isic%d:        please use 0x%x in the kernel configuration file!\n",
+                       kprintf("isic%d:        please use 0x%x in the kernel configuration file!\n",
                                unit, sc->sc_port+0xc00);                       
                        isic_detach_common(dev);
                        return(ENXIO);
                        break;
        
                default:
-                       printf("isic%d: Error, invalid iobase 0x%x specified for Teles S0/16.3!\n",
+                       kprintf("isic%d: Error, invalid iobase 0x%x specified for Teles S0/16.3!\n",
                                unit, sc->sc_port);
                        isic_detach_common(dev);
                        return(ENXIO);
@@ -191,7 +191,7 @@ isic_probe_s0163(device_t dev)
                                   0ul, ~0ul, 1, RF_ACTIVE);
        if(!sc->sc_resources.io_base[0])
        {
-               printf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
+               kprintf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
                        unit, sc->sc_port);
                isic_detach_common(dev);
                return ENXIO;
@@ -205,7 +205,7 @@ isic_probe_s0163(device_t dev)
                                   0ul, ~0ul, 1, RF_ACTIVE);
        if(!sc->sc_resources.io_base[1])
        {
-               printf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
+               kprintf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
                        unit, sc->sc_port-ISAC_OFFS);
                isic_detach_common(dev);
                return ENXIO;
@@ -220,7 +220,7 @@ isic_probe_s0163(device_t dev)
                                   0ul, ~0ul, 1, RF_ACTIVE);
        if(!sc->sc_resources.io_base[2])
        {
-               printf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
+               kprintf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
                        unit, sc->sc_port-HSCXA_OFFS);
                isic_detach_common(dev);
                return ENXIO;
@@ -235,7 +235,7 @@ isic_probe_s0163(device_t dev)
                                   0ul, ~0ul, 1, RF_ACTIVE);
        if(!sc->sc_resources.io_base[3])
        {
-               printf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
+               kprintf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
                        unit, sc->sc_port-HSCXB_OFFS);
                isic_detach_common(dev);
                return ENXIO;
@@ -269,20 +269,20 @@ isic_probe_s0163(device_t dev)
        b2 = bus_space_read_1(t, h, 2);
        
        if ( b0 != 0x51 && b0 != 0x10 ) {
-               printf("isic%d: Error, signature 1 0x%x != 0x51 or 0x10 for Teles S0/16.3!\n",
+               kprintf("isic%d: Error, signature 1 0x%x != 0x51 or 0x10 for Teles S0/16.3!\n",
                        unit, b0);
                isic_detach_common(dev);
                return ENXIO;
        }
        
        if ( b1 != 0x93 ) {
-               printf("isic%d: Error, signature 2 0x%x != 0x93 for Teles S0/16.3!\n",
+               kprintf("isic%d: Error, signature 2 0x%x != 0x93 for Teles S0/16.3!\n",
                        unit, b1);
                isic_detach_common(dev);
                return ENXIO;
        }
        if (( b2 != 0x1c ) && ( b2 != 0x1f )) {
-               printf("isic%d: Error, signature 3 0x%x != (0x1c || 0x1f) for Teles S0/16.3!\n",
+               kprintf("isic%d: Error, signature 3 0x%x != (0x1c || 0x1f) for Teles S0/16.3!\n",
                        unit, b2);
                isic_detach_common(dev);
                return ENXIO;   
@@ -298,11 +298,11 @@ isic_probe_s0163(device_t dev)
             (((HSCX_READ(1, H_VSTR) & 0xf) != 0x5) &&
             ((HSCX_READ(1, H_VSTR) & 0xf) != 0x4)) )  
        {
-               printf("isic%d: HSCX VSTR test failed for Teles S0/16.3\n",
+               kprintf("isic%d: HSCX VSTR test failed for Teles S0/16.3\n",
                        unit);
-               printf("isic%d: HSC0: VSTR: %#x\n",
+               kprintf("isic%d: HSC0: VSTR: %#x\n",
                        unit, HSCX_READ(0, H_VSTR));
-               printf("isic%d: HSC1: VSTR: %#x\n",
+               kprintf("isic%d: HSC1: VSTR: %#x\n",
                        unit, HSCX_READ(1, H_VSTR));
                isic_detach_common(dev);
                return (ENXIO);
@@ -315,7 +315,7 @@ isic_probe_s0163(device_t dev)
                &sc->sc_resources.irq_rid,
                0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get IRQ for Teles S0/16.3.\n",unit);
+               kprintf("isic%d: Could not get IRQ for Teles S0/16.3.\n",unit);
                isic_detach_common(dev);
                return ENXIO;
        }
@@ -334,7 +334,7 @@ isic_probe_s0163(device_t dev)
                        break;
 
                default:
-                       printf("isic%d: Error, invalid IRQ [%d] specified for Teles S0/16.3!\n",
+                       kprintf("isic%d: Error, invalid IRQ [%d] specified for Teles S0/16.3!\n",
                                unit, sc->sc_irq);
                        isic_detach_common(dev);
                        return(ENXIO);
index 90a6c7b..f97b0fb 100644 (file)
@@ -38,7 +38,7 @@
  *     ================================================================
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s08.c,v 1.5.2.1 2001/08/10 14:08:39 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s08.c,v 1.6 2005/10/12 17:35:55 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s08.c,v 1.7 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:27:58 2001]
  *
@@ -136,7 +136,7 @@ isic_probe_s08(device_t dev)
 
        if(unit >= ISIC_MAXUNIT)
        {
-               printf("isic%d: Error, unit %d >= ISIC_MAXUNIT for Teles S0/8!\n",
+               kprintf("isic%d: Error, unit %d >= ISIC_MAXUNIT for Teles S0/8!\n",
                                unit, unit);
                return(ENXIO);  
        }
@@ -156,7 +156,7 @@ isic_probe_s08(device_t dev)
                bus_release_resource(dev,SYS_RES_IOPORT,
                                     sc->sc_resources.io_rid[0],
                                     sc->sc_resources.io_base[0]);
-               printf("isic%d: Error, iobase specified for Teles S0/8!\n", unit);
+               kprintf("isic%d: Error, iobase specified for Teles S0/8!\n", unit);
                return(ENXIO);
        }
 
@@ -167,7 +167,7 @@ isic_probe_s08(device_t dev)
                                &sc->sc_resources.mem_rid,
                                0ul, ~0ul, TELES_S08_MEMSIZE, RF_ACTIVE)))
        {
-               printf("isic%d: Could not allocate memory for Teles S0/8!\n", unit);
+               kprintf("isic%d: Could not allocate memory for Teles S0/8!\n", unit);
                return(ENXIO);
        }
 
@@ -183,7 +183,7 @@ isic_probe_s08(device_t dev)
        if((kvtop(sc->sc_vmem_addr) < 0xa0000) ||
           (kvtop(sc->sc_vmem_addr) > 0xdf000))
        {
-               printf("isic%d: Error, mem addr 0x%llx outside 0xA0000-0xDF000 for Teles S0/8!\n",
+               kprintf("isic%d: Error, mem addr 0x%llx outside 0xA0000-0xDF000 for Teles S0/8!\n",
                                unit, kvtop(sc->sc_vmem_addr));
                bus_release_resource(dev,SYS_RES_MEMORY,
                                     sc->sc_resources.mem_rid,
@@ -225,7 +225,7 @@ isic_probe_s08(device_t dev)
                                                &sc->sc_resources.irq_rid,
                                                0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not allocate irq for Teles S0/8!\n",unit);
+               kprintf("isic%d: Could not allocate irq for Teles S0/8!\n",unit);
 
                bus_release_resource(dev,SYS_RES_MEMORY,
                                     sc->sc_resources.mem_rid,
@@ -253,7 +253,7 @@ isic_probe_s08(device_t dev)
                        break;
                        
                default:
-                       printf("isic%d: Error, invalid IRQ [%d] specified for Teles S0/8!\n",
+                       kprintf("isic%d: Error, invalid IRQ [%d] specified for Teles S0/8!\n",
                                unit, sc->sc_irq);
                        bus_release_resource(dev,SYS_RES_IRQ,
                                             sc->sc_resources.irq_rid,
index 82591a5..b136530 100644 (file)
@@ -28,7 +28,7 @@
  *     -------------------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_usr_sti.c,v 1.5.2.1 2001/08/10 14:08:39 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_usr_sti.c,v 1.7 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_usr_sti.c,v 1.8 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Wed Jan 24 09:28:12 2001]
  *
@@ -73,7 +73,7 @@ static u_char intr_no[] = { 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 3, 4, 5, 0, 6, 7 };
 #ifdef USRTA_DEBUG_PORTACCESS
 int debugcntr;
 #define USRTA_DEBUG(fmt) \
-               if (++debugcntr < 1000) printf fmt;
+               if (++debugcntr < 1000) kprintf fmt;
 #else
 #define USRTA_DEBUG(fmt)
 #endif
@@ -100,7 +100,7 @@ USRTA_DEBUG(("usrtai_read_fifo: what %d size %d\n", what, size))
                        base = (unsigned int)HSCX_B_BASE;
                        break;
                default:
-                       printf("usrtai_read_fifo: invalid what %d\n", what);
+                       kprintf("usrtai_read_fifo: invalid what %d\n", what);
                        return;
        }
 
@@ -132,7 +132,7 @@ USRTA_DEBUG(("usrtai_write_fifo: what %d size %d\n", what, size))
                        base = (unsigned int)HSCX_B_BASE;
                        break;
                default:
-                       printf("usrtai_write_fifo: invalid what %d\n", what);
+                       kprintf("usrtai_write_fifo: invalid what %d\n", what);
                        return;
        }
 
@@ -164,7 +164,7 @@ USRTA_DEBUG(("usrtai_write_reg: what %d ADDR(%d) %d data %#x\n", what, offs, ADD
                        base = (unsigned int)HSCX_B_BASE;
                        break;
                default:
-                       printf("usrtai_write_reg invalid what %d\n", what);
+                       kprintf("usrtai_write_reg invalid what %d\n", what);
                        return;
        }
 
@@ -193,7 +193,7 @@ USRTA_DEBUG(("usrtai_read_reg: what %d ADDR(%d) %d..", what, offs, ADDR(offs)))
                        base = (unsigned int)HSCX_B_BASE;
                        break;
                default:
-                       printf("usrtai_read_reg: invalid what %d\n", what);
+                       kprintf("usrtai_read_reg: invalid what %d\n", what);
                        return(0);
        }
 
@@ -228,7 +228,7 @@ usrtai_alloc_port(device_t dev)
                                   &sc->sc_resources.io_rid[num],
                                   0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Error, failed to reserve io #%dport %#x!\n", unit, num, base);
+               kprintf("isic%d: Error, failed to reserve io #%dport %#x!\n", unit, num, base);
                isic_detach_common(dev);
                return(ENXIO);
        }
@@ -248,7 +248,7 @@ usrtai_alloc_port(device_t dev)
                                           &sc->sc_resources.io_rid[num],
                                           0ul, ~0ul, 1, RF_ACTIVE)))
                {
-                       printf("isic%d: Error, failed to reserve io #%d port %#x!\n", unit, num, base+i*1024);
+                       kprintf("isic%d: Error, failed to reserve io #%d port %#x!\n", unit, num, base+i*1024);
                        isic_detach_common(dev);
                        return(ENXIO);
                }
@@ -269,7 +269,7 @@ usrtai_alloc_port(device_t dev)
                                           &sc->sc_resources.io_rid[num],
                                           0ul, ~0ul, 1, RF_ACTIVE)))
                {
-                       printf("isic%d: Error, failed to reserve io #%d port %#x!\n", unit, num, base+i*1024);
+                       kprintf("isic%d: Error, failed to reserve io #%d port %#x!\n", unit, num, base+i*1024);
                        isic_detach_common(dev);
                        return(ENXIO);
                }
@@ -290,7 +290,7 @@ usrtai_alloc_port(device_t dev)
                                           &sc->sc_resources.io_rid[num],
                                           0ul, ~0ul, 1, RF_ACTIVE)))
                {
-                       printf("isic%d: Error, failed to reserve io #%d port %#x!\n", unit, num, base+i*1024);
+                       kprintf("isic%d: Error, failed to reserve io #%d port %#x!\n", unit, num, base+i*1024);
                        isic_detach_common(dev);
                        return(ENXIO);
                }
@@ -314,7 +314,7 @@ isic_probe_usrtai(device_t dev)
 
        if(unit >= ISIC_MAXUNIT)
        {
-               printf("isic%d: Error, unit %d >= ISIC_MAXUNIT for USR Sportster TA!\n",
+               kprintf("isic%d: Error, unit %d >= ISIC_MAXUNIT for USR Sportster TA!\n",
                                unit, unit);
                return(ENXIO);  
        }
@@ -329,7 +329,7 @@ isic_probe_usrtai(device_t dev)
                                           &sc->sc_resources.io_rid[0],
                                           0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get iobase for USR Sportster TA!\n",
+               kprintf("isic%d: Could not get iobase for USR Sportster TA!\n",
                                unit);
                return(ENXIO);
        }
@@ -367,7 +367,7 @@ isic_probe_usrtai(device_t dev)
                        break;
                        
                default:
-                       printf("isic%d: Error, invalid iobase 0x%x specified for USR Sportster TA!\n",
+                       kprintf("isic%d: Error, invalid iobase 0x%x specified for USR Sportster TA!\n",
                                unit, sc->sc_port);
                        return(0);
                        break;
@@ -377,7 +377,7 @@ isic_probe_usrtai(device_t dev)
 
        if(usrtai_alloc_port(dev))
        {
-               printf("isic%d: Could not get the ports for USR Sportster TA!\n", unit);
+               kprintf("isic%d: Could not get the ports for USR Sportster TA!\n", unit);
                isic_detach_common(dev);
                return(ENXIO);
        }
@@ -389,7 +389,7 @@ isic_probe_usrtai(device_t dev)
                                   &sc->sc_resources.irq_rid,
                                   0ul, ~0ul, 1, RF_ACTIVE)))
        {
-               printf("isic%d: Could not get an irq for USR Sportster TA!\n",unit);
+               kprintf("isic%d: Could not get an irq for USR Sportster TA!\n",unit);
                isic_detach_common(dev);
                return ENXIO;
        }
@@ -405,7 +405,7 @@ isic_probe_usrtai(device_t dev)
 
        if(intr_no[sc->sc_irq] == 0)
        {
-               printf("isic%d: Error, invalid IRQ [%d] specified for USR Sportster TA!\n",
+               kprintf("isic%d: Error, invalid IRQ [%d] specified for USR Sportster TA!\n",
                        unit, sc->sc_irq);
                return(1);
        }
@@ -444,11 +444,11 @@ isic_probe_usrtai(device_t dev)
        if( ((HSCX_READ(0, H_VSTR) & 0xf) != 0x5) ||
             ((HSCX_READ(1, H_VSTR) & 0xf) != 0x5) )
        {
-               printf("isic%d: HSCX VSTR test failed for USR Sportster TA\n",
+               kprintf("isic%d: HSCX VSTR test failed for USR Sportster TA\n",
                        unit);
-               printf("isic%d: HSC0: VSTR: %#x\n",
+               kprintf("isic%d: HSC0: VSTR: %#x\n",
                        unit, HSCX_READ(0, H_VSTR));
-               printf("isic%d: HSC1: VSTR: %#x\n",
+               kprintf("isic%d: HSC1: VSTR: %#x\n",
                        unit, HSCX_READ(1, H_VSTR));
                return (1);
        }                   
@@ -480,7 +480,7 @@ isic_attach_usrtai(device_t dev)
 
        if((irq = intr_no[sc->sc_irq]) == 0)
        {
-               printf("isic%d: Attach error, invalid IRQ [%d] specified for USR Sportster TA!\n",
+               kprintf("isic%d: Attach error, invalid IRQ [%d] specified for USR Sportster TA!\n",
                        unit, sc->sc_irq);
                return(1);
        }
index b988bd3..23e659a 100644 (file)
@@ -34,7 +34,7 @@
  *     ----------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.1.2.1 2001/08/10 14:08:39 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.16 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.17 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Thu Jan 11 11:29:38 2001]
  *
@@ -1537,14 +1537,14 @@ itjc_attach(device_t dev)
        /* Probably not really required. */
        if (unit > ITJC_MAXUNIT)
        {
-               printf("itjc%d: Error, unit > ITJC_MAXUNIT!\n", unit);
+               kprintf("itjc%d: Error, unit > ITJC_MAXUNIT!\n", unit);
                crit_exit();
                return ENXIO;
        }
 
        if (!(vid == PCI_TJNET_VID && did == PCI_TJ300_DID))
        {
-               printf("itjc%d: unknown device (%04X,%04X)!\n", unit, vid, did);
+               kprintf("itjc%d: unknown device (%04X,%04X)!\n", unit, vid, did);
                goto fail;
        }
 
@@ -1556,7 +1556,7 @@ itjc_attach(device_t dev)
 
        if (sc->sc_resources.io_base[0] == NULL)
        {
-               printf("itjc%d: couldn't map IO port\n", unit);
+               kprintf("itjc%d: couldn't map IO port\n", unit);
                error = ENXIO;
                goto fail;
        }
@@ -1573,7 +1573,7 @@ itjc_attach(device_t dev)
 
        if (sc->sc_resources.irq == NULL)
        {
-               printf("itjc%d: couldn't map interrupt\n", unit);
+               kprintf("itjc%d: couldn't map interrupt\n", unit);
                error = ENXIO;
                goto fail;
        }
@@ -1585,7 +1585,7 @@ itjc_attach(device_t dev)
 
        if (error)
        {
-               printf("itjc%d: couldn't set up irq handler\n", unit);
+               kprintf("itjc%d: couldn't set up irq handler\n", unit);
                error = ENXIO;
                goto fail;
        }
@@ -1624,7 +1624,7 @@ itjc_attach(device_t dev)
 
        if (error)
        {
-               printf("itjc%d: couldn't create bus DMA tag.\n", unit);
+               kprintf("itjc%d: couldn't create bus DMA tag.\n", unit);
                goto fail;
        }
 
@@ -1698,7 +1698,7 @@ itjc_attach(device_t dev)
        sc->sc_ipac = 0;
        sc->sc_bfifolen = 2 * ITJC_RING_SLOT_WORDS;
 
-       printf("itjc%d: ISAC 2186 Version 1.1 (IOM-2)\n", unit);
+       kprintf("itjc%d: ISAC 2186 Version 1.1 (IOM-2)\n", unit);
 
        /* init the ISAC */
        itjc_isac_init(sc);
index 7db00ba..86f453a 100644 (file)
@@ -28,7 +28,7 @@
  *      ----------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_fsm.c,v 1.4.2.1 2001/08/10 14:08:40 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_fsm.c,v 1.3 2003/08/07 21:17:28 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_fsm.c,v 1.4 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Sun Jan 21 11:09:24 2001]
  *
@@ -193,7 +193,7 @@ iwic_next_state(struct iwic_softc *sc, int event)
 
        if (event >= N_EVENTS)
        {
-               printf("iwic_next_state: event >= N_EVENTS\n");
+               kprintf("iwic_next_state: event >= N_EVENTS\n");
                return;
        }
 
@@ -202,7 +202,7 @@ iwic_next_state(struct iwic_softc *sc, int event)
        newstate = iwic_state_tab[event][currstate].newstate;
        if (newstate >= N_STATES)
        {
-               printf("iwic_next_state: newstate >= N_STATES\n");
+               kprintf("iwic_next_state: newstate >= N_STATES\n");
                return;
        }
 
index df717a0..9c07767 100644 (file)
@@ -28,7 +28,7 @@
  *      ----------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.6.2.1 2001/08/10 14:08:40 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.6 2006/10/25 20:56:03 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.7 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Tue Jan 16 10:53:03 2001]
  *
@@ -163,8 +163,8 @@ iwic_pci_probe(device_t dev)
        {
                if(bootverbose)
                {
-                       printf("iwic_pci_probe: vendor = 0x%x, device = 0x%x\n", pci_get_vendor(dev), pci_get_device(dev));
-                       printf("iwic_pci_probe: subvendor = 0x%x, subdevice = 0x%x\n", sv, sd);
+                       kprintf("iwic_pci_probe: vendor = 0x%x, device = 0x%x\n", pci_get_vendor(dev), pci_get_device(dev));
+                       kprintf("iwic_pci_probe: subvendor = 0x%x, subdevice = 0x%x\n", sv, sd);
                }
                device_set_desc(dev, wip->desc);
                return(0);
@@ -191,7 +191,7 @@ iwic_pci_attach(device_t dev)
        
        if(unit >= IWIC_MAXUNIT)
        {
-               printf("iwic%d: Error, unit %d >= IWIC_MAXUNIT!\n", unit, unit);
+               kprintf("iwic%d: Error, unit %d >= IWIC_MAXUNIT!\n", unit, unit);
                return(ENXIO);  
        }       
 
@@ -208,7 +208,7 @@ iwic_pci_attach(device_t dev)
                                                &sc->sc_resources.io_rid[0],
                                                0UL, ~0UL, 1, RF_ACTIVE)))
        {
-               printf("iwic%d: Couldn't alloc io port!\n", unit);
+               kprintf("iwic%d: Couldn't alloc io port!\n", unit);
                return(ENXIO);                                       
        }
 
@@ -219,7 +219,7 @@ iwic_pci_attach(device_t dev)
                                           &sc->sc_resources.irq_rid,
                                           0UL, ~0UL, 1, RF_SHAREABLE|RF_ACTIVE)))
        {
-               printf("iwic%d: Couldn't alloc irq!\n",unit);
+               kprintf("iwic%d: Couldn't alloc irq!\n",unit);
                return(ENXIO);                                       
        }
        
@@ -235,7 +235,7 @@ iwic_pci_attach(device_t dev)
                                (void(*)(void*))iwic_pci_intr,
                                sc, &ih, NULL))
        {
-               printf("iwic%d: Couldn't set up irq!\n", unit);
+               kprintf("iwic%d: Couldn't set up irq!\n", unit);
                return(ENXIO);
        }
 
@@ -265,7 +265,7 @@ iwic_pci_attach(device_t dev)
        if(bootverbose)
        {
                int ver = IWIC_READ(sc, D_RBCH);
-               printf("iwic%d: W6692 chip version = %d\n", unit, D_RBCH_VN(ver));
+               kprintf("iwic%d: W6692 chip version = %d\n", unit, D_RBCH_VN(ver));
        }
 
        i4b_l1_mph_status_ind(L0IWICUNIT(sc->sc_unit), STI_ATTACH, sc->sc_cardtyp, &iwic_l1mux_func);
index 28bdaf7..e160a01 100644 (file)
@@ -28,7 +28,7 @@
  *     ------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer2/i4b_mbuf.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer2/i4b_mbuf.c,v 1.7 2005/06/15 11:56:03 joerg Exp $
+ * $DragonFly: src/sys/net/i4b/layer2/i4b_mbuf.c,v 1.8 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Sat Jan 13 13:15:45 2001]
  *
@@ -73,7 +73,7 @@ i4b_Dgetmbuf(int len)
        {
 
 #ifdef I4B_MBUF_DEBUG
-               printf("i4b_getmbuf: error - len(%d) > MCLBYTES(%d)\n",
+               kprintf("i4b_getmbuf: error - len(%d) > MCLBYTES(%d)\n",
                                        len, MCLBYTES);
 #endif
                
@@ -88,7 +88,7 @@ i4b_Dgetmbuf(int len)
        {
 
 #ifdef I4B_MBUF_DEBUG
-               printf("i4b_getbuf: error - MGETHDR failed!\n");
+               kprintf("i4b_getbuf: error - MGETHDR failed!\n");
 #endif
 
                return(NULL);
@@ -103,7 +103,7 @@ i4b_Dgetmbuf(int len)
                        m_freem(m);
 
 #ifdef I4B_MBUF_DEBUG
-                       printf("i4b_getbuf: error - MCLGET failed, len(%d)\n", len);
+                       kprintf("i4b_getbuf: error - MCLGET failed, len(%d)\n", len);
 #endif
                        
                        return (NULL);
@@ -150,7 +150,7 @@ i4b_Bgetmbuf(int len)
        {
 
 #ifdef I4B_MBUF_DEBUG
-               printf("i4b_getmbuf: error - len(%d) > MCLBYTES(%d)\n",
+               kprintf("i4b_getmbuf: error - len(%d) > MCLBYTES(%d)\n",
                                        len, MCLBYTES);
 #endif
                
@@ -165,7 +165,7 @@ i4b_Bgetmbuf(int len)
        {
 
 #ifdef I4B_MBUF_DEBUG
-               printf("i4b_getbuf: error - MGETHDR failed!\n");
+               kprintf("i4b_getbuf: error - MGETHDR failed!\n");
 #endif
 
                return(NULL);
@@ -180,7 +180,7 @@ i4b_Bgetmbuf(int len)
                        m_freem(m);
 
 #ifdef I4B_MBUF_DEBUG
-                       printf("i4b_getbuf: error - MCLGET failed, len(%d)\n", len);
+                       kprintf("i4b_getbuf: error - MCLGET failed, len(%d)\n", len);
 #endif
                        
                        return (NULL);
index f854471..9e1ff3a 100644 (file)
@@ -30,7 +30,7 @@
  *     $Id: i4b_util.c,v 1.26 2000/08/24 11:48:58 hm Exp $ 
  *
  * $FreeBSD: src/sys/i4b/layer2/i4b_util.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer2/i4b_util.c,v 1.7 2005/06/14 21:19:19 joerg Exp $
+ * $DragonFly: src/sys/net/i4b/layer2/i4b_util.c,v 1.8 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Mon May 29 16:55:35 2000]
  *
@@ -220,8 +220,8 @@ i4b_print_frame(int len, u_char *buf)
                return;
 
        for(i = 0; i < len; i++)
-               printf(" 0x%x", buf[i]);
-       printf("\n");
+               kprintf(" 0x%x", buf[i]);
+       kprintf("\n");
 #endif
 }
 
index 1c969a7..bb96bff 100644 (file)
@@ -28,7 +28,7 @@
  *     --------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer4/i4b_i4bdrv.c,v 1.11.2.5 2001/12/16 15:12:59 hm Exp $
- * $DragonFly: src/sys/net/i4b/layer4/i4b_i4bdrv.c,v 1.18 2006/09/10 01:26:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer4/i4b_i4bdrv.c,v 1.19 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Sat Aug 11 18:08:10 2001]
  *
@@ -120,7 +120,7 @@ SYSINIT(i4bdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,i4b_drvinit,NULL)
 PDEVSTATIC void
 i4battach(void *dummy)
 {
-       printf("i4b: ISDN call control device attached\n");
+       kprintf("i4b: ISDN call control device attached\n");
 
        i4b_rdqueue.ifq_maxlen = IFQ_MAXLEN;
 
index 86a05f8..efbf053 100644 (file)
@@ -30,7 +30,7 @@
  *     $Id: i4b_l4mgmt.c,v 1.34 2000/09/01 14:11:51 hm Exp $ 
  *
  * $FreeBSD: src/sys/i4b/layer4/i4b_l4mgmt.c,v 1.6.2.2 2001/08/10 14:08:43 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer4/i4b_l4mgmt.c,v 1.9 2006/09/03 18:52:29 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer4/i4b_l4mgmt.c,v 1.10 2006/12/22 23:44:56 swildner Exp $
  *
  *      last edit-date: [Fri Oct 13 15:58:34 2000]
  *
@@ -350,39 +350,39 @@ i4b_print_cdp(call_desc_t *cdp)
 {
        if((cdp > &(call_desc[N_CALL_DESC])) || (cdp < &(call_desc[0])))
        {
-               printf("i4b_print_cd: cdp out of range!\n");
+               kprintf("i4b_print_cd: cdp out of range!\n");
                return;
        }
 
-       printf("i4b_print_cd: printing call descriptor %d at 0x%lx:\n", cdp - (&(call_desc[0])), (unsigned long)cdp);
+       kprintf("i4b_print_cd: printing call descriptor %d at 0x%lx:\n", cdp - (&(call_desc[0])), (unsigned long)cdp);
 
-       printf("         cdid = %d\n", cdp->cdid);
-       printf("   controller = %d (u=%d, dl=%d, b1=%d, b2=%d)\n",
+       kprintf("         cdid = %d\n", cdp->cdid);
+       kprintf("   controller = %d (u=%d, dl=%d, b1=%d, b2=%d)\n",
                        cdp->controller,
                        ctrl_desc[cdp->controller].unit,
                        ctrl_desc[cdp->controller].dl_est,
                        ctrl_desc[cdp->controller].bch_state[CHAN_B1],
                        ctrl_desc[cdp->controller].bch_state[CHAN_B2]); 
-       printf("           cr = 0x%02x\n", cdp->cr);
-       printf("       crflag = %d\n", cdp->crflag);
-       printf("    channelid = %d\n", cdp->channelid);
-       printf("        bprot = %d\n", cdp->bprot);
-       printf("       driver = %d\n", cdp->driver);
-       printf("  driver_unit = %d\n", cdp->driver_unit);
-       printf("   call_state = %d\n", cdp->call_state);
-       printf("    Q931state = %s\n", print_l3state(cdp));
-       printf("        event = %d\n", cdp->event);
-       printf("     response = %d\n", cdp->response);
-       printf("         T303 = %d\n", cdp->T303);
-       printf("T303_first_to = %d\n", cdp->T303_first_to);
-       printf("         T305 = %d\n", cdp->T305);
-       printf("         T308 = %d\n", cdp->T308);
-       printf("T308_first_to = %d\n", cdp->T308_first_to);
-       printf("         T309 = %d\n", cdp->T309);
-       printf("         T310 = %d\n", cdp->T310);
-       printf("         T313 = %d\n", cdp->T313);
-       printf("         T400 = %d\n", cdp->T400);
-       printf("          dir = %s\n", cdp->dir == DIR_OUTGOING ? "out" : "in");
+       kprintf("           cr = 0x%02x\n", cdp->cr);
+       kprintf("       crflag = %d\n", cdp->crflag);
+       kprintf("    channelid = %d\n", cdp->channelid);
+       kprintf("        bprot = %d\n", cdp->bprot);
+       kprintf("       driver = %d\n", cdp->driver);
+       kprintf("  driver_unit = %d\n", cdp->driver_unit);
+       kprintf("   call_state = %d\n", cdp->call_state);
+       kprintf("    Q931state = %s\n", print_l3state(cdp));
+       kprintf("        event = %d\n", cdp->event);
+       kprintf("     response = %d\n", cdp->response);
+       kprintf("         T303 = %d\n", cdp->T303);
+       kprintf("T303_first_to = %d\n", cdp->T303_first_to);
+       kprintf("         T305 = %d\n", cdp->T305);
+       kprintf("         T308 = %d\n", cdp->T308);
+       kprintf("T308_first_to = %d\n", cdp->T308_first_to);
+       kprintf("         T309 = %d\n", cdp->T309);
+       kprintf("         T310 = %d\n", cdp->T310);
+       kprintf("         T313 = %d\n", cdp->T313);
+       kprintf("         T400 = %d\n", cdp->T400);
+       kprintf("          dir = %s\n", cdp->dir == DIR_OUTGOING ? "out" : "in");
 }
 
 /*---------------------------------------------------------------------------*
@@ -393,7 +393,7 @@ i4b_print_cdx(int index)
 {
        if(index >= N_CALL_DESC)
        {
-               printf("i4b_print_cdx: index %d >= N_CALL_DESC %d\n", index, N_CALL_DESC);
+               kprintf("i4b_print_cdx: index %d >= N_CALL_DESC %d\n", index, N_CALL_DESC);
                return;
        }
        i4b_print_cdp(&(call_desc[index]));
index bd17da8..32a25ef 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)if.c        8.3 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/net/if.c,v 1.185 2004/03/13 02:35:03 brooks Exp $
- * $DragonFly: src/sys/net/if.c,v 1.48 2006/12/20 18:14:42 dillon Exp $
+ * $DragonFly: src/sys/net/if.c,v 1.49 2006/12/22 23:44:54 swildner Exp $
  */
 
 #include "opt_compat.h"
@@ -1866,7 +1866,7 @@ if_printf(struct ifnet *ifp, const char *fmt, ...)
        __va_list ap;
        int retval;
 
-       retval = printf("%s: ", ifp->if_xname);
+       retval = kprintf("%s: ", ifp->if_xname);
        __va_start(ap, fmt);
        retval += kvprintf(fmt, ap);
        __va_end(ap);
index cee11a4..1aa1443 100644 (file)
@@ -1,6 +1,6 @@
 /*     $NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $   */
 /*     $FreeBSD: src/sys/net/if_arcsubr.c,v 1.1.2.5 2003/02/05 18:42:15 fjoe Exp $ */
-/*     $DragonFly: src/sys/net/Attic/if_arcsubr.c,v 1.20 2006/01/14 11:05:17 swildner Exp $ */
+/*     $DragonFly: src/sys/net/Attic/if_arcsubr.c,v 1.21 2006/12/22 23:44:54 swildner Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -184,7 +184,7 @@ arc_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
                break;
 
        default:
-               printf("%s: can't handle af%d\n", ifp->if_xname,
+               kprintf("%s: can't handle af%d\n", ifp->if_xname,
                    dst->sa_family);
                gotoerr(EAFNOSUPPORT);
        }
index 5cf705a..a26a851 100644 (file)
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/net/if_atmsubr.c,v 1.10.2.1 2001/03/06 00:29:26 obrien Exp $
- * $DragonFly: src/sys/net/if_atmsubr.c,v 1.16 2006/01/14 11:05:17 swildner Exp $
+ * $DragonFly: src/sys/net/if_atmsubr.c,v 1.17 2006/12/22 23:44:54 swildner Exp $
  */
 
 /*
@@ -178,10 +178,10 @@ atm_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
                        
                default:
 #if defined(__NetBSD__) || defined(__OpenBSD__)
-                       printf("%s: can't handle af%d\n", ifp->if_xname, 
+                       kprintf("%s: can't handle af%d\n", ifp->if_xname, 
                            dst->sa_family);
 #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__bsdi__)
-                       printf("%s: can't handle af%d\n", ifp->if_xname, 
+                       kprintf("%s: can't handle af%d\n", ifp->if_xname, 
                            dst->sa_family);
 #endif
                        gotoerr(EAFNOSUPPORT);
@@ -250,7 +250,7 @@ atm_input(struct ifnet *ifp, struct atm_pseudohdr *ah, struct mbuf *m,
                isr = NETISR_NATM;
                m->m_pkthdr.rcvif = rxhand; /* XXX: overload */
 #else
-               printf("atm_input: NATM detected but not configured in kernel\n");
+               kprintf("atm_input: NATM detected but not configured in kernel\n");
                m_freem(m);
                return;
 #endif
@@ -266,10 +266,10 @@ atm_input(struct ifnet *ifp, struct atm_pseudohdr *ah, struct mbuf *m,
                        alc = mtod(m, struct atmllc *);
                        if (bcmp(alc, ATMLLC_HDR, 6)) {
 #if defined(__NetBSD__) || defined(__OpenBSD__)
-                               printf("%s: recv'd invalid LLC/SNAP frame [vp=%d,vc=%d]\n",
+                               kprintf("%s: recv'd invalid LLC/SNAP frame [vp=%d,vc=%d]\n",
                                       ifp->if_xname, ATM_PH_VPI(ah), ATM_PH_VCI(ah));
 #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__bsdi__)
-                               printf("%s: recv'd invalid LLC/SNAP frame [vp=%d,vc=%d]\n",
+                               kprintf("%s: recv'd invalid LLC/SNAP frame [vp=%d,vc=%d]\n",
                                       ifp->if_xname, ATM_PH_VPI(ah), ATM_PH_VCI(ah));
 #endif
                                m_freem(m);
index 51f329f..d08ae24 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)if_ethersubr.c      8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.70.2.33 2003/04/28 15:45:53 archie Exp $
- * $DragonFly: src/sys/net/if_ethersubr.c,v 1.38 2006/12/19 00:11:12 dillon Exp $
+ * $DragonFly: src/sys/net/if_ethersubr.c,v 1.39 2006/12/22 23:44:54 swildner Exp $
  */
 
 #include "opt_atalk.h"
@@ -290,7 +290,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
                break;
 
        default:
-               printf("%s: can't handle af%d\n", ifp->if_xname,
+               kprintf("%s: can't handle af%d\n", ifp->if_xname,
                        dst->sa_family);
                gotoerr(EAFNOSUPPORT);
        }
@@ -556,7 +556,7 @@ ether_input(struct ifnet *ifp, struct ether_header *eh, struct mbuf *m)
 
        /* XXX old crufty stuff, needs to be removed */
        if (eh != NULL) {
-               printf("ether_input got mbuf without embedded ethernet header");
+               kprintf("ether_input got mbuf without embedded ethernet header");
                m_free(m);
                return;
        }
index 837cd47..47e5e26 100644 (file)
@@ -34,7 +34,7 @@
  *
  *     from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
  * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.41.2.8 2002/02/20 23:34:09 fjoe Exp $
- * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.21 2006/01/14 11:05:17 swildner Exp $
+ * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.22 2006/12/22 23:44:54 swildner Exp $
  */
 
 #include "opt_atalk.h"
@@ -281,7 +281,7 @@ fddi_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
                goto queue_it;
        }
        default:
-               printf("%s: can't handle af%d\n", ifp->if_xname,
+               kprintf("%s: can't handle af%d\n", ifp->if_xname,
                        dst->sa_family);
                senderr(EAFNOSUPPORT);
        }
@@ -477,7 +477,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m)
                        break;
 #endif /* NETATALK */
                default:
-                       /* printf("fddi_input: unknown protocol 0x%x\n", type); */
+                       /* kprintf("fddi_input: unknown protocol 0x%x\n", type); */
                        ifp->if_noproto++;
                        goto dropanyway;
                }
@@ -486,7 +486,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m)
 #endif /* INET || NS */
 
        default:
-               /* printf("fddi_input: unknown dsap 0x%x\n", l->llc_dsap); */
+               /* kprintf("fddi_input: unknown dsap 0x%x\n", l->llc_dsap); */
                ifp->if_noproto++;
        dropanyway:
                m_freem(m);
index b0d0323..0bd8763 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.7.2.7 2002/06/18 00:15:31 kbyanc Exp $
- * $DragonFly: src/sys/net/Attic/if_iso88025subr.c,v 1.15 2005/11/30 13:35:24 sephe Exp $
+ * $DragonFly: src/sys/net/Attic/if_iso88025subr.c,v 1.16 2006/12/22 23:44:54 swildner Exp $
  *
  */
 
@@ -243,7 +243,7 @@ iso88025_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
                break;
 
        default:
-               printf("%s: can't handle af%d\n", ifp->if_xname,
+               kprintf("%s: can't handle af%d\n", ifp->if_xname,
                        dst->sa_family);
                senderr(EAFNOSUPPORT);
        }
@@ -289,7 +289,7 @@ iso88025_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
         * not yet active.
         */
        if (IF_QFULL(&ifp->if_snd)) {
-               printf("iso88025_output: packet dropped QFULL.\n");
+               kprintf("iso88025_output: packet dropped QFULL.\n");
                IF_DROP(&ifp->if_snd);
                crit_exit();
                senderr(ENOBUFS);
@@ -353,7 +353,7 @@ iso88025_input(struct ifnet *ifp, struct mbuf *m)
                u_char c = l->llc_dsap;
 
                if (th->iso88025_shost[0] & TR_RII) { /* XXX */
-                       printf("iso88025_input: dropping source routed LLC_TEST\n");
+                       kprintf("iso88025_input: dropping source routed LLC_TEST\n");
                        m_free(m);
                        return;
                }
@@ -376,7 +376,7 @@ iso88025_input(struct ifnet *ifp, struct mbuf *m)
                return;
        }
        default:
-               printf("iso88025_input: unexpected llc control 0x%02x\n", l->llc_control);
+               kprintf("iso88025_input: unexpected llc control 0x%02x\n", l->llc_control);
                m_freem(m);
                return;
        }
index 37cf434..c1bb3d6 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)if_loop.c   8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/if_loop.c,v 1.47.2.8 2003/06/01 01:46:11 silby Exp $
- * $DragonFly: src/sys/net/if_loop.c,v 1.19 2005/11/28 17:13:45 dillon Exp $
+ * $DragonFly: src/sys/net/if_loop.c,v 1.20 2006/12/22 23:44:54 swildner Exp $
  */
 
 /*
@@ -183,7 +183,7 @@ looutput(
        case AF_APPLETALK:
                break;
        default:
-               printf("looutput: af=%d unexpected\n", dst->sa_family);
+               kprintf("looutput: af=%d unexpected\n", dst->sa_family);
                m_freem(m);
                return (EAFNOSUPPORT);
        }
@@ -297,7 +297,7 @@ if_simloop(struct ifnet *ifp, struct mbuf *m, int af, int hlen)
                break;
 #endif
        default:
-               printf("if_simloop: can't handle af=%d\n", af);
+               kprintf("if_simloop: can't handle af=%d\n", af);
                m_freem(m);
                return (EAFNOSUPPORT);
        }
@@ -360,7 +360,7 @@ lo_altqstart(struct ifnet *ifp)
                        break;
 #endif
                default:
-                       printf("lo_altqstart: can't handle af%d\n", af);
+                       kprintf("lo_altqstart: can't handle af%d\n", af);
                        m_freem(m);
                        return;
                }
index 342f22a..a52a690 100644 (file)
@@ -1,6 +1,6 @@
 /*     $NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $     */
 /* $FreeBSD: src/sys/net/if_media.c,v 1.9.2.4 2001/07/04 00:12:38 brooks Exp $ */
-/* $DragonFly: src/sys/net/if_media.c,v 1.11 2006/09/05 03:48:12 dillon Exp $ */
+/* $DragonFly: src/sys/net/if_media.c,v 1.12 2006/12/22 23:44:54 swildner Exp $ */
 
 /*
  * Copyright (c) 1997
@@ -59,7 +59,7 @@
 /*
  * Compile-time options:
  * IFMEDIA_DEBUG:
- *     turn on implementation-level debug printfs.
+ *     turn on implementation-level debug kprintfs.
  *     Useful for debugging newly-ported  drivers.
  */
 
@@ -111,10 +111,10 @@ ifmedia_add(struct ifmedia *ifm, int mword, int data, void *aux)
 #ifdef IFMEDIA_DEBUG
        if (ifmedia_debug) {
                if (ifm == NULL) {
-                       printf("ifmedia_add: null ifm\n");
+                       kprintf("ifmedia_add: null ifm\n");
                        return;
                }
-               printf("Adding entry for ");
+               kprintf("Adding entry for ");
                ifmedia_printword(mword);
        }
 #endif
@@ -157,7 +157,7 @@ ifmedia_set(struct ifmedia *ifm, int target)
        match = ifmedia_match(ifm, target, ifm->ifm_mask);
 
        if (match == NULL) {
-               printf("ifmedia_set: no match for 0x%x/0x%x\n",
+               kprintf("ifmedia_set: no match for 0x%x/0x%x\n",
                    target, ~ifm->ifm_mask);
                panic("ifmedia_set");
        }
@@ -165,9 +165,9 @@ ifmedia_set(struct ifmedia *ifm, int target)
 
 #ifdef IFMEDIA_DEBUG
        if (ifmedia_debug) {
-               printf("ifmedia_set: target ");
+               kprintf("ifmedia_set: target ");
                ifmedia_printword(target);
-               printf("ifmedia_set: setting to ");
+               kprintf("ifmedia_set: setting to ");
                ifmedia_printword(ifm->ifm_cur->ifm_media);
        }
 #endif
@@ -204,7 +204,7 @@ ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr,
                if (match == NULL) {
 #ifdef IFMEDIA_DEBUG
                        if (ifmedia_debug) {
-                               printf(
+                               kprintf(
                                    "ifmedia_ioctl: no media found for 0x%x\n", 
                                    newmedia);
                        }
@@ -230,7 +230,7 @@ ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr,
                 */
 #ifdef IFMEDIA_DEBUG
                if (ifmedia_debug) {
-                       printf("ifmedia_ioctl: switching %s to ",
+                       kprintf("ifmedia_ioctl: switching %s to ",
                            ifp->if_xname);
                        ifmedia_printword(match->ifm_media);
                }
@@ -349,7 +349,7 @@ ifmedia_match(struct ifmedia *ifm, int target, int mask)
                if ((next->ifm_media & mask) == (target & mask)) {
 #if defined(IFMEDIA_DEBUG) || defined(DIAGNOSTIC)
                        if (match) {
-                               printf("ifmedia_match: multiple match for "
+                               kprintf("ifmedia_match: multiple match for "
                                    "0x%x/0x%x\n", target, mask);
                        }
 #endif
@@ -435,10 +435,10 @@ ifmedia_printword(int ifmw)
                if (IFM_TYPE(ifmw) == desc->ifmt_word)
                        break;
        if (desc->ifmt_string == NULL) {
-               printf("<unknown type>\n");
+               kprintf("<unknown type>\n");
                return;
        }
-       printf(desc->ifmt_string);
+       kprintf(desc->ifmt_string);
 
        /*
         * Check for the shared subtype descriptions first, then the
@@ -453,12 +453,12 @@ ifmedia_printword(int ifmw)
                if (IFM_SUBTYPE(ifmw) == desc->ifmt_word)
                        break;
        if (desc->ifmt_string == NULL) {
-               printf(" <unknown subtype>\n");
+               kprintf(" <unknown subtype>\n");
                return;
        }
 
  got_subtype:
-       printf(" %s", desc->ifmt_string);
+       kprintf(" %s", desc->ifmt_string);
 
        /*
         * Look for shared options.
@@ -467,8 +467,8 @@ ifmedia_printword(int ifmw)
            desc->ifmt_string != NULL; desc++) {
                if (ifmw & desc->ifmt_word) {
                        if (seen_option == 0)
-                               printf(" <");
-                       printf("%s%s", seen_option++ ? "," : "",
+                               kprintf(" <");
+                       kprintf("%s%s", seen_option++ ? "," : "",
                            desc->ifmt_string);
                }
        }
@@ -479,11 +479,11 @@ ifmedia_printword(int ifmw)
        for (desc = ttos->options; desc->ifmt_string != NULL; desc++) {
                if (ifmw & desc->ifmt_word) {
                        if (seen_option == 0)
-                               printf(" <");
-                       printf("%s%s", seen_option++ ? "," : "",
+                               kprintf(" <");
+                       kprintf("%s%s", seen_option++ ? "," : "",
                            desc->ifmt_string); 
                }
        }
-       printf("%s\n", seen_option ? ">" : "");
+       kprintf("%s\n", seen_option ? ">" : "");
 }
 #endif /* IFMEDIA_DEBUG */
index 45646ea..8cbc83e 100644 (file)
@@ -1,5 +1,5 @@
 /*     $FreeBSD: src/sys/netinet6/ip6_fw.c,v 1.2.2.10 2003/08/03 17:52:54 ume Exp $    */
-/*     $DragonFly: src/sys/net/ip6fw/ip6_fw.c,v 1.17 2006/12/20 18:14:42 dillon Exp $  */
+/*     $DragonFly: src/sys/net/ip6fw/ip6_fw.c,v 1.18 2006/12/22 23:44:56 swildner Exp $        */
 /*     $KAME: ip6_fw.c,v 1.21 2001/01/24 01:25:32 itojun Exp $ */
 
 /*
@@ -127,7 +127,7 @@ SYSCTL_INT(_net_inet6_ip6_fw, OID_AUTO, verbose_limit, CTLFLAG_RW, &fw6_verbose_
 
 #define dprintf(a)     do {                                            \
                                if (fw6_debug)                          \
-                                       printf a;                       \
+                                       kprintf a;                      \
                        } while (0)
 #define SNPARGS(buf, len) buf + len, sizeof(buf) > len ? sizeof(buf) - len : 0
 
@@ -1163,7 +1163,7 @@ ip6_fw_ctl(int stage, struct mbuf **mm)
                return (error);
        }
        if (m == NULL) {
-               printf("%s NULL mbuf ptr\n", err_prefix);
+               kprintf("%s NULL mbuf ptr\n", err_prefix);
                return (EINVAL);
        }
 
@@ -1228,17 +1228,17 @@ ip6_fw_init(void)
                add_entry6(&ip6_fw_chain, &default_rule))
                panic(__func__);
 
-       printf("IPv6 packet filtering initialized, ");
+       kprintf("IPv6 packet filtering initialized, ");
 #ifdef IPV6FIREWALL_DEFAULT_TO_ACCEPT
-       printf("default to accept, ");
+       kprintf("default to accept, ");
 #endif
 #ifndef IPV6FIREWALL_VERBOSE
-       printf("logging disabled\n");
+       kprintf("logging disabled\n");
 #else
        if (fw6_verbose_limit == 0)
-               printf("unlimited logging\n");
+               kprintf("unlimited logging\n");
        else
-               printf("logging limited to %d packets/entry\n",
+               kprintf("logging limited to %d packets/entry\n",
                    fw6_verbose_limit);
 #endif
 }
@@ -1271,7 +1271,7 @@ ip6fw_modevent(module_t mod, int type, void *unused)
                }
 
                crit_exit();
-               printf("IPv6 firewall unloaded\n");
+               kprintf("IPv6 firewall unloaded\n");
                return 0;
        default:
                break;
index ca6c636..3e20e22 100644 (file)
@@ -18,7 +18,7 @@
  * bandwidth metering and signaling
  *
  * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.56.2.10 2003/08/24 21:37:34 hsu Exp $
- * $DragonFly: src/sys/net/ip_mroute/ip_mroute.c,v 1.20 2006/09/05 00:55:47 dillon Exp $
+ * $DragonFly: src/sys/net/ip_mroute/ip_mroute.c,v 1.21 2006/12/22 23:44:56 swildner Exp $
  */
 
 #include "opt_mrouting.h"
@@ -1187,7 +1187,7 @@ X_ip_mforward(struct ip *ip, struct ifnet *ifp, struct mbuf *m,
        if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
            struct vif *vifp = viftable + vifi;
 
-           printf("Sending IPPROTO_RSVP from %lx to %lx on vif %d (%s%s)\n",
+           kprintf("Sending IPPROTO_RSVP from %lx to %lx on vif %d (%s%s)\n",
                (long)ntohl(ip->ip_src.s_addr), (long)ntohl(ip->ip_dst.s_addr),
                vifi,
                (vifp->v_flags & VIFF_TUNNEL) ? "tunnel on " : "",
@@ -1196,10 +1196,10 @@ X_ip_mforward(struct ip *ip, struct ifnet *ifp, struct mbuf *m,
        return ip_mdq(m, ifp, NULL, vifi);
     }
     if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
-       printf("Warning: IPPROTO_RSVP from %lx to %lx without vif option\n",
+       kprintf("Warning: IPPROTO_RSVP from %lx to %lx without vif option\n",
            (long)ntohl(ip->ip_src.s_addr), (long)ntohl(ip->ip_dst.s_addr));
        if (!imo)
-           printf("In fact, no options were specified at all\n");
+           kprintf("In fact, no options were specified at all\n");
     }
 
     /*
@@ -2126,7 +2126,7 @@ X_rsvp_input(struct mbuf *m, ...)
     __va_end(ap);
 
     if (rsvpdebug)
-       printf("rsvp_input: rsvp_on %d\n",rsvp_on);
+       kprintf("rsvp_input: rsvp_on %d\n",rsvp_on);
 
     /* Can still get packets with rsvp_on = 0 if there is a local member
      * of the group to which the RSVP packet is addressed.  But in this
@@ -2140,7 +2140,7 @@ X_rsvp_input(struct mbuf *m, ...)
     crit_enter();
 
     if (rsvpdebug)
-       printf("rsvp_input: check vifs\n");
+       kprintf("rsvp_input: check vifs\n");
 
 #ifdef DIAGNOSTIC
     if (!(m->m_flags & M_PKTHDR))
@@ -2165,13 +2165,13 @@ X_rsvp_input(struct mbuf *m, ...)
         */
        if (ip_rsvpd != NULL) {
            if (rsvpdebug)
-               printf("rsvp_input: Sending packet up old-style socket\n");
+               kprintf("rsvp_input: Sending packet up old-style socket\n");
            rip_input(m, off, proto);  /* xxx */
        } else {
            if (rsvpdebug && vifi == numvifs)
-               printf("rsvp_input: Can't find vif for packet.\n");
+               kprintf("rsvp_input: Can't find vif for packet.\n");
            else if (rsvpdebug && viftable[vifi].v_rsvpd == NULL)
-               printf("rsvp_input: No socket defined for vif %d\n",vifi);
+               kprintf("rsvp_input: No socket defined for vif %d\n",vifi);
            m_freem(m);
        }
        crit_exit();
@@ -2180,7 +2180,7 @@ X_rsvp_input(struct mbuf *m, ...)
     rsvp_src.sin_addr = ip->ip_src;
 
     if (rsvpdebug && m)
-       printf("rsvp_input: m->m_len = %d, sbspace() = %ld\n",
+       kprintf("rsvp_input: m->m_len = %d, sbspace() = %ld\n",
               m->m_len,sbspace(&(viftable[vifi].v_rsvpd->so_rcv)));
 
 #ifdef ALTQ
@@ -2195,20 +2195,20 @@ X_rsvp_input(struct mbuf *m, ...)
        if (opts)
            m_freem(opts);
        if (rsvpdebug)
-           printf("rsvp_input: Failed to append to socket\n");
+           kprintf("rsvp_input: Failed to append to socket\n");
     }
     else {
        sorwakeup(so);
        if (rsvpdebug)
-           printf("rsvp_input: send packet up\n");
+           kprintf("rsvp_input: send packet up\n");
     }
 #else /* !ALTQ */
     if (socket_send(viftable[vifi].v_rsvpd, m, &rsvp_src) < 0) {
        if (rsvpdebug)
-           printf("rsvp_input: Failed to append to socket\n");
+           kprintf("rsvp_input: Failed to append to socket\n");
     } else {
        if (rsvpdebug)
-           printf("rsvp_input: send packet up\n");
+           kprintf("rsvp_input: send packet up\n");
     }
 #endif /* !ALTQ */
 
index f516095..5fc19fb 100644 (file)
@@ -14,7 +14,7 @@
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
  * $FreeBSD: src/sys/netinet/ip_fw.c,v 1.131.2.39 2003/01/20 02:23:07 iedowse Exp $
- * $DragonFly: src/sys/net/ipfw/Attic/ip_fw.c,v 1.21 2006/12/20 18:14:42 dillon Exp $
+ * $DragonFly: src/sys/net/ipfw/Attic/ip_fw.c,v 1.22 2006/12/22 23:44:56 swildner Exp $
  */
 
 #define        DEB(x)
@@ -204,7 +204,7 @@ SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_grace_time, CTLFLAG_RD,
 
 #define dprintf(a)     do {                                            \
                                if (fw_debug)                           \
-                                       printf a;                       \
+                                       kprintf a;                      \
                        } while (0)
 #define SNPARGS(buf, len) buf + len, sizeof(buf) > len ? sizeof(buf) - len : 0
 
@@ -652,7 +652,7 @@ hash_packet(struct ipfw_flow_id *id)
        /* remove a refcount to the parent */                           \
        if (q->dyn_type == DYN_LIMIT)                                   \
                q->parent->count--;                                     \
-       DEB(printf("-- unlink entry 0x%08x %d -> 0x%08x %d, %d left\n", \
+       DEB(kprintf("-- unlink entry 0x%08x %d -> 0x%08x %d, %d left\n", \
                (q->id.src_ip), (q->id.src_port),                       \
                (q->id.dst_ip), (q->id.dst_port), dyn_count-1 ); )      \
        if (prev != NULL)                                               \
@@ -705,7 +705,7 @@ remove_dyn_rule(struct ip_fw *rule, int force)
                if (pass == 0 || q->count != 0) {
                    zap = 0 ;
                    if (pass == 1 && force) /* should not happen */
-                       printf("OUCH! cannot remove rule, count %d\n",
+                       kprintf("OUCH! cannot remove rule, count %d\n",
                                q->count);
                }
            }
@@ -805,7 +805,7 @@ found:
             * occur if we use keep-state the wrong way.
             */
            if ( (q->state & ((TH_RST << 8)|TH_RST)) == 0)
-               printf("invalid state: 0x%x\n", q->state);
+               kprintf("invalid state: 0x%x\n", q->state);
 #endif
            q->expire = time_second + dyn_rst_lifetime ;
            break ;
@@ -860,7 +860,7 @@ add_dyn_rule(struct ipfw_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule)
 
     r = kmalloc(sizeof *r, M_IPFW, M_WAITOK | M_ZERO);
     if (r == NULL) {
-       printf ("sorry cannot allocate state\n");
+       kprintf ("sorry cannot allocate state\n");
        return NULL ;
     }
 
@@ -885,7 +885,7 @@ add_dyn_rule(struct ipfw_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule)
     r->next = ipfw_dyn_v[i] ;
     ipfw_dyn_v[i] = r ;
     dyn_count++ ;
-    DEB(printf("-- add entry 0x%08x %d -> 0x%08x %d, total %d\n",
+    DEB(kprintf("-- add entry 0x%08x %d -> 0x%08x %d, total %d\n",
        (r->id.src_ip), (r->id.src_port),
        (r->id.dst_ip), (r->id.dst_port),
        dyn_count ); )
@@ -912,7 +912,7 @@ lookup_dyn_parent(struct ipfw_flow_id *pkt, struct ip_fw *rule)
                    pkt->src_port == q->id.src_port &&
                    pkt->dst_port == q->id.dst_port) {
                q->expire = time_second + dyn_short_lifetime ;
-               DEB(printf("lookup_dyn_parent found 0x%p\n", q);)
+               DEB(kprintf("lookup_dyn_parent found 0x%p\n", q);)
                return q;
            }
     }
@@ -936,7 +936,7 @@ install_state(struct ip_fw *rule, struct ip_fw_args *args)
 
     u_int8_t type = rule->dyn_type ;
 
-    DEB(printf("-- install state type %d 0x%08x %u -> 0x%08x %u\n",
+    DEB(kprintf("-- install state type %d 0x%08x %u -> 0x%08x %u\n",
        type,
        (args->f_id.src_ip), (args->f_id.src_port),
        (args->f_id.dst_ip), (args->f_id.dst_port) );)
@@ -945,7 +945,7 @@ install_state(struct ip_fw *rule, struct ip_fw_args *args)
     if (q != NULL) { /* should never occur */
        if (last_log != time_second) {
            last_log = time_second ;
-           printf(" entry already present, done\n");
+           kprintf(" entry already present, done\n");
        }
        return 0 ;
     }
@@ -954,7 +954,7 @@ install_state(struct ip_fw *rule, struct ip_fw_args *args)
     if (dyn_count >= dyn_max) {
        if (last_log != time_second) {
            last_log = time_second ;
-           printf(" Too many dynamic rules, sorry\n");
+           kprintf(" Too many dynamic rules, sorry\n");
        }
        return 1; /* cannot install, notify caller */
     }
@@ -970,7 +970,7 @@ install_state(struct ip_fw *rule, struct ip_fw_args *args)
        struct ipfw_flow_id id;
        struct ipfw_dyn_rule *parent;
 
-       DEB(printf("installing dyn-limit rule %d\n", conn_limit);)
+       DEB(kprintf("installing dyn-limit rule %d\n", conn_limit);)
 
        id.dst_ip = id.src_ip = 0;
        id.dst_port = id.src_port = 0 ;
@@ -986,7 +986,7 @@ install_state(struct ip_fw *rule, struct ip_fw_args *args)
            id.dst_port = args->f_id.dst_port;
        parent = lookup_dyn_parent(&id, rule);
        if (parent == NULL) {
-           printf("add parent failed\n");
+           kprintf("add parent failed\n");
            return 1;
        }
        if (parent->count >= conn_limit) {
@@ -997,7 +997,7 @@ install_state(struct ip_fw *rule, struct ip_fw_args *args)
             */
            parent = lookup_dyn_parent(&id, rule);
            if (parent == NULL) {
-               printf("add parent failed\n");
+               kprintf("add parent failed\n");
                return 1;
            }
            if (parent->count >= conn_limit) {
@@ -1013,7 +1013,7 @@ install_state(struct ip_fw *rule, struct ip_fw_args *args)
        }
        break ;
     default:
-       printf("unknown dynamic rule type %u\n", type);
+       kprintf("unknown dynamic rule type %u\n", type);
        return 1 ;
     }
     lookup_dyn_rule(&args->f_id, NULL) ; /* XXX just set the lifetime */
@@ -1214,7 +1214,7 @@ again:
                    dyn_checked = 1 ;
                    q = lookup_dyn_rule(&args->f_id, &direction);
                    if (q != NULL) {
-                       DEB(printf("-- dynamic match 0x%08x %d %s 0x%08x %d\n",
+                       DEB(kprintf("-- dynamic match 0x%08x %d %s 0x%08x %d\n",
                            (q->id.src_ip), (q->id.src_port),
                            (direction == MATCH_FORWARD ? "-->" : "<--"),
                            (q->id.dst_ip), (q->id.dst_port) ); )
@@ -1439,7 +1439,7 @@ bogusfrag:
                        if (m != NULL)
                                ipfw_report(NULL, ip, ip_off, ip_len, rif, oif);
                        else
-                               printf("pullup failed\n");
+                               kprintf("pullup failed\n");
                }
                goto dropit;
 
@@ -1669,7 +1669,7 @@ add_entry(struct ip_fw_head *head, struct ip_fw *rule)
 done:
        static_count++;
        crit_exit();
-       DEB(printf("++ installed rule %d, static count now %d\n",
+       DEB(kprintf("++ installed rule %d, static count now %d\n",
                ftmp->fw_number, static_count);)
        return (0);
 }
@@ -2044,7 +2044,7 @@ ip_fw_ctl(struct sockopt *sopt)
            break;
 
        default:
-               printf("ip_fw_ctl invalid option %d\n", sopt->sopt_name);
+               kprintf("ip_fw_ctl invalid option %d\n", sopt->sopt_name);
                error = EINVAL ;
        }
 
@@ -2084,7 +2084,7 @@ ip_fw_init(void)
                panic("ip_fw_init");
 
        ip_fw_default_rule = LIST_FIRST(&ip_fw_chain_head) ;
-       printf("IP packet filtering initialized, "
+       kprintf("IP packet filtering initialized, "
 #ifdef IPDIVERT
                "divert enabled, "
 #else
@@ -2097,12 +2097,12 @@ ip_fw_init(void)
                "default to deny, " );
 #endif
 #ifndef IPFIREWALL_VERBOSE
-       printf("logging disabled\n");
+       kprintf("logging disabled\n");
 #else
        if (fw_verbose_limit == 0)
-               printf("unlimited logging\n");
+               kprintf("unlimited logging\n");
        else
-               printf("logging limited to %d packets/entry by default\n",
+               kprintf("logging limited to %d packets/entry by default\n",
                    fw_verbose_limit);
 #endif
 }
@@ -2120,7 +2120,7 @@ ipfw_modevent(module_t mod, int type, void *unused)
                crit_enter();
                if (IPFW_LOADED) {
                        crit_exit();
-                       printf("IP firewall already loaded\n");
+                       kprintf("IP firewall already loaded\n");
                        err = EEXIST ;
                } else {
                        ip_fw_init();
@@ -2129,7 +2129,7 @@ ipfw_modevent(module_t mod, int type, void *unused)
                break ;
        case MOD_UNLOAD:
 #if !defined(KLD_MODULE)
-               printf("ipfw statically compiled, cannot unload\n");
+               kprintf("ipfw statically compiled, cannot unload\n");
                err = EBUSY;
 #else
                crit_enter();
@@ -2138,7 +2138,7 @@ ipfw_modevent(module_t mod, int type, void *unused)
                while ( (fcp = LIST_FIRST(&ip_fw_chain_head)) != NULL)
                        free_chain(fcp);
                crit_exit();
-               printf("IP firewall unloaded\n");
+               kprintf("IP firewall unloaded\n");
 #endif
                break ;
 
index ea8ba21..c42c8fc 100644 (file)
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.6.2.12 2003/04/08 10:42:32 maxim Exp $
- * $DragonFly: src/sys/net/ipfw/ip_fw2.c,v 1.25 2006/12/20 18:14:42 dillon Exp $
+ * $DragonFly: src/sys/net/ipfw/ip_fw2.c,v 1.26 2006/12/22 23:44:57 swildner Exp $
  */
 
 #define        DEB(x)
@@ -612,7 +612,7 @@ hash_packet(struct ipfw_flow_id *id)
        /* remove a refcount to the parent */                           \
        if (q->dyn_type == O_LIMIT)                                     \
                q->parent->count--;                                     \
-       DEB(printf("-- unlink entry 0x%08x %d -> 0x%08x %d, %d left\n", \
+       DEB(kprintf("-- unlink entry 0x%08x %d -> 0x%08x %d, %d left\n",        \
                (q->id.src_ip), (q->id.src_port),                       \
                (q->id.dst_ip), (q->id.dst_port), dyn_count-1 ); )      \
        if (prev != NULL)                                               \
@@ -678,7 +678,7 @@ next_pass:
                                        goto next;
                                if (FORCE && q->count != 0 ) {
                                        /* XXX should not happen! */
-                                       printf( "OUCH! cannot remove rule,"
+                                       kprintf( "OUCH! cannot remove rule,"
                                             " count %d\n", q->count);
                                }
                        } else {
@@ -801,7 +801,7 @@ next:
                         * occur if we use keep-state the wrong way.
                         */
                        if ( (q->state & ((TH_RST << 8)|TH_RST)) == 0)
-                               printf("invalid state: 0x%x\n", q->state);
+                               kprintf("invalid state: 0x%x\n", q->state);
 #endif
                        if (dyn_rst_lifetime >= dyn_keepalive_period)
                                dyn_rst_lifetime = dyn_keepalive_period - 1;
@@ -873,7 +873,7 @@ add_dyn_rule(struct ipfw_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule)
 
        r = kmalloc(sizeof *r, M_IPFW, M_WAITOK | M_ZERO);
        if (r == NULL) {
-               printf ("sorry cannot allocate state\n");
+               kprintf ("sorry cannot allocate state\n");
                return NULL;
        }
 
@@ -898,7 +898,7 @@ add_dyn_rule(struct ipfw_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule)
        r->next = ipfw_dyn_v[i];
        ipfw_dyn_v[i] = r;
        dyn_count++;
-       DEB(printf("-- add dyn entry ty %d 0x%08x %d -> 0x%08x %d, total %d\n",
+       DEB(kprintf("-- add dyn entry ty %d 0x%08x %d -> 0x%08x %d, total %d\n",
           dyn_type,
           (r->id.src_ip), (r->id.src_port),
           (r->id.dst_ip), (r->id.dst_port),
@@ -927,7 +927,7 @@ lookup_dyn_parent(struct ipfw_flow_id *pkt, struct ip_fw *rule)
                            pkt->src_port == q->id.src_port &&
                            pkt->dst_port == q->id.dst_port) {
                                q->expire = time_second + dyn_short_lifetime;
-                               DEB(printf("lookup_dyn_parent found 0x%p\n",q);)
+                               DEB(kprintf("lookup_dyn_parent found 0x%p\n",q);)
                                return q;
                        }
        }
@@ -948,7 +948,7 @@ install_state(struct ip_fw *rule, ipfw_insn_limit *cmd,
 
        ipfw_dyn_rule *q;
 
-       DEB(printf("-- install state type %d 0x%08x %u -> 0x%08x %u\n",
+       DEB(kprintf("-- install state type %d 0x%08x %u -> 0x%08x %u\n",
            cmd->o.opcode,
            (args->f_id.src_ip), (args->f_id.src_port),
            (args->f_id.dst_ip), (args->f_id.dst_port) );)
@@ -958,7 +958,7 @@ install_state(struct ip_fw *rule, ipfw_insn_limit *cmd,
        if (q != NULL) { /* should never occur */
                if (last_log != time_second) {
                        last_log = time_second;
-                       printf(" install_state: entry already present, done\n");
+                       kprintf(" install_state: entry already present, done\n");
                }
                return 0;
        }
@@ -972,7 +972,7 @@ install_state(struct ip_fw *rule, ipfw_insn_limit *cmd,
        if (dyn_count >= dyn_max) {
                if (last_log != time_second) {
                        last_log = time_second;
-                       printf("install_state: Too many dynamic rules\n");
+                       kprintf("install_state: Too many dynamic rules\n");
                }
                return 1; /* cannot install, notify caller */
        }
@@ -988,7 +988,7 @@ install_state(struct ip_fw *rule, ipfw_insn_limit *cmd,
                struct ipfw_flow_id id;
                ipfw_dyn_rule *parent;
 
-               DEB(printf("installing dyn-limit rule %d\n", cmd->conn_limit);)
+               DEB(kprintf("installing dyn-limit rule %d\n", cmd->conn_limit);)
 
                id.dst_ip = id.src_ip = 0;
                id.dst_port = id.src_port = 0;
@@ -1004,7 +1004,7 @@ install_state(struct ip_fw *rule, ipfw_insn_limit *cmd,
                        id.dst_port = args->f_id.dst_port;
                parent = lookup_dyn_parent(&id, rule);
                if (parent == NULL) {
-                       printf("add parent failed\n");
+                       kprintf("add parent failed\n");
                        return 1;
                }
                if (parent->count >= cmd->conn_limit) {
@@ -1025,7 +1025,7 @@ install_state(struct ip_fw *rule, ipfw_insn_limit *cmd,
            }
                break;
        default:
-               printf("unknown dynamic rule type %u\n", cmd->o.opcode);
+               kprintf("unknown dynamic rule type %u\n", cmd->o.opcode);
                return 1;
        }
        lookup_dyn_rule(&args->f_id, NULL, NULL); /* XXX just set lifetime */
@@ -1465,7 +1465,7 @@ check_body:
                                break;
 
                        case O_FORWARD_MAC:
-                               printf("ipfw: opcode %d unimplemented\n",
+                               kprintf("ipfw: opcode %d unimplemented\n",
                                    cmd->opcode);
                                break;
 
@@ -1926,7 +1926,7 @@ check_body:
 next_rule:;            /* try next rule                */
 
        }               /* end of outer for, scan rules */
-       printf("+++ ipfw: ouch!, skip past end of rules, denying packet\n");
+       kprintf("+++ ipfw: ouch!, skip past end of rules, denying packet\n");
        return(IP_FW_PORT_DENY_FLAG);
 
 done:
@@ -1938,7 +1938,7 @@ done:
 
 pullup_failed:
        if (fw_verbose)
-               printf("pullup failed\n");
+               kprintf("pullup failed\n");
        return(IP_FW_PORT_DENY_FLAG);
 }
 
@@ -2052,7 +2052,7 @@ done:
        static_count++;
        static_len += l;
        crit_exit();
-       DEB(printf("++ installed rule %d, static count now %d\n",
+       DEB(kprintf("++ installed rule %d, static count now %d\n",
                rule->rulenum, static_count);)
        return (0);
 }
@@ -2279,13 +2279,13 @@ check_ipfw_struct(struct ip_fw *rule, int size)
        ipfw_insn *cmd;
 
        if (size < sizeof(*rule)) {
-               printf("ipfw: rule too short\n");
+               kprintf("ipfw: rule too short\n");
                return (EINVAL);
        }
        /* first, check for valid size */
        l = RULESIZE(rule);
        if (l != size) {
-               printf("ipfw: size mismatch (have %d want %d)\n", size, l);
+               kprintf("ipfw: size mismatch (have %d want %d)\n", size, l);
                return (EINVAL);
        }
        /*
@@ -2296,11 +2296,11 @@ check_ipfw_struct(struct ip_fw *rule, int size)
                        l > 0 ; l -= cmdlen, cmd += cmdlen) {
                cmdlen = F_LEN(cmd);
                if (cmdlen > l) {
-                       printf("ipfw: opcode %d size truncated\n",
+                       kprintf("ipfw: opcode %d size truncated\n",
                            cmd->opcode);
                        return EINVAL;
                }
-               DEB(printf("ipfw: opcode %d\n", cmd->opcode);)
+               DEB(kprintf("ipfw: opcode %d\n", cmd->opcode);)
                switch (cmd->opcode) {
                case O_NOP:
                case O_PROBE_STATE:
@@ -2357,7 +2357,7 @@ check_ipfw_struct(struct ip_fw *rule, int size)
                        if (cmdlen != F_INSN_SIZE(ipfw_insn_ip))
                                goto bad_size;
                        if (((ipfw_insn_ip *)cmd)->mask.s_addr == 0) {
-                               printf("ipfw: opcode %d, useless rule\n",
+                               kprintf("ipfw: opcode %d, useless rule\n",
                                        cmd->opcode);
                                return EINVAL;
                        }
@@ -2366,7 +2366,7 @@ check_ipfw_struct(struct ip_fw *rule, int size)
                case O_IP_SRC_SET:
                case O_IP_DST_SET:
                        if (cmd->arg1 == 0 || cmd->arg1 > 256) {
-                               printf("ipfw: invalid set size %d\n",
+                               kprintf("ipfw: invalid set size %d\n",
                                        cmd->arg1);
                                return EINVAL;
                        }
@@ -2418,33 +2418,33 @@ check_ipfw_struct(struct ip_fw *rule, int size)
                                goto bad_size;
 check_action:
                        if (have_action) {
-                               printf("ipfw: opcode %d, multiple actions"
+                               kprintf("ipfw: opcode %d, multiple actions"
                                        " not allowed\n",
                                        cmd->opcode);
                                return EINVAL;
                        }
                        have_action = 1;
                        if (l != cmdlen) {
-                               printf("ipfw: opcode %d, action must be"
+                               kprintf("ipfw: opcode %d, action must be"
                                        " last opcode\n",
                                        cmd->opcode);
                                return EINVAL;
                        }
                        break;
                default:
-                       printf("ipfw: opcode %d, unknown opcode\n",
+                       kprintf("ipfw: opcode %d, unknown opcode\n",
                                cmd->opcode);
                        return EINVAL;
                }
        }
        if (have_action == 0) {
-               printf("ipfw: missing action\n");
+               kprintf("ipfw: missing action\n");
                return EINVAL;
        }
        return 0;
 
 bad_size:
-       printf("ipfw: opcode %d size %d wrong\n",
+       kprintf("ipfw: opcode %d size %d wrong\n",
                cmd->opcode, cmdlen);
        return EINVAL;
 }
@@ -2618,7 +2618,7 @@ ipfw_ctl(struct sockopt *sopt)
                break;
 
        default:
-               printf("ipfw_ctl invalid option %d\n", sopt->sopt_name);
+               kprintf("ipfw_ctl invalid option %d\n", sopt->sopt_name);
                error = EINVAL;
        }
 
@@ -2698,7 +2698,7 @@ ipfw_init(void)
        add_rule(&layer3_chain, &default_rule);
 
        ip_fw_default_rule = layer3_chain;
-       printf("ipfw2 initialized, divert %s, "
+       kprintf("ipfw2 initialized, divert %s, "
                "rule-based forwarding enabled, default to %s, logging ",
 #ifdef IPDIVERT
                "enabled",
@@ -2714,11 +2714,11 @@ ipfw_init(void)
        verbose_limit = IPFIREWALL_VERBOSE_LIMIT;
 #endif
        if (fw_verbose == 0)
-               printf("disabled\n");
+               kprintf("disabled\n");
        else if (verbose_limit == 0)
-               printf("unlimited\n");
+               kprintf("unlimited\n");
        else
-               printf("limited to %d packets/entry by default\n",
+               kprintf("limited to %d packets/entry by default\n",
                    verbose_limit);
        callout_init(&ipfw_timeout_h);
        callout_reset(&ipfw_timeout_h, hz, ipfw_tick, NULL);
@@ -2734,7 +2734,7 @@ ipfw_modevent(module_t mod, int type, void *unused)
                crit_enter();
                if (IPFW_LOADED) {
                        crit_exit();
-                       printf("IP firewall already loaded\n");
+                       kprintf("IP firewall already loaded\n");
                        err = EEXIST;
                } else {
                        ipfw_init();
@@ -2744,7 +2744,7 @@ ipfw_modevent(module_t mod, int type, void *unused)
 
        case MOD_UNLOAD:
 #if !defined(KLD_MODULE)
-               printf("ipfw statically compiled, cannot unload\n");
+               kprintf("ipfw statically compiled, cannot unload\n");
                err = EBUSY;
 #else
                 crit_enter();
@@ -2753,7 +2753,7 @@ ipfw_modevent(module_t mod, int type, void *unused)
                ip_fw_ctl_ptr = NULL;
                free_chain(&layer3_chain, 1 /* kill default rule */);
                crit_exit();
-               printf("IP firewall unloaded\n");
+               kprintf("IP firewall unloaded\n");
 #endif
                break;
        default:
index ce5ab55..5d2ef15 100644 (file)
@@ -35,7 +35,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $DragonFly: src/sys/net/netisr.c,v 1.28 2006/11/07 18:50:07 dillon Exp $
+ * $DragonFly: src/sys/net/netisr.c,v 1.29 2006/12/22 23:44:54 swildner Exp $
  */
 
 /*
@@ -312,7 +312,7 @@ netisr_queue(int num, struct mbuf *m)
 
     ni = &netisrs[num];
     if (ni->ni_handler == NULL) {
-       printf("netisr_queue: unregistered isr %d\n", num);
+       kprintf("netisr_queue: unregistered isr %d\n", num);
        return (EIO);
     }
 
index 53f20b0..c35a7ca 100644 (file)
@@ -1,6 +1,6 @@
 /*     $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.9 2004/06/22 20:13:24 brooks Exp $      */
 /*     $OpenBSD: if_pflog.c,v 1.11 2003/12/31 11:18:25 cedric Exp $    */
-/*     $DragonFly: src/sys/net/pf/if_pflog.c,v 1.5 2006/09/05 00:55:47 dillon Exp $ */
+/*     $DragonFly: src/sys/net/pf/if_pflog.c,v 1.6 2006/12/22 23:44:57 swildner Exp $ */
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -80,7 +80,7 @@
 #define PFLOGMTU       (32768 + MHLEN + MLEN)
 
 #ifdef PFLOGDEBUG
-#define DPRINTF(x)    do { if (pflogdebug) printf x ; } while (0)
+#define DPRINTF(x)    do { if (pflogdebug) kprintf x ; } while (0)
 #else
 #define DPRINTF(x)
 #endif
index ba4c36a..75bc0f1 100644 (file)
@@ -1,6 +1,6 @@
 /*     $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.11 2004/08/14 15:32:40 dwmalone Exp $  */
 /*     $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $  */
-/*     $DragonFly: src/sys/net/pf/if_pfsync.c,v 1.5 2006/09/05 00:55:47 dillon Exp $ */
+/*     $DragonFly: src/sys/net/pf/if_pfsync.c,v 1.6 2006/12/22 23:44:57 swildner Exp $ */
 
 /*
  * Copyright (c) 2004 The DragonFly Project.  All rights reserved.
@@ -77,7 +77,7 @@
     (sizeof(struct pfsync_header) + sizeof(struct pf_state))
 
 #ifdef PFSYNCDEBUG
-#define DPRINTF(x)    do { if (pfsyncdebug) printf x ; } while (0)
+#define DPRINTF(x)    do { if (pfsyncdebug) kprintf x ; } while (0)
 int pfsyncdebug;
 #else
 #define DPRINTF(x)
@@ -185,7 +185,7 @@ pfsync_insert_net_state(struct pfsync_state *sp)
        struct pfi_kif  *kif;
 
        if (sp->creatorid == 0 && pf_status.debug >= PF_DEBUG_MISC) {
-               printf("pfsync_insert_net_state: invalid creator id:"
+               kprintf("pfsync_insert_net_state: invalid creator id:"
                    " %08" PRIx32 "\n", ntohl(sp->creatorid));
                return (EINVAL);
        }
@@ -193,7 +193,7 @@ pfsync_insert_net_state(struct pfsync_state *sp)
        kif = pfi_lookup_create(sp->ifname);
        if (kif == NULL) {
                if (pf_status.debug >= PF_DEBUG_MISC)
-                       printf("pfsync_insert_net_state: "
+                       kprintf("pfsync_insert_net_state: "
                            "unknown interface: %s\n", sp->ifname);
      &nbs