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

341 files changed:
sys/dev/acpica5/Osd/OsdDebug.c
sys/dev/acpica5/Osd/OsdHardware.c
sys/dev/acpica5/Osd/OsdMemory.c
sys/dev/acpica5/Osd/OsdSynch.c
sys/dev/acpica5/Osd/OsdTable.c
sys/dev/acpica5/acpi.c
sys/dev/acpica5/acpi_cpu.c
sys/dev/acpica5/acpi_ec.c
sys/dev/acpica5/acpi_pci_link.c
sys/dev/acpica5/acpi_pcib.c
sys/dev/acpica5/acpi_resource.c
sys/dev/acpica5/acpi_timer.c
sys/dev/acpica5/acpivar.h
sys/dev/agp/agp.c
sys/dev/agp/agp_i810.c
sys/dev/agp/agp_intel.c
sys/dev/agp/agppriv.h
sys/dev/atm/en/midway.c
sys/dev/crypto/hifn/hifn7751.c
sys/dev/crypto/ubsec/ubsec.c
sys/dev/disk/advansys/adv_eisa.c
sys/dev/disk/advansys/adv_isa.c
sys/dev/disk/advansys/adv_pci.c
sys/dev/disk/advansys/advansys.c
sys/dev/disk/advansys/advlib.c
sys/dev/disk/advansys/adw_pci.c
sys/dev/disk/advansys/adwcam.c
sys/dev/disk/advansys/adwlib.c
sys/dev/disk/advansys/adwlib.h
sys/dev/disk/aha/aha.c
sys/dev/disk/aha/aha_isa.c
sys/dev/disk/ahb/ahb.c
sys/dev/disk/aic/aic.c
sys/dev/disk/aic7xxx/ahc_eisa.c
sys/dev/disk/aic7xxx/ahc_pci.c
sys/dev/disk/aic7xxx/ahd_pci.c
sys/dev/disk/aic7xxx/aic7770.c
sys/dev/disk/aic7xxx/aic79xx.c
sys/dev/disk/aic7xxx/aic79xx_inline.h
sys/dev/disk/aic7xxx/aic79xx_osm.c
sys/dev/disk/aic7xxx/aic79xx_pci.c
sys/dev/disk/aic7xxx/aic7xxx.c
sys/dev/disk/aic7xxx/aic7xxx_93cx6.c
sys/dev/disk/aic7xxx/aic7xxx_osm.c
sys/dev/disk/aic7xxx/aic7xxx_pci.c
sys/dev/disk/amd/amd.c
sys/dev/disk/ata/ata-all.c
sys/dev/disk/ata/ata-disk.c
sys/dev/disk/ata/ata-pci.c
sys/dev/disk/ata/ata-raid.c
sys/dev/disk/ata/atapi-all.c
sys/dev/disk/ata/atapi-cam.c
sys/dev/disk/ata/atapi-cd.c
sys/dev/disk/ata/atapi-fd.c
sys/dev/disk/ata/atapi-tape.c
sys/dev/disk/buslogic/bt.c
sys/dev/disk/buslogic/bt_eisa.c
sys/dev/disk/buslogic/bt_isa.c
sys/dev/disk/ccd/ccd.c
sys/dev/disk/fd/fd.c
sys/dev/disk/isp/isp_freebsd.c
sys/dev/disk/isp/isp_pci.c
sys/dev/disk/mcd/mcd.c
sys/dev/disk/md/md.c
sys/dev/disk/mpt/mpt_debug.c
sys/dev/disk/mpt/mpt_freebsd.c
sys/dev/disk/nata/ata-all.c
sys/dev/disk/nata/ata-chipset.c
sys/dev/disk/nata/ata-lowlevel.c
sys/dev/disk/nata/ata-queue.c
sys/dev/disk/nata/ata-raid.c
sys/dev/disk/nata/ata-usb.c
sys/dev/disk/nata/atapi-cam.c
sys/dev/disk/nata/atapi-cd.c
sys/dev/disk/nata/atapi-tape.c
sys/dev/disk/ncr/ncr.c
sys/dev/disk/ncv/ncr53c500.c
sys/dev/disk/ncv/ncr53c500_pccard.c
sys/dev/disk/nsp/nsp.c
sys/dev/disk/nsp/nsp_pccard.c
sys/dev/disk/sbp/sbp.c
sys/dev/disk/scd/scd.c
sys/dev/disk/simos/simos.c
sys/dev/disk/stg/tmc18c30.c
sys/dev/disk/stg/tmc18c30_isa.c
sys/dev/disk/stg/tmc18c30_pccard.c
sys/dev/disk/sym/sym_hipd.c
sys/dev/disk/trm/trm.c
sys/dev/disk/vn/vn.c
sys/dev/disk/vpo/immio.c
sys/dev/disk/vpo/vpo.c
sys/dev/disk/vpo/vpoio.c
sys/dev/disk/wt/wt.c
sys/dev/drm/drm_os_freebsd.h
sys/dev/misc/atkbdc_layer/atkbdc_isa.c
sys/dev/misc/dcons/dcons_crom.c
sys/dev/misc/dcons/dcons_os.c
sys/dev/misc/gpib/gpib.c
sys/dev/misc/kbd/atkbd.c
sys/dev/misc/kbd/kbd.c
sys/dev/misc/labpc/labpc.c
sys/dev/misc/lpt/lpt.c
sys/dev/misc/mse/mse.c
sys/dev/misc/musycc/musycc.c
sys/dev/misc/pcfclock/pcfclock.c
sys/dev/misc/ppc/ppc.c
sys/dev/misc/ppi/ppi.c
sys/dev/misc/psm/psm.c
sys/dev/misc/puc/puc.c
sys/dev/misc/snp/snp.c
sys/dev/misc/spic/spic.c
sys/dev/misc/syscons/apm/apm_saver.c
sys/dev/misc/syscons/syscons.c
sys/dev/misc/syscons/syscons.h
sys/dev/misc/xrpu/xrpu.c
sys/dev/netif/acx/if_acx.c
sys/dev/netif/an/if_an.c
sys/dev/netif/ar/if_ar.c
sys/dev/netif/ar/if_ar_isa.c
sys/dev/netif/ar/if_ar_pci.c
sys/dev/netif/ath/ath/if_ath.c
sys/dev/netif/ath/rate_amrr/amrr.c
sys/dev/netif/ath/rate_onoe/onoe.c
sys/dev/netif/ath/rate_sample/sample.c
sys/dev/netif/ath/rate_sample/sample.h
sys/dev/netif/awi/am79c930.c
sys/dev/netif/awi/awi.c
sys/dev/netif/cs/if_cs.c
sys/dev/netif/cx/cx.c
sys/dev/netif/cx/if_cx.c
sys/dev/netif/dc/if_dc.c
sys/dev/netif/de/if_de.c
sys/dev/netif/de/if_devar.h
sys/dev/netif/ed/if_ed.c
sys/dev/netif/ed/if_ed_pccard.c
sys/dev/netif/el/if_el.c
sys/dev/netif/em/if_em.h
sys/dev/netif/em/if_em_osdep.h
sys/dev/netif/en_pci/if_en_pci.c
sys/dev/netif/ep/if_ep.c
sys/dev/netif/ex/if_ex.c
sys/dev/netif/ex/if_ex_isa.c
sys/dev/netif/ex/if_ex_pccard.c
sys/dev/netif/fe/if_fe.c
sys/dev/netif/fe/if_fe_isa.c
sys/dev/netif/fpa/if_fpa.c
sys/dev/netif/gx/if_gx.c
sys/dev/netif/ic/if_ic.c
sys/dev/netif/ie/if_ie.c
sys/dev/netif/ipw/if_ipw.c
sys/dev/netif/iwi/if_iwi.c
sys/dev/netif/kue/if_kue.c
sys/dev/netif/le/if_le.c
sys/dev/netif/lge/if_lge.c
sys/dev/netif/lnc/am7990.c
sys/dev/netif/lnc/am79900.c
sys/dev/netif/mii_layer/acphy.c
sys/dev/netif/mii_layer/amphy.c
sys/dev/netif/mii_layer/brgphy.c
sys/dev/netif/mii_layer/ciphy.c
sys/dev/netif/mii_layer/dcphy.c
sys/dev/netif/mii_layer/e1000phy.c
sys/dev/netif/mii_layer/exphy.c
sys/dev/netif/mii_layer/inphy.c
sys/dev/netif/mii_layer/ip1000phy.c
sys/dev/netif/mii_layer/lxtphy.c
sys/dev/netif/mii_layer/mii_physubr.c
sys/dev/netif/mii_layer/mlphy.c
sys/dev/netif/mii_layer/nsgphy.c
sys/dev/netif/mii_layer/nsphy.c
sys/dev/netif/mii_layer/pnaphy.c
sys/dev/netif/mii_layer/pnphy.c
sys/dev/netif/mii_layer/qsphy.c
sys/dev/netif/mii_layer/rgephy.c
sys/dev/netif/mii_layer/rlphy.c
sys/dev/netif/mii_layer/ruephy.c
sys/dev/netif/mii_layer/tlphy.c
sys/dev/netif/mii_layer/ukphy.c
sys/dev/netif/mii_layer/xmphy.c
sys/dev/netif/mn/if_mn.c
sys/dev/netif/my/if_my.c
sys/dev/netif/nge/if_nge.c
sys/dev/netif/nv/if_nv.c
sys/dev/netif/nv/if_nvreg.h
sys/dev/netif/pcn/if_pcn.c
sys/dev/netif/pdq_layer/pdq.c
sys/dev/netif/plip/if_plip.c
sys/dev/netif/ral/rt2560.c
sys/dev/netif/ral/rt2661.c
sys/dev/netif/ray/if_ray.c
sys/dev/netif/ray/if_raydbg.h
sys/dev/netif/rdp/if_rdp.c
sys/dev/netif/rtw/rtw.c
sys/dev/netif/rtw/rtwphyio.c
sys/dev/netif/rtw/rtwvar.h
sys/dev/netif/rtw/smc93cx6.c
sys/dev/netif/rum/if_rum.c
sys/dev/netif/sbni/if_sbni.c
sys/dev/netif/sbni/if_sbni_pci.c
sys/dev/netif/sbsh/if_sbsh.c
sys/dev/netif/sf/if_sf.c
sys/dev/netif/sk/if_sk.c
sys/dev/netif/sn/if_sn.c
sys/dev/netif/sr/if_sr.c
sys/dev/netif/sr/if_sr_isa.c
sys/dev/netif/sr/if_sr_pci.c
sys/dev/netif/tx/if_tx.c
sys/dev/netif/txp/if_txp.c
sys/dev/netif/ural/if_ural.c
sys/dev/netif/vr/if_vr.c
sys/dev/netif/vx/if_vx.c
sys/dev/netif/vx/if_vx_pci.c
sys/dev/netif/wi/if_wi.c
sys/dev/netif/wl/if_wl.c
sys/dev/netif/xe/if_xe.c
sys/dev/netif/xl/if_xl.c
sys/dev/pccard/cardbus/cardbus.c
sys/dev/pccard/cardbus/cardbus_cis.c
sys/dev/pccard/exca/exca.c
sys/dev/pccard/pccbb/pccbb.c
sys/dev/powermng/i386/alpm/alpm.c
sys/dev/powermng/i386/amdpm/amdpm.c
sys/dev/powermng/i386/intpm/intpm.c
sys/dev/powermng/i386/viapm/viapm.c
sys/dev/raid/aac/aac.c
sys/dev/raid/aac/aac_cam.c
sys/dev/raid/aac/aac_disk.c
sys/dev/raid/aac/aacvar.h
sys/dev/raid/amr/amr_pci.c
sys/dev/raid/amr/amrvar.h
sys/dev/raid/asr/asr.c
sys/dev/raid/ciss/ciss.c
sys/dev/raid/ciss/cissvar.h
sys/dev/raid/dpt/dpt_control.c
sys/dev/raid/dpt/dpt_eisa.c
sys/dev/raid/dpt/dpt_scsi.c
sys/dev/raid/ida/ida.c
sys/dev/raid/iir/iir.c
sys/dev/raid/iir/iir.h
sys/dev/raid/iir/iir_pci.c
sys/dev/raid/ips/ips.c
sys/dev/raid/ips/ips.h
sys/dev/raid/ips/ips_commands.c
sys/dev/raid/ips/ips_disk.c
sys/dev/raid/ips/ips_pci.c
sys/dev/raid/mlx/mlx.c
sys/dev/raid/mlx/mlxvar.h
sys/dev/raid/mly/mly.c
sys/dev/raid/mly/mlyvar.h
sys/dev/raid/pst/pst-iop.c
sys/dev/raid/pst/pst-raid.c
sys/dev/raid/twa/twa.h
sys/dev/raid/twa/twa_cam.c
sys/dev/raid/twa/twa_freebsd.c
sys/dev/raid/twa/twa_reg.h
sys/dev/raid/twe/twe_freebsd.c
sys/dev/raid/twe/twereg.h
sys/dev/raid/twe/twevar.h
sys/dev/raid/vinum/vinumconfig.c
sys/dev/raid/vinum/vinumext.h
sys/dev/raid/vinum/vinumio.c
sys/dev/raid/vinum/vinumrevive.c
sys/dev/serial/cy/cy.c
sys/dev/serial/cy/cy_pci.c
sys/dev/serial/dgb/dgm.c
sys/dev/serial/dgb/dgmreg.h
sys/dev/serial/digi/digi.c
sys/dev/serial/rc/rc.c
sys/dev/serial/rp/rp.c
sys/dev/serial/si/si.c
sys/dev/serial/si/si_isa.c
sys/dev/serial/sio/sio.c
sys/dev/serial/stl/stallion.c
sys/dev/serial/stli/istallion.c
sys/dev/sound/isa/ad1816.c
sys/dev/sound/isa/ess.c
sys/dev/sound/isa/gusc.c
sys/dev/sound/isa/mss.c
sys/dev/sound/isa/sb16.c
sys/dev/sound/isa/sb8.c
sys/dev/sound/isa/sbc.c
sys/dev/sound/pci/als4000.c
sys/dev/sound/pci/aureal.c
sys/dev/sound/pci/cmi.c
sys/dev/sound/pci/cs4281.c
sys/dev/sound/pci/csa.c
sys/dev/sound/pci/ds1.c
sys/dev/sound/pci/emu10k1.c
sys/dev/sound/pci/es137x.c
sys/dev/sound/pci/fm801.c
sys/dev/sound/pci/ich.c
sys/dev/sound/pci/maestro.c
sys/dev/sound/pci/maestro3.c
sys/dev/sound/pci/solo.c
sys/dev/sound/pci/t4dwave.c
sys/dev/sound/pci/via8233.c
sys/dev/sound/pci/via82c686.c
sys/dev/sound/pci/vibes.c
sys/dev/sound/pcm/ac97.c
sys/dev/sound/pcm/buffer.c
sys/dev/sound/pcm/channel.c
sys/dev/sound/pcm/dsp.c
sys/dev/sound/pcm/feeder.c
sys/dev/sound/pcm/feeder_rate.c
sys/dev/sound/pcm/vchan.c
sys/dev/sound/usb/uaudio.c
sys/dev/usbmisc/ubsa/ubsa.c
sys/dev/usbmisc/ucom/ucom.c
sys/dev/usbmisc/udbp/udbp.c
sys/dev/usbmisc/ufm/ufm.c
sys/dev/usbmisc/uftdi/uftdi.c
sys/dev/usbmisc/ugen/ugen.c
sys/dev/usbmisc/uhid/uhid.c
sys/dev/usbmisc/ukbd/ukbd.c
sys/dev/usbmisc/ulpt/ulpt.c
sys/dev/usbmisc/umass/umass.c
sys/dev/usbmisc/umct/umct.c
sys/dev/usbmisc/umodem/umodem.c
sys/dev/usbmisc/ums/ums.c
sys/dev/usbmisc/uplcom/uplcom.c
sys/dev/usbmisc/urio/urio.c
sys/dev/usbmisc/uscanner/uscanner.c
sys/dev/usbmisc/uvisor/uvisor.c
sys/dev/usbmisc/uvscom/uvscom.c
sys/dev/video/bktr/bktr_audio.c
sys/dev/video/bktr/bktr_card.c
sys/dev/video/bktr/bktr_core.c
sys/dev/video/bktr/bktr_core.h
sys/dev/video/bktr/bktr_i2c.c
sys/dev/video/bktr/bktr_mem.c
sys/dev/video/bktr/bktr_os.c
sys/dev/video/bktr/bktr_tuner.c
sys/dev/video/bktr/msp34xx.c
sys/dev/video/fb/bmp/splash_bmp.c
sys/dev/video/fb/fb.c
sys/dev/video/fb/pcx/splash_pcx.c
sys/dev/video/fb/splash.c
sys/dev/video/fb/vga.c
sys/dev/video/gsc/gsc.c
sys/dev/video/i386/vesa/vesa.c
sys/dev/video/meteor/meteor.c

index 076cd7b..4329d62 100644 (file)
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.9 2004/09/02 04:28:05 njl Exp $
- * $DragonFly: src/sys/dev/acpica5/Osd/OsdDebug.c,v 1.4 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/Osd/OsdDebug.c,v 1.5 2006/12/22 23:26:14 swildner Exp $
  */
 
 /*
@@ -55,7 +55,7 @@ AcpiOsGetLine(char *Buffer)
            *cp = 0;
     return (AE_OK);
 #else
-    printf("AcpiOsGetLine called but no input support");
+    kprintf("AcpiOsGetLine called but no input support");
     return (AE_NOT_EXIST);
 #endif /* DDB */
 }
@@ -64,8 +64,8 @@ void
 AcpiOsDbgAssert(void *FailedAssertion, void *FileName, UINT32 LineNumber,
     char *Message)
 {
-    printf("ACPI: %s:%d - %s\n", (char *)FileName, LineNumber, Message);
-    printf("ACPI: assertion  %s\n", (char *)FailedAssertion);
+    kprintf("ACPI: %s:%d - %s\n", (char *)FileName, LineNumber, Message);
+    kprintf("ACPI: assertion  %s\n", (char *)FailedAssertion);
 }
 
 ACPI_STATUS
@@ -76,7 +76,7 @@ AcpiOsSignal(UINT32 Function, void *Info)
     switch (Function) {
     case ACPI_SIGNAL_FATAL:
        fatal = (ACPI_SIGNAL_FATAL_INFO *)Info;
-       printf("ACPI fatal signal, type 0x%x  code 0x%x  argument 0x%x",
+       kprintf("ACPI fatal signal, type 0x%x  code 0x%x  argument 0x%x",
              fatal->Type, fatal->Code, fatal->Argument);
        Debugger("AcpiOsSignal");
        break;
@@ -101,12 +101,12 @@ acpi_EnterDebugger(void)
     static int         initted = 0;
 
     if (!initted) {
-       printf("Initialising ACPICA debugger...\n");
+       kprintf("Initialising ACPICA debugger...\n");
        AcpiDbInitialize();
        initted = 1;
     }
 
-    printf("Entering ACPICA debugger...\n");
+    kprintf("Entering ACPICA debugger...\n");
     AcpiDbUserCommands('A', &obj);
 }
 #endif /* ACPI_DEBUGGER */
index d455a48..5a2d439 100644 (file)
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.13 2004/04/14 03:39:08 njl Exp $
- * $DragonFly: src/sys/dev/acpica5/Osd/OsdHardware.c,v 1.3 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/Osd/OsdHardware.c,v 1.4 2006/12/22 23:26:14 swildner Exp $
  */
 
 /*
@@ -174,7 +174,7 @@ acpi_bus_number(ACPI_HANDLE root, ACPI_HANDLE curr, ACPI_PCI_ID *PciId)
     if (root == curr) {
        status = acpi_GetInteger(root, "_BBN", &bus);
        if (ACPI_FAILURE(status) && bootverbose)
-           printf("acpi_bus_number: root bus has no _BBN, assuming 0\n");
+           kprintf("acpi_bus_number: root bus has no _BBN, assuming 0\n");
        return (bus);
     }
     status = AcpiGetParent(curr, &parent);
@@ -186,14 +186,14 @@ acpi_bus_number(ACPI_HANDLE root, ACPI_HANDLE curr, ACPI_PCI_ID *PciId)
 
     /* Validate parent bus device type. */
     if (ACPI_FAILURE(AcpiGetType(parent, &type)) || type != ACPI_TYPE_DEVICE) {
-       printf("acpi_bus_number: not a device, type %d\n", type);
+       kprintf("acpi_bus_number: not a device, type %d\n", type);
        return (bus);
     }
 
     /* Get the parent's slot and function. */
     status = acpi_GetInteger(parent, "_ADR", &adr);
     if (ACPI_FAILURE(status)) {
-       printf("acpi_bus_number: can't get _ADR\n");
+       kprintf("acpi_bus_number: can't get _ADR\n");
        return (bus);
     }
     slot = ACPI_HIWORD(adr);
@@ -236,7 +236,7 @@ AcpiOsDerivePciId(ACPI_HANDLE rhandle, ACPI_HANDLE chandle, ACPI_PCI_ID **PciId)
     if (rhandle == chandle) {
        status = acpi_GetInteger(rhandle, "_BBN", &bus);
        if (ACPI_FAILURE(status) && bootverbose)
-           printf("AcpiOsDerivePciId: root bus has no _BBN, assuming 0\n");
+           kprintf("AcpiOsDerivePciId: root bus has no _BBN, assuming 0\n");
     }
 
     /*
@@ -249,7 +249,7 @@ AcpiOsDerivePciId(ACPI_HANDLE rhandle, ACPI_HANDLE chandle, ACPI_PCI_ID **PciId)
        bus = acpi_bus_number(rhandle, parent, *PciId);
     (*PciId)->Bus = bus;
     if (bootverbose) {
-       printf("AcpiOsDerivePciId: bus %d dev %d func %d\n",
+       kprintf("AcpiOsDerivePciId: bus %d dev %d func %d\n",
            (*PciId)->Bus, (*PciId)->Device, (*PciId)->Function);
     }
 }
index 3e2f5cb..ba6a7d8 100644 (file)
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.11 2004/04/14 03:39:08 njl Exp $
- * $DragonFly: src/sys/dev/acpica5/Osd/OsdMemory.c,v 1.4 2006/09/05 00:55:36 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/Osd/OsdMemory.c,v 1.5 2006/12/22 23:26:14 swildner Exp $
  */
 
 /*
@@ -108,7 +108,7 @@ again:
        ) {
            *ptrack = track->next;
            pmap_unmapdev((vm_offset_t)track->base, track->size);
-           printf("AcpiOsUnmapMemory: Warning, deallocation request too"
+           kprintf("AcpiOsUnmapMemory: Warning, deallocation request too"
                   " large! %p/%08x (actual was %p/%08x)\n",
                   LogicalAddress, Length,
                   track->base, track->size);
@@ -122,13 +122,13 @@ again:
        if ((char *)LogicalAddress + Length >= (char *)track->base &&
            (char *)LogicalAddress < (char *)track->base + track->size
        ) {
-           printf("AcpiOsUnmapMemory: Warning, deallocation did not "
+           kprintf("AcpiOsUnmapMemory: Warning, deallocation did not "
                   "track allocation: %p/%08x (actual was %p/%08x)\n",
                   LogicalAddress, Length,
                   track->base, track->size);
        }
     }
-    printf("AcpiOsUnmapMemory: Warning, broken ACPI, bad unmap: %p/%08x\n",
+    kprintf("AcpiOsUnmapMemory: Warning, broken ACPI, bad unmap: %p/%08x\n",
        LogicalAddress, Length);
 }
 
index 1fa1966..f16c006 100644 (file)
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.21 2004/05/05 20:07:52 njl Exp $
- * $DragonFly: src/sys/dev/acpica5/Osd/OsdSynch.c,v 1.8 2006/09/05 00:55:36 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/Osd/OsdSynch.c,v 1.9 2006/12/22 23:26:14 swildner Exp $
  */
 
 /*
@@ -167,7 +167,7 @@ AcpiOsWaitSemaphore(ACPI_HANDLE Handle, UINT32 Units, UINT16 Timeout)
 
 #if 0
     if (as->as_units < Units && as->as_timeouts > 10) {
-       printf("%s: semaphore %p too many timeouts, resetting\n", __func__, as);
+       kprintf("%s: semaphore %p too many timeouts, resetting\n", __func__, as);
        AS_LOCK(as);
        as->as_units = as->as_maxunits;
        if (as->as_pendings)
@@ -236,7 +236,7 @@ AcpiOsWaitSemaphore(ACPI_HANDLE Handle, UINT32 Units, UINT16 Timeout)
        as->as_pendings++;
 
        if (acpi_semaphore_debug) {
-           printf("%s: Sleep %d, pending %d, semaphore %p, thread %d\n",
+           kprintf("%s: Sleep %d, pending %d, semaphore %p, thread %d\n",
                __func__, Timeout, as->as_pendings, as, AcpiOsGetThreadId());
        }
 
@@ -279,7 +279,7 @@ AcpiOsWaitSemaphore(ACPI_HANDLE Handle, UINT32 Units, UINT16 Timeout)
            tmo = 1;
 
        if (acpi_semaphore_debug) {
-           printf("%s: Wakeup timeleft(%lu, %lu), tmo %u, sem %p, thread %d\n",
+           kprintf("%s: Wakeup timeleft(%lu, %lu), tmo %u, sem %p, thread %d\n",
                __func__, timelefttv.tv_sec, timelefttv.tv_usec, tmo, as,
                AcpiOsGetThreadId());
        }
@@ -287,11 +287,11 @@ AcpiOsWaitSemaphore(ACPI_HANDLE Handle, UINT32 Units, UINT16 Timeout)
 
     if (acpi_semaphore_debug) {
        if (result == AE_TIME && Timeout > 0) {
-           printf("%s: Timeout %d, pending %d, semaphore %p\n",
+           kprintf("%s: Timeout %d, pending %d, semaphore %p\n",
                __func__, Timeout, as->as_pendings, as);
        }
        if (result == AE_OK && (as->as_timeouts > 0 || as->as_pendings > 0)) {
-           printf("%s: Acquire %d, units %d, pending %d, sem %p, thread %d\n",
+           kprintf("%s: Acquire %d, units %d, pending %d, sem %p, thread %d\n",
                __func__, Units, as->as_units, as->as_pendings, as,
                AcpiOsGetThreadId());
        }
@@ -332,7 +332,7 @@ AcpiOsSignalSemaphore(ACPI_HANDLE Handle, UINT32 Units)
     }
 
     if (acpi_semaphore_debug && (as->as_timeouts > 0 || as->as_pendings > 0)) {
-       printf("%s: Release %d, units %d, pending %d, semaphore %p, thread %d\n",
+       kprintf("%s: Release %d, units %d, pending %d, semaphore %p, thread %d\n",
            __func__, Units, as->as_units, as->as_pendings, as, AcpiOsGetThreadId());
     }
 
index afd6c02..e7483c8 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/Osd/OsdTable.c,v 1.7 2004/04/20 17:13:08 njl Exp $
- * $DragonFly: src/sys/dev/acpica5/Osd/OsdTable.c,v 1.2 2004/06/27 08:52:42 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/Osd/OsdTable.c,v 1.3 2006/12/22 23:26:14 swildner Exp $
  */
 
 /*
@@ -52,7 +52,7 @@ AcpiOsPredefinedOverride (
 
     *NewVal = NULL;
     if (strncmp(InitVal->Name, "_OS_", 4) == 0 && strlen(acpi_osname) > 0) {
-       printf("ACPI: Overriding _OS definition with \"%s\"\n", acpi_osname);
+       kprintf("ACPI: Overriding _OS definition with \"%s\"\n", acpi_osname);
        *NewVal = acpi_osname;
     }
 
@@ -78,6 +78,6 @@ AcpiOsTableOverride (
         return(AE_OK);
 
     *NewTable = *(void **)p;
-    printf("ACPI: DSDT was overridden.\n");
+    kprintf("ACPI: DSDT was overridden.\n");
     return (AE_OK);
 }
index 8944a28..56723cd 100644 (file)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *     $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.157 2004/06/05 09:56:04 njl Exp $
- *     $DragonFly: src/sys/dev/acpica5/acpi.c,v 1.25 2006/12/20 18:14:38 dillon Exp $
+ *     $DragonFly: src/sys/dev/acpica5/acpi.c,v 1.26 2006/12/22 23:26:14 swildner Exp $
  */
 
 #include "opt_acpi.h"
@@ -222,7 +222,7 @@ acpi_modevent(struct module *mod, int event, void *junk)
     switch(event) {
     case MOD_LOAD:
        if (!cold) {
-           printf("The ACPI driver cannot be loaded after boot.\n");
+           kprintf("The ACPI driver cannot be loaded after boot.\n");
            return (EPERM);
        }
        break;
@@ -274,7 +274,7 @@ acpi_Startup(void)
     }
 #endif
     if (ACPI_FAILURE(error = AcpiInitializeSubsystem())) {
-       printf("ACPI: initialisation failed: %s\n", AcpiFormatException(error));
+       kprintf("ACPI: initialisation failed: %s\n", AcpiFormatException(error));
        return_VALUE (error);
     }
 #ifdef ACPI_DEBUGGER
@@ -287,7 +287,7 @@ acpi_Startup(void)
 #endif
 
     if (ACPI_FAILURE(error = AcpiLoadTables())) {
-       printf("ACPI: table load failed: %s\n", AcpiFormatException(error));
+       kprintf("ACPI: table load failed: %s\n", AcpiFormatException(error));
        return_VALUE(error);
     }
 
@@ -775,7 +775,7 @@ acpi_read_ivar(device_t dev, device_t child, int index, uintptr_t *result)
     struct acpi_device *ad;
 
     if ((ad = device_get_ivars(child)) == NULL) {
-       printf("device has no ivars\n");
+       kprintf("device has no ivars\n");
        return (ENOENT);
     }
 
@@ -811,7 +811,7 @@ acpi_write_ivar(device_t dev, device_t child, int index, uintptr_t value)
     struct acpi_device *ad;
 
     if ((ad = device_get_ivars(child)) == NULL) {
-       printf("device has no ivars\n");
+       kprintf("device has no ivars\n");
        return (ENOENT);
     }
 
@@ -1207,14 +1207,14 @@ acpi_shutdown_final(void *arg, int howto)
     if ((howto & RB_POWEROFF) != 0) {
        status = AcpiEnterSleepStatePrep(ACPI_STATE_S5);
        if (ACPI_FAILURE(status)) {
-           printf("AcpiEnterSleepStatePrep failed - %s\n",
+           kprintf("AcpiEnterSleepStatePrep failed - %s\n",
                   AcpiFormatException(status));
            return;
        }
-       printf("Powering system off using ACPI\n");
+       kprintf("Powering system off using ACPI\n");
        acpi_shutdown_poweroff(NULL);
     } else {
-       printf("Shutting down ACPI\n");
+       kprintf("Shutting down ACPI\n");
        AcpiTerminate();
     }
 }
@@ -1237,10 +1237,10 @@ acpi_shutdown_poweroff(void *arg)
     ACPI_DISABLE_IRQS();
     status = AcpiEnterSleepState(ACPI_STATE_S5);
     if (ACPI_FAILURE(status)) {
-       printf("ACPI power-off failed - %s\n", AcpiFormatException(status));
+       kprintf("ACPI power-off failed - %s\n", AcpiFormatException(status));
     } else {
        DELAY(1000000);
-       printf("ACPI power-off failed - timeout\n");
+       kprintf("ACPI power-off failed - timeout\n");
     }
 }
 
@@ -2738,20 +2738,20 @@ acpi_set_debugging(void *junk)
     if (layer == NULL && level == NULL)
        return;
 
-    printf("ACPI set debug");
+    kprintf("ACPI set debug");
     if (layer != NULL) {
        if (strcmp("NONE", layer) != 0)
-           printf(" layer '%s'", layer);
+           kprintf(" layer '%s'", layer);
        acpi_parse_debug(layer, &dbg_layer[0], &AcpiDbgLayer);
        freeenv(layer);
     }
     if (level != NULL) {
        if (strcmp("NONE", level) != 0)
-           printf(" level '%s'", level);
+           kprintf(" level '%s'", level);
        acpi_parse_debug(level, &dbg_level[0], &AcpiDbgLevel);
        freeenv(level);
     }
-    printf("\n");
+    kprintf("\n");
 }
 SYSINIT(acpi_debugging, SI_SUB_TUNABLES, SI_ORDER_ANY, acpi_set_debugging,
        NULL);
index 0910982..e5a17dd 100644 (file)
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.41 2004/06/24 00:38:51 njl Exp $
- * $DragonFly: src/sys/dev/acpica5/acpi_cpu.c,v 1.16 2006/12/20 18:14:38 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_cpu.c,v 1.17 2006/12/22 23:26:14 swildner Exp $
  */
 
 #include "opt_acpi.h"
@@ -792,7 +792,7 @@ acpi_cpu_startup_throttling(void)
     acpi_cpu_throttle_set(cpu_throttle_max);
     ACPI_UNLOCK;
 
-    printf("acpi_cpu: throttling enabled, %d steps (100%% to %d.%d%%), "
+    kprintf("acpi_cpu: throttling enabled, %d steps (100%% to %d.%d%%), "
           "currently %d.%d%%\n", CPU_MAX_SPEED, CPU_SPEED_PRINTABLE(1),
           CPU_SPEED_PRINTABLE(cpu_throttle_state));
 }
@@ -838,7 +838,7 @@ acpi_cpu_startup_cx(void)
     if (ncpus == 1)
        cpu_idle_hook = acpi_cpu_idle;
     else
-       printf("Warning: ACPI idle hook not yet supported for SMP\n");
+       kprintf("Warning: ACPI idle hook not yet supported for SMP\n");
 }
 
 /*
index 9e03628..7bafe27 100644 (file)
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.51 2004/05/30 20:08:23 phk Exp $
- * $DragonFly: src/sys/dev/acpica5/acpi_ec.c,v 1.10 2006/12/20 18:14:38 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_ec.c,v 1.11 2006/12/22 23:26:14 swildner Exp $
  */
 /******************************************************************************
  *
  *****************************************************************************/
  /*
   * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.51 2004/05/30 20:08:23 phk Exp $
-  * $DragonFly: src/sys/dev/acpica5/acpi_ec.c,v 1.10 2006/12/20 18:14:38 dillon Exp $
+  * $DragonFly: src/sys/dev/acpica5/acpi_ec.c,v 1.11 2006/12/22 23:26:14 swildner Exp $
   *
   */
 
@@ -385,7 +385,7 @@ acpi_ec_ecdt_probe(device_t parent)
     /* Create the child device with the given unit number. */
     child = BUS_ADD_CHILD(parent, parent, 0, "acpi_ec", ecdt->uid);
     if (child == NULL) {
-       printf("%s: can't add child\n", __func__);
+       kprintf("%s: can't add child\n", __func__);
        return;
     }
 
@@ -393,7 +393,7 @@ acpi_ec_ecdt_probe(device_t parent)
     status = AcpiGetHandle(NULL, ecdt->ec_id, &h);
     if (ACPI_FAILURE(status)) {
        device_delete_child(parent, child);
-       printf("%s: can't get handle\n", __func__);
+       kprintf("%s: can't get handle\n", __func__);
        return;
     }
     acpi_set_handle(child, h);
@@ -698,7 +698,7 @@ re_enable:
     /* Re-enable the GPE event so we'll get future requests. */
     Status = AcpiEnableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_NOT_ISR);
     if (ACPI_FAILURE(Status))
-       printf("EcGpeQueryHandler: AcpiEnableEvent failed\n");
+       kprintf("EcGpeQueryHandler: AcpiEnableEvent failed\n");
 }
 
 /*
@@ -721,10 +721,10 @@ EcGpeHandler(void *Context)
     Status = AcpiOsQueueForExecution(OSD_PRIORITY_GPE, EcGpeQueryHandler,
                Context);
     if (ACPI_FAILURE(Status)) {
-       printf("Queuing GPE query handler failed.\n");
+       kprintf("Queuing GPE query handler failed.\n");
        Status = AcpiEnableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_NOT_ISR);
        if (ACPI_FAILURE(Status))
-           printf("EcGpeHandler: AcpiEnableEvent failed\n");
+           kprintf("EcGpeHandler: AcpiEnableEvent failed\n");
     }
 
     return (0);
index 8df8706..856b910 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.16 2004/06/14 18:54:14 jhb Exp $
- * $DragonFly: src/sys/dev/acpica5/acpi_pci_link.c,v 1.6 2006/12/20 18:14:38 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_pci_link.c,v 1.7 2006/12/22 23:26:14 swildner Exp $
  */
 
 #include "opt_acpi.h"
@@ -88,13 +88,13 @@ acpi_pci_link_dump_polarity(UINT32 ActiveHighLow)
 
        switch (ActiveHighLow) {
        case ACPI_ACTIVE_HIGH:
-               printf("high,");
+               kprintf("high,");
                break;
        case ACPI_ACTIVE_LOW:
-               printf("low,");
+               kprintf("low,");
                break;
        default:
-               printf("unknown,");
+               kprintf("unknown,");
                break;
        }
 }
@@ -105,13 +105,13 @@ acpi_pci_link_dump_trigger(UINT32 EdgeLevel)
 
        switch (EdgeLevel) {
        case ACPI_EDGE_SENSITIVE:
-               printf("edge,");
+               kprintf("edge,");
                break;
        case ACPI_LEVEL_SENSITIVE:
-               printf("level,");
+               kprintf("level,");
                break;
        default:
-               printf("unknown,");
+               kprintf("unknown,");
                break;
        }
 }
@@ -122,13 +122,13 @@ acpi_pci_link_dump_sharemode(UINT32 SharedExclusive)
 
        switch (SharedExclusive) {
        case ACPI_EXCLUSIVE:
-               printf("exclusive");
+               kprintf("exclusive");
                break;
        case ACPI_SHARED:
-               printf("sharable");
+               kprintf("sharable");
                break;
        default:
-               printf("unknown");
+               kprintf("unknown");
                break;
        }
 }
@@ -143,13 +143,13 @@ acpi_pci_link_entry_dump(struct acpi_prt_entry *entry)
        if (entry == NULL || entry->pci_link == NULL)
                return;
 
-       printf("%s irq %3d: ", acpi_name(entry->pci_link->handle),
+       kprintf("%s irq %3d: ", acpi_name(entry->pci_link->handle),
            entry->pci_link->current_irq);
 
-       printf("[");
+       kprintf("[");
        for (i = 0; i < entry->pci_link->number_of_interrupts; i++)
-               printf("%3d", entry->pci_link->interrupts[i]);
-       printf("] ");
+               kprintf("%3d", entry->pci_link->interrupts[i]);
+       kprintf("] ");
 
        switch (entry->pci_link->possible_resources.Id) {
        case ACPI_RSTYPE_IRQ:
@@ -166,7 +166,7 @@ acpi_pci_link_entry_dump(struct acpi_prt_entry *entry)
                break;
        }
 
-       printf(" %d.%d.%d\n", entry->busno,
+       kprintf(" %d.%d.%d\n", entry->busno,
            (int)((entry->prt.Address & 0xffff0000) >> 16),
            (int)entry->prt.Pin);
 }
@@ -667,21 +667,21 @@ acpi_pci_link_bootdisabled_dump(void)
                if (link->current_irq != 0)
                        continue;
 
-               printf("%s:\n", acpi_name(link->handle));
-               printf("        interrupts:     ");
+               kprintf("%s:\n", acpi_name(link->handle));
+               kprintf("       interrupts:     ");
                for (i = 0; i < link->number_of_interrupts; i++) {
                        irq = link->sorted_irq[i];
-                       printf("%6d", irq);
+                       kprintf("%6d", irq);
                }
-               printf("\n");
-               printf("        penalty:        ");
+               kprintf("\n");
+               kprintf("       penalty:        ");
                for (i = 0; i < link->number_of_interrupts; i++) {
                        irq = link->sorted_irq[i];
-                       printf("%6d", irq_penalty[irq]);
+                       kprintf("%6d", irq_penalty[irq]);
                }
-               printf("\n");
-               printf("        references:     %d\n", link->references);
-               printf("        priority:       %d\n", link->priority);
+               kprintf("\n");
+               kprintf("       references:     %d\n", link->references);
+               kprintf("       priority:       %d\n", link->priority);
        }
 }
 
@@ -793,7 +793,7 @@ acpi_pci_link_set_bootdisabled_priority(void)
        TAILQ_HEAD(, acpi_pci_link_entry) sorted_list;
 
        if (bootverbose) {
-               printf("ACPI PCI link before setting link priority:\n");
+               kprintf("ACPI PCI link before setting link priority:\n");
                acpi_pci_link_bootdisabled_dump();
        }
 
@@ -858,7 +858,7 @@ acpi_pci_link_fixup_bootdisabled_link(void)
        ACPI_STATUS             error;
 
        if (bootverbose) {
-               printf("ACPI PCI link before fixup for boot-disabled links:\n");
+               kprintf("ACPI PCI link before fixup for boot-disabled links:\n");
                acpi_pci_link_bootdisabled_dump();
        }
 
@@ -894,7 +894,7 @@ acpi_pci_link_fixup_bootdisabled_link(void)
        }
 
        if (bootverbose) {
-               printf("ACPI PCI link after fixup for boot-disabled links:\n");
+               kprintf("ACPI PCI link after fixup for boot-disabled links:\n");
                acpi_pci_link_bootdisabled_dump();
        }
 }
@@ -950,7 +950,7 @@ acpi_pci_link_config(device_t dev, ACPI_BUFFER *prtbuf, int busno)
        }
 
        if (bootverbose) {
-               printf("ACPI PCI link initial configuration:\n");
+               kprintf("ACPI PCI link initial configuration:\n");
                TAILQ_FOREACH(entry, &acpi_prt_entries, links) {
                        if (entry->busno != busno)
                                continue;
@@ -999,7 +999,7 @@ acpi_pci_link_config(device_t dev, ACPI_BUFFER *prtbuf, int busno)
        acpi_pci_link_fixup_bootdisabled_link();
 
        if (bootverbose) {
-               printf("ACPI PCI link arbitrated configuration:\n");
+               kprintf("ACPI PCI link arbitrated configuration:\n");
                TAILQ_FOREACH(entry, &acpi_prt_entries, links) {
                        if (entry->busno != busno)
                                continue;
index 5847a93..37c96a9 100644 (file)
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.43 2004/05/06 02:18:58 njl Exp $
- * $DragonFly: src/sys/dev/acpica5/acpi_pcib.c,v 1.2 2004/06/27 08:52:39 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_pcib.c,v 1.3 2006/12/22 23:26:14 swildner Exp $
  */
 
 #include "opt_acpi.h"
@@ -339,8 +339,8 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin,
      */
     device_printf(pcib, "possible interrupts:");
     for (i = 0; i < NumberOfInterrupts; i++)
-       printf("  %d", Interrupts[i]);
-    printf("\n");
+       kprintf("  %d", Interrupts[i]);
+    kprintf("\n");
 
     /* This should never happen. */
     if (crsbuf.Pointer != NULL)
index bbfb40b..cf1fcc4 100644 (file)
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.24 2004/05/30 20:08:23 phk Exp $
- * $DragonFly: src/sys/dev/acpica5/acpi_resource.c,v 1.4 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_resource.c,v 1.5 2006/12/22 23:26:14 swildner Exp $
  */
 
 #include "opt_acpi.h"
@@ -78,7 +78,7 @@ acpi_parse_resources(device_t dev, ACPI_HANDLE handle,
     buf.Length = ACPI_ALLOCATE_BUFFER;
     if (ACPI_FAILURE((status = AcpiGetCurrentResources(handle, &buf)))) {
        if (status != AE_NOT_FOUND)
-           printf("can't fetch resources for %s - %s\n",
+           kprintf("can't fetch resources for %s - %s\n",
                   acpi_name(handle), AcpiFormatException(status));
        return_ACPI_STATUS (status);
     }
index 6246fdd..6e036c3 100644 (file)
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.33 2004/05/30 20:08:23 phk Exp $
- * $DragonFly: src/sys/dev/acpica5/acpi_timer.c,v 1.10 2006/12/20 18:14:38 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_timer.c,v 1.11 2006/12/22 23:26:14 swildner Exp $
  */
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -358,7 +358,7 @@ acpi_timer_test(void)
     else
        n = 1;
     if (bootverbose) {
-       printf("ACPI timer looks %s min = %d, max = %d, width = %d\n",
+       kprintf("ACPI timer looks %s min = %d, max = %d, width = %d\n",
                n ? "GOOD" : "BAD ",
                min, max, max - min);
     }
index aa94b9b..a15a739 100644 (file)
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.69 2004/05/28 07:15:55 njl Exp $
- * $DragonFly: src/sys/dev/acpica5/acpivar.h,v 1.9 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpivar.h,v 1.10 2006/12/22 23:26:14 swildner Exp $
  */
 
 #include "bus_if.h"
@@ -199,7 +199,7 @@ void                acpi_EnterDebugger(void);
 
 #ifdef ACPI_DEBUG
 #include <sys/cons.h>
-#define STEP(x)                do {printf x, printf("\n"); cngetc();} while (0)
+#define STEP(x)                do {kprintf x, kprintf("\n"); cngetc();} while (0)
 #else
 #define STEP(x)
 #endif
index 1c8abbc..0de56ad 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *     $FreeBSD: src/sys/pci/agp.c,v 1.3.2.4 2002/08/11 19:58:12 alc Exp $
- *     $DragonFly: src/sys/dev/agp/agp.c,v 1.25 2006/10/25 20:55:52 dillon Exp $
+ *     $DragonFly: src/sys/dev/agp/agp.c,v 1.26 2006/12/22 23:26:14 swildner Exp $
  */
 
 #include "opt_bus.h"
@@ -430,7 +430,7 @@ agp_generic_alloc_memory(device_t dev, int type, vm_size_t size)
                return 0;
 
        if (type != 0) {
-               printf("agp_generic_alloc_memory: unsupported type %d\n",
+               kprintf("agp_generic_alloc_memory: unsupported type %d\n",
                       type);
                return 0;
        }
@@ -487,7 +487,7 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem,
                device_printf(dev, "binding memory at bad offset %#x,%#x,%#x\n",
                              (int) offset, (int)mem->am_size,
                              (int)AGP_GET_APERTURE(dev));
-               printf("Check BIOS's aperature size vs X\n");
+               kprintf("Check BIOS's aperature size vs X\n");
                lockmgr(&sc->as_lock, LK_RELEASE);
                return EINVAL;
        }
index fdff12e..2ef4797 100644 (file)
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *     $FreeBSD: src/sys/pci/agp_i810.c,v 1.1.2.5 2002/09/15 08:45:41 anholt Exp $
- *     $DragonFly: src/sys/dev/agp/agp_i810.c,v 1.10 2006/10/25 20:55:52 dillon Exp $
+ *     $DragonFly: src/sys/dev/agp/agp_i810.c,v 1.11 2006/12/22 23:26:14 swildner Exp $
  */
 
 /*
@@ -187,7 +187,7 @@ agp_i810_probe(device_t dev)
                bdev = agp_i810_find_bridge(dev);
                if (!bdev) {
                        if (bootverbose)
-                               printf("I810: can't find bridge device\n");
+                               kprintf("I810: can't find bridge device\n");
                        return ENXIO;
                }
 
@@ -204,7 +204,7 @@ agp_i810_probe(device_t dev)
                        if ((smram & AGP_I810_SMRAM_GMS)
                            == AGP_I810_SMRAM_GMS_DISABLED) {
                                if (bootverbose)
-                                       printf("I810: disabled, not probing\n");
+                                       kprintf("I810: disabled, not probing\n");
                                return ENXIO;
                        }
                        break;
@@ -216,7 +216,7 @@ agp_i810_probe(device_t dev)
                        gcc1 = pci_read_config(bdev, AGP_I830_GCC1, 1);
                        if ((gcc1 & AGP_I830_GCC1_DEV2) == AGP_I830_GCC1_DEV2_DISABLED) {
                                if (bootverbose)
-                                       printf("I830: disabled, not probing\n");
+                                       kprintf("I830: disabled, not probing\n");
                                        return ENXIO;
                        }
                        break;
index 51519ad..0077fba 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *     $FreeBSD: src/sys/pci/agp_intel.c,v 1.1.2.5 2003/06/02 17:38:19 jhb Exp $
- *     $DragonFly: src/sys/dev/agp/agp_intel.c,v 1.6 2005/02/17 13:59:35 joerg Exp $
+ *     $DragonFly: src/sys/dev/agp/agp_intel.c,v 1.7 2006/12/22 23:26:14 swildner Exp $
  */
 
 #include "opt_bus.h"
@@ -264,7 +264,7 @@ agp_intel_detach(device_t dev)
        case 0x1a218086: /* i840 */
        case 0x25308086: /* i850 */
        case 0x25318086: /* i860 */
-               printf("%s: set MCHCFG to %x\n", __func__, (unsigned)
+               kprintf("%s: set MCHCFG to %x\n", __func__, (unsigned)
                                (pci_read_config(dev, AGP_INTEL_MCHCFG, 2)
                                & ~(1 << 9)));
                pci_write_config(dev, AGP_INTEL_MCHCFG,
@@ -273,7 +273,7 @@ agp_intel_detach(device_t dev)
 
        case 0x25008086: /* i820 */
        case 0x25018086: /* i820 */
-               printf("%s: set RDCR to %x\n", __func__, (unsigned)
+               kprintf("%s: set RDCR to %x\n", __func__, (unsigned)
                                (pci_read_config(dev, AGP_INTEL_I820_RDCR, 1)
                                & ~(1 << 1)));
                pci_write_config(dev, AGP_INTEL_I820_RDCR,
@@ -285,7 +285,7 @@ agp_intel_detach(device_t dev)
        case 0x33408086: /* i855 */
        case 0x25708086: /* i865 */
        case 0x25788086: /* i875P */
-               printf("%s: set MCHCFG to %x\n", __func__, (unsigned)
+               kprintf("%s: set MCHCFG to %x\n", __func__, (unsigned)
                                (pci_read_config(dev, AGP_INTEL_I845_MCHCFG, 1)
                                & ~(1 << 1)));
                pci_write_config(dev, AGP_INTEL_MCHCFG,
@@ -293,7 +293,7 @@ agp_intel_detach(device_t dev)
                                & ~(1 << 1)), 1);
 
        default: /* Intel Generic (maybe) */
-               printf("%s: set NBXCFG to %x\n", __func__,
+               kprintf("%s: set NBXCFG to %x\n", __func__,
                                 (pci_read_config(dev, AGP_INTEL_NBXCFG, 4)
                                  & ~(1 << 9)));
                pci_write_config(dev, AGP_INTEL_NBXCFG,
index dc9d2a2..0e2a1d2 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *     $FreeBSD: src/sys/pci/agppriv.h,v 1.3.2.1 2000/07/19 09:48:04 ru Exp $
- *     $DragonFly: src/sys/dev/agp/agppriv.h,v 1.4 2004/05/19 22:52:40 dillon Exp $
+ *     $DragonFly: src/sys/dev/agp/agppriv.h,v 1.5 2006/12/22 23:26:15 swildner Exp $
  */
 
 #ifndef _PCI_AGPPRIV_H_
@@ -41,8 +41,8 @@
 
 #ifdef AGP_DEBUG
 #define AGP_DPF(x...) do {                     \
-    printf("agp: ");                           \
-    printf(##x);                               \
+    kprintf("agp: ");                          \
+    kprintf(##x);                              \
 } while (0)
 #else
 #define AGP_DPF(x...) do {} while (0)
index 937e055..c1ab29e 100644 (file)
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/en/midway.c,v 1.19.2.1 2003/01/23 21:06:42 sam Exp $
- * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.21 2005/11/28 17:13:37 dillon Exp $
+ * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.22 2006/12/22 23:26:15 swildner Exp $
  */
 
 /*
@@ -668,7 +668,7 @@ done_probe:
 
   reg = EN_READ(sc, MID_RESID);
 
-  printf("%s: ATM midway v%d, board IDs %d.%d, %s%s%s, %ldKB on-board RAM\n",
+  kprintf("%s: ATM midway v%d, board IDs %d.%d, %s%s%s, %ldKB on-board RAM\n",
        sc->sc_dev.dv_xname, MID_VER(reg), MID_MID(reg), MID_DID(reg), 
        (MID_IS_SABRE(reg)) ? "sabre controller, " : "",
        (MID_IS_SUNI(reg)) ? "SUNI" : "Utopia",
@@ -677,12 +677,12 @@ done_probe:
 
   if (sc->is_adaptec) {
     if (sc->bestburstlen == 64 && sc->alburst == 0)
-      printf("%s: passed 64 byte DMA test\n", sc->sc_dev.dv_xname);
+      kprintf("%s: passed 64 byte DMA test\n", sc->sc_dev.dv_xname);
     else
-      printf("%s: FAILED DMA TEST: burst=%d, alburst=%d\n", 
+      kprintf("%s: FAILED DMA TEST: burst=%d, alburst=%d\n", 
            sc->sc_dev.dv_xname, sc->bestburstlen, sc->alburst);
   } else {
-    printf("%s: maximum DMA burst length = %d bytes%s\n", sc->sc_dev.dv_xname,
+    kprintf("%s: maximum DMA burst length = %d bytes%s\n", sc->sc_dev.dv_xname,
          sc->bestburstlen, (sc->alburst) ? " (must align)" : "");
   }
 
@@ -711,7 +711,7 @@ done_probe:
   ptr = roundup(ptr, EN_TXSZ * 1024);  /* align */
   sz = sz - (ptr - sav);
   if (EN_TXSZ*1024 * EN_NTX > sz) {
-    printf("%s: EN_NTX/EN_TXSZ too big\n", sc->sc_dev.dv_xname);
+    kprintf("%s: EN_NTX/EN_TXSZ too big\n", sc->sc_dev.dv_xname);
     return;
   }
   for (lcv = 0 ; lcv < EN_NTX ; lcv++) {
@@ -724,7 +724,7 @@ done_probe:
     bzero(&sc->txslot[lcv].indma, sizeof(sc->txslot[lcv].indma));
     bzero(&sc->txslot[lcv].q, sizeof(sc->txslot[lcv].q));
 #ifdef EN_DEBUG
-    printf("%s: tx%d: start 0x%x, stop 0x%x\n", sc->sc_dev.dv_xname, lcv,
+    kprintf("%s: tx%d: start 0x%x, stop 0x%x\n", sc->sc_dev.dv_xname, lcv,
                sc->txslot[lcv].start, sc->txslot[lcv].stop);
 #endif
   }
@@ -734,7 +734,7 @@ done_probe:
   sz = sz - (ptr - sav);
   sc->en_nrx = sz / (EN_RXSZ * 1024);
   if (sc->en_nrx <= 0) {
-    printf("%s: EN_NTX/EN_TXSZ/EN_RXSZ too big\n", sc->sc_dev.dv_xname);
+    kprintf("%s: EN_NTX/EN_TXSZ/EN_RXSZ too big\n", sc->sc_dev.dv_xname);
     return;
   }
 
@@ -762,7 +762,7 @@ done_probe:
        (en_k2sz(EN_RXSZ) << MIDV_SZSHIFT) | MIDV_TRASH;
 
 #ifdef EN_DEBUG
-    printf("%s: rx%d: start 0x%x, stop 0x%x, mode 0x%x\n", sc->sc_dev.dv_xname,
+    kprintf("%s: rx%d: start 0x%x, stop 0x%x, mode 0x%x\n", sc->sc_dev.dv_xname,
        lcv, sc->rxslot[lcv].start, sc->rxslot[lcv].stop, sc->rxslot[lcv].mode);
 #endif
   }
@@ -776,10 +776,10 @@ done_probe:
 #endif
   sc->need_drqs = sc->need_dtqs = 0;
 
-  printf("%s: %d %dKB receive buffers, %d %dKB transmit buffers allocated\n",
+  kprintf("%s: %d %dKB receive buffers, %d %dKB transmit buffers allocated\n",
        sc->sc_dev.dv_xname, sc->en_nrx, EN_RXSZ, EN_NTX, EN_TXSZ);
 
-  printf("%s: End Station Identifier (mac address) %6D\n",
+  kprintf("%s: End Station Identifier (mac address) %6D\n",
         sc->sc_dev.dv_xname, sc->macaddr, ":");
 
   /*
@@ -879,10 +879,10 @@ struct en_softc *sc;
    * exhibit the problem later. so warn it here.
    */
   if (bestalgn != 64 || sc->alburst != 0) {
-    printf("%s: WARNING: DMA test detects a broken PCI chipset!\n", 
+    kprintf("%s: WARNING: DMA test detects a broken PCI chipset!\n", 
           sc->sc_dev.dv_xname);
-    printf("     trying to work around the problem...  but if this doesn't\n");
-    printf("     work for you, you'd better switch to a newer motherboard.\n");
+    kprintf("     trying to work around the problem...  but if this doesn't\n");
+    kprintf("     work for you, you'd better switch to a newer motherboard.\n");
   }
     return;
 }
@@ -945,7 +945,7 @@ int wmtry;
   for (lcv = 8 ; lcv <= MIDDMA_MAXBURST ; lcv = lcv * 2) {
 
 #ifdef EN_DEBUG
-    printf("DMA test lcv=%d, sp=0x%x, dp=0x%x, wmtry=%d\n",
+    kprintf("DMA test lcv=%d, sp=0x%x, dp=0x%x, wmtry=%d\n",
           lcv, sp, dp, wmtry);
 #endif
 
@@ -981,9 +981,9 @@ int wmtry;
       DELAY(1);
       cnt--;
       if (cnt == 0) {
-       printf("%s: unexpected timeout in tx DMA test\n", sc->sc_dev.dv_xname);
+       kprintf("%s: unexpected timeout in tx DMA test\n", sc->sc_dev.dv_xname);
 /*
-       printf("  alignment=0x%x, burst size=%d, dma addr reg=0x%x\n",
+       kprintf("  alignment=0x%x, burst size=%d, dma addr reg=0x%x\n",
               (u_long)sp & 63, lcv, EN_READ(sc, MID_DMA_ADDR));
 */            
        return(retval);         /* timeout, give up */
@@ -1001,7 +1001,7 @@ int wmtry;
       DELAY(1);
       cnt--;
       if (cnt == 0) {
-       printf("%s: unexpected timeout in tx DMA test\n", sc->sc_dev.dv_xname);
+       kprintf("%s: unexpected timeout in tx DMA test\n", sc->sc_dev.dv_xname);
        return(retval);         /* timeout, give up */
       }
     }
@@ -1009,7 +1009,7 @@ int wmtry;
 #endif /* !NBURSTS */
     reg = EN_READ(sc, MID_INTACK); 
     if ((reg & MID_INT_DMA_TX) != MID_INT_DMA_TX) {
-      printf("%s: unexpected status in tx DMA test: 0x%x\n", 
+      kprintf("%s: unexpected status in tx DMA test: 0x%x\n", 
                sc->sc_dev.dv_xname, reg);
       return(retval);
     }
@@ -1031,7 +1031,7 @@ int wmtry;
       DELAY(1);
       cnt--;
       if (cnt == 0) {
-       printf("%s: unexpected timeout in rx DMA test\n", sc->sc_dev.dv_xname);
+       kprintf("%s: unexpected timeout in rx DMA test\n", sc->sc_dev.dv_xname);
        return(retval);         /* timeout, give up */
       }
     }
@@ -1047,7 +1047,7 @@ int wmtry;
       DELAY(1);
       cnt--;
       if (cnt == 0) {
-       printf("%s: unexpected timeout in rx DMA test\n", sc->sc_dev.dv_xname);
+       kprintf("%s: unexpected timeout in rx DMA test\n", sc->sc_dev.dv_xname);
        return(retval);         /* timeout, give up */
       }
     }
@@ -1055,7 +1055,7 @@ int wmtry;
 #endif /* !NBURSTS */
     reg = EN_READ(sc, MID_INTACK); 
     if ((reg & MID_INT_DMA_RX) != MID_INT_DMA_RX) {
-      printf("%s: unexpected status in rx DMA test: 0x%x\n", 
+      kprintf("%s: unexpected status in rx DMA test: 0x%x\n", 
                sc->sc_dev.dv_xname, reg);
       return(retval);
     }
@@ -1067,7 +1067,7 @@ int wmtry;
   
 #ifdef NBURSTS
     if (bcmp(sp, dp, lcv * NBURSTS)) {
-/*      printf("DMA test failed! lcv=%d, sp=0x%x, dp=0x%x\n", lcv, sp, dp); */
+/*      kprintf("DMA test failed! lcv=%d, sp=0x%x, dp=0x%x\n", lcv, sp, dp); */
       return(retval);          /* failed, use last value */
     }
 #else
@@ -1138,7 +1138,7 @@ struct ucred *cr;
                        sc->rxslot[slot].raw_threshold = 0;
                }
 #ifdef EN_DEBUG
-               printf("%s: rxvci%d: turn %s raw (boodi) mode\n",
+               kprintf("%s: rxvci%d: turn %s raw (boodi) mode\n",
                        sc->sc_dev.dv_xname, ario->npcb->npcb_vci,
                        (ario->rawvalue) ? "on" : "off");
 #endif
@@ -1216,7 +1216,7 @@ int on;
   flags = ATM_PH_FLAGS(&pi->aph);
 
 #ifdef EN_DEBUG
-  printf("%s: %s vpi=%d, vci=%d, flags=%d\n", sc->sc_dev.dv_xname,
+  kprintf("%s: %s vpi=%d, vci=%d, flags=%d\n", sc->sc_dev.dv_xname,
        (on) ? "enable" : "disable", ATM_PH_VPI(&pi->aph), vci, flags);
 #endif
 
@@ -1249,7 +1249,7 @@ int on;
     sc->txspeed[vci] = 0;      /* full speed to start */
     sc->txvc2slot[vci] = 0;    /* init value */
     sc->txslot[0].nref++;      /* bump reference count */
-    en_loadvc(sc, vci);                /* does debug printf for us */
+    en_loadvc(sc, vci);                /* does debug kprintf for us */
     return(0);
   }
 
@@ -1287,7 +1287,7 @@ int on;
   }
   crit_exit();         /* enable enintr() */
 #ifdef EN_DEBUG
-  printf("%s: rx%d: VCI %d is now %s\n", sc->sc_dev.dv_xname, slot, vci,
+  kprintf("%s: rx%d: VCI %d is now %s\n", sc->sc_dev.dv_xname, slot, vci,
        (sc->rxslot[slot].oth_flags & ENOTHER_DRAIN) ? "draining" : "free");
 #endif
   return(0);
@@ -1309,7 +1309,7 @@ struct en_softc *sc;
   int lcv, slot;
 
 #ifdef EN_DEBUG
-  printf("%s: reset\n", sc->sc_dev.dv_xname);
+  kprintf("%s: reset\n", sc->sc_dev.dv_xname);
 #endif
 
   if (sc->en_busreset)
@@ -1342,7 +1342,7 @@ struct en_softc *sc;
       sc->rxslot[slot].oth_flags = ENOTHER_FREE;
       sc->rxvc2slot[lcv] = RX_NONE;
 #ifdef EN_DEBUG
-  printf("%s: rx%d: VCI %d is now free\n", sc->sc_dev.dv_xname, slot, lcv);
+  kprintf("%s: rx%d: VCI %d is now free\n", sc->sc_dev.dv_xname, slot, lcv);
 #endif
     }
   }
@@ -1386,7 +1386,7 @@ struct en_softc *sc;
 
   if ((sc->enif.if_flags & IFF_UP) == 0) {
 #ifdef EN_DEBUG
-    printf("%s: going down\n", sc->sc_dev.dv_xname);
+    kprintf("%s: going down\n", sc->sc_dev.dv_xname);
 #endif
     en_reset(sc);                      /* to be safe */
     sc->enif.if_flags &= ~IFF_RUNNING; /* disable */
@@ -1394,7 +1394,7 @@ struct en_softc *sc;
   }
 
 #ifdef EN_DEBUG
-  printf("%s: going up\n", sc->sc_dev.dv_xname);
+  kprintf("%s: going up\n", sc->sc_dev.dv_xname);
 #endif
   sc->enif.if_flags |= IFF_RUNNING;    /* enable */
 
@@ -1437,7 +1437,7 @@ struct en_softc *sc;
   sc->swsl_size = sc->swsl_head = sc->swsl_tail = 0;
 
 #ifdef EN_DEBUG
-  printf("%s: drq free/chip: %d/0x%x, dtq free/chip: %d/0x%x, hwslist: 0x%x\n", 
+  kprintf("%s: drq free/chip: %d/0x%x, dtq free/chip: %d/0x%x, hwslist: 0x%x\n", 
     sc->sc_dev.dv_xname, sc->drq_free, sc->drq_chip, 
     sc->dtq_free, sc->dtq_chip, sc->hwslistp);
 #endif
@@ -1452,7 +1452,7 @@ struct en_softc *sc;
     loc = loc >> MIDV_LOCTOPSHFT;      /* top 11 bits */
     EN_WRITE(sc, MIDX_PLACE(slot), MIDX_MKPLACE(en_k2sz(EN_TXSZ), loc));
 #ifdef EN_DEBUG
-    printf("%s: tx%d: place 0x%x\n", sc->sc_dev.dv_xname,  slot,
+    kprintf("%s: tx%d: place 0x%x\n", sc->sc_dev.dv_xname,  slot,
        EN_READ(sc, MIDX_PLACE(slot)));
 #endif
   }
@@ -1497,7 +1497,7 @@ int vc;
   sc->rxslot[slot].cur = sc->rxslot[slot].start;
 
 #ifdef EN_DEBUG
-    printf("%s: rx%d: assigned to VCI %d\n", sc->sc_dev.dv_xname, slot, vc);
+    kprintf("%s: rx%d: assigned to VCI %d\n", sc->sc_dev.dv_xname, slot, vc);
 #endif
 }
 
@@ -1585,7 +1585,7 @@ struct ifnet *ifp;
        */
 
       if (atm_vpi || atm_vci > MID_N_VC) {
-       printf("%s: output vpi=%d, vci=%d out of card range, dropping...\n", 
+       kprintf("%s: output vpi=%d, vci=%d out of card range, dropping...\n", 
                sc->sc_dev.dv_xname, atm_vpi, atm_vci);
        m_freem(m);
        continue;
@@ -1611,9 +1611,9 @@ struct ifnet *ifp;
       toadd = need - got;              /* recompute, including zero padding */
 
 #ifdef EN_DEBUG
-      printf("%s: txvci%d: mlen=%d, got=%d, need=%d, toadd=%d, cell#=%d\n",
+      kprintf("%s: txvci%d: mlen=%d, got=%d, need=%d, toadd=%d, cell#=%d\n",
        sc->sc_dev.dv_xname, atm_vci, mlen, got, need, toadd, cellcnt);
-      printf("     leading_space=%d, trailing_space=%d\n", 
+      kprintf("     leading_space=%d, trailing_space=%d\n", 
        M_LEADINGSPACE(m), M_TRAILINGSPACE(lastm));
 #endif
 
@@ -1668,7 +1668,7 @@ struct ifnet *ifp;
        EN_COUNT(sc->txmbovr);
        m_freem(m);
 #ifdef EN_DEBUG
-       printf("%s: tx%d: buffer space shortage\n", sc->sc_dev.dv_xname,
+       kprintf("%s: tx%d: buffer space shortage\n", sc->sc_dev.dv_xname,
                txchan);
 #endif
        continue;
@@ -1677,10 +1677,10 @@ struct ifnet *ifp;
       sc->txslot[txchan].mbsize += mlen;
 
 #ifdef EN_DEBUG
-      printf("%s: tx%d: VPI=%d, VCI=%d, FLAGS=0x%x, speed=0x%x\n",
+      kprintf("%s: tx%d: VPI=%d, VCI=%d, FLAGS=0x%x, speed=0x%x\n",
        sc->sc_dev.dv_xname, txchan, atm_vpi, atm_vci, atm_flags, 
        sc->txspeed[atm_vci]);
-      printf("     adjusted mlen=%d, mbsize=%d\n", mlen, 
+      kprintf("     adjusted mlen=%d, mbsize=%d\n", mlen, 
                sc->txslot[txchan].mbsize);
 #endif
 
@@ -1710,7 +1710,7 @@ STATIC int en_makeexclusive(sc, mm, prev)
     if (m->m_flags & M_EXT) {
        if (!(m->m_flags & M_EXT_CLUSTER)) {
            /* external buffer isn't an ordinary mbuf cluster! */
-           printf("%s: mfix: special buffer! can't make a copy!\n",
+           kprintf("%s: mfix: special buffer! can't make a copy!\n",
                   sc->sc_dev.dv_xname);
            return (0);
        }
@@ -1763,7 +1763,7 @@ struct mbuf **mm, *prev;
 
   EN_COUNT(sc->mfix);                  /* count # of calls */
 #ifdef EN_DEBUG
-  printf("%s: mfix mbuf m_data=0x%x, m_len=%d\n", sc->sc_dev.dv_xname,
+  kprintf("%s: mfix mbuf m_data=0x%x, m_len=%d\n", sc->sc_dev.dv_xname,
        m->m_data, m->m_len);
 #endif
 
@@ -1837,7 +1837,7 @@ int chan;
   struct ifnet *ifp;
 
 #ifdef EN_DEBUG
-  printf("%s: tx%d: starting...\n", sc->sc_dev.dv_xname, chan);
+  kprintf("%s: tx%d: starting...\n", sc->sc_dev.dv_xname, chan);
 #endif
 
   /*
@@ -1858,7 +1858,7 @@ again:
 
   if (launch.t == NULL) {
 #ifdef EN_DEBUG
-    printf("%s: tx%d: ...done!\n", sc->sc_dev.dv_xname, chan);
+    kprintf("%s: tx%d: ...done!\n", sc->sc_dev.dv_xname, chan);
 #endif
     return;    /* >>> exit here if no data waiting for DMA <<< */
   }
@@ -1930,7 +1930,7 @@ again:
   launch.need += MID_TBD_SIZE;
 
   if (launch.need > EN_TXSZ * 1024) {
-    printf("%s: tx%d: packet larger than xmit buffer (%d > %d)\n",
+    kprintf("%s: tx%d: packet larger than xmit buffer (%d > %d)\n",
       sc->sc_dev.dv_xname, chan, launch.need, EN_TXSZ * 1024);
     goto dequeue_drop;
   }
@@ -1942,7 +1942,7 @@ again:
   if (launch.need >= sc->txslot[chan].bfree) {
     EN_COUNT(sc->txoutspace);
 #ifdef EN_DEBUG
-    printf("%s: tx%d: out of transmit space\n", sc->sc_dev.dv_xname, chan);
+    kprintf("%s: tx%d: out of transmit space\n", sc->sc_dev.dv_xname, chan);
 #endif
     return;            /* >>> exit here if out of obmem buffer space <<< */
   }
@@ -1958,7 +1958,7 @@ again:
     sc->need_dtqs = 1;
     EN_COUNT(sc->txdtqout);
 #ifdef EN_DEBUG
-    printf("%s: tx%d: out of transmit DTQs\n", sc->sc_dev.dv_xname, chan);
+    kprintf("%s: tx%d: out of transmit DTQs\n", sc->sc_dev.dv_xname, chan);
 #endif
     return;            /* >>> exit here if out of dtqs <<< */
   }
@@ -2082,14 +2082,14 @@ struct en_launch *l;
 
 #ifdef EN_DIAG
   if ((need - MID_TBD_SIZE) % MID_ATMDATASZ) 
-    printf("%s: tx%d: bogus trasmit needs (%d)\n", sc->sc_dev.dv_xname, chan,
+    kprintf("%s: tx%d: bogus trasmit needs (%d)\n", sc->sc_dev.dv_xname, chan,
                need);
 #endif
 #ifdef EN_DEBUG
-  printf("%s: tx%d: launch mbuf %p!   cur=0x%x[%d], need=%d, addtail=%d\n",
+  kprintf("%s: tx%d: launch mbuf %p!   cur=0x%x[%d], need=%d, addtail=%d\n",
        sc->sc_dev.dv_xname, chan, l->t, cur, (cur-start)/4, need, addtail);
   count = EN_READ(sc, MIDX_PLACE(chan));
-  printf("     HW: base_address=0x%x, size=%d, read=%d, descstart=%d\n",
+  kprintf("     HW: base_address=0x%x, size=%d, read=%d, descstart=%d\n",
        MIDX_BASE(count), MIDX_SZ(count), EN_READ(sc, MIDX_READPTR(chan)), 
        EN_READ(sc, MIDX_DESCSTART(chan)));
 #endif
@@ -2101,7 +2101,7 @@ struct en_launch *l;
 
   if ((l->atm_flags & EN_OBHDR) == 0) {
 #ifdef EN_DEBUG
-    printf("%s: tx%d: insert header 0x%x 0x%x\n", sc->sc_dev.dv_xname,
+    kprintf("%s: tx%d: insert header 0x%x 0x%x\n", sc->sc_dev.dv_xname,
        chan, l->tbd1, l->tbd2);
 #endif
     EN_WRITE(sc, cur, l->tbd1);
@@ -2148,7 +2148,7 @@ struct en_launch *l;
       }
       need -= len;
 #ifdef EN_DEBUG
-      printf("%s: tx%d: copied %d bytes (%d left, cur now 0x%x)\n", 
+      kprintf("%s: tx%d: copied %d bytes (%d left, cur now 0x%x)\n", 
                sc->sc_dev.dv_xname, chan, len, need, cur);
 #endif
       continue;                /* continue on to next mbuf */
@@ -2158,7 +2158,7 @@ struct en_launch *l;
     if (dma != cur) {
       EN_DTQADD(sc, WORD_IDX(start,cur), chan, MIDDMA_JK, 0, 0, 0);
 #ifdef EN_DEBUG
-      printf("%s: tx%d: dtq_sync: advance pointer to %d\n",
+      kprintf("%s: tx%d: dtq_sync: advance pointer to %d\n",
                sc->sc_dev.dv_xname, chan, cur);
 #endif
     }
@@ -2186,7 +2186,7 @@ struct en_launch *l;
       need -= len;
       EN_WRAPADD(start, stop, cur, len);
 #ifdef EN_DEBUG
-      printf("%s: tx%d: adp_dma %d bytes (%d left, cur now 0x%x)\n",
+      kprintf("%s: tx%d: adp_dma %d bytes (%d left, cur now 0x%x)\n",
               sc->sc_dev.dv_xname, chan, len, need, cur);
 #endif
       end = (need == 0) ? MID_DMA_END : 0;
@@ -2220,7 +2220,7 @@ struct en_launch *l;
       need -= cnt;
       EN_WRAPADD(start, stop, cur, cnt);
 #ifdef EN_DEBUG
-      printf("%s: tx%d: small al_dma %d bytes (%d left, cur now 0x%x)\n",
+      kprintf("%s: tx%d: small al_dma %d bytes (%d left, cur now 0x%x)\n",
               sc->sc_dev.dv_xname, chan, cnt, need, cur);
 #endif
       len -= cnt;
@@ -2249,7 +2249,7 @@ struct en_launch *l;
       need -= cnt;
       EN_WRAPADD(start, stop, cur, cnt);
 #ifdef EN_DEBUG
-      printf("%s: tx%d: al_dma %d bytes (%d left, cur now 0x%x)\n", 
+      kprintf("%s: tx%d: al_dma %d bytes (%d left, cur now 0x%x)\n", 
                sc->sc_dev.dv_xname, chan, cnt, need, cur);
 #endif
       len -= cnt;
@@ -2268,7 +2268,7 @@ struct en_launch *l;
       need -= cnt;
       EN_WRAPADD(start, stop, cur, cnt);
 #ifdef EN_DEBUG
-      printf("%s: tx%d: best_dma %d bytes (%d left, cur now 0x%x)\n", 
+      kprintf("%s: tx%d: best_dma %d bytes (%d left, cur now 0x%x)\n", 
                sc->sc_dev.dv_xname, chan, cnt, need, cur);
 #endif
       len -= cnt;
@@ -2288,7 +2288,7 @@ struct en_launch *l;
       need -= cnt;
       EN_WRAPADD(start, stop, cur, cnt);
 #ifdef EN_DEBUG
-      printf("%s: tx%d: cleanup_dma %d bytes (%d left, cur now 0x%x)\n", 
+      kprintf("%s: tx%d: cleanup_dma %d bytes (%d left, cur now 0x%x)\n", 
                sc->sc_dev.dv_xname, chan, cnt, need, cur);
 #endif
       len -= cnt;
@@ -2312,7 +2312,7 @@ struct en_launch *l;
       need -= len;
       EN_WRAPADD(start, stop, cur, len);
 #ifdef EN_DEBUG
-      printf("%s: tx%d: byte cleanup_dma %d bytes (%d left, cur now 0x%x)\n",
+      kprintf("%s: tx%d: byte cleanup_dma %d bytes (%d left, cur now 0x%x)\n",
               sc->sc_dev.dv_xname, chan, len, need, cur);
 #endif
       end = (need == 0) ? MID_DMA_END : 0;
@@ -2354,7 +2354,7 @@ struct en_launch *l;
       EN_DTQADD(sc, pad, chan, bcode, vtophys(l->t->m_data), 0, 0);
       need -= pad;
 #ifdef EN_DEBUG
-      printf("%s: tx%d: pad/FLUSH dma %d bytes (%d left, cur now 0x%x)\n", 
+      kprintf("%s: tx%d: pad/FLUSH dma %d bytes (%d left, cur now 0x%x)\n", 
                sc->sc_dev.dv_xname, chan, pad, need, cur);
 #endif
     }
@@ -2364,7 +2364,7 @@ struct en_launch *l;
     if (l->aal == MID_TBD_AAL5)
       pad -= 2;
 #ifdef EN_DEBUG
-      printf("%s: tx%d: padding %d bytes (cur now 0x%x)\n", 
+      kprintf("%s: tx%d: padding %d bytes (cur now 0x%x)\n", 
                sc->sc_dev.dv_xname, chan, pad * sizeof(u_int32_t), cur);
 #endif
     while (pad--) {
@@ -2388,7 +2388,7 @@ done:
   /* update current pointer */
   sc->txslot[chan].cur = cur;
 #ifdef EN_DEBUG
-      printf("%s: tx%d: DONE!   cur now = 0x%x\n", 
+      kprintf("%s: tx%d: DONE!   cur now = 0x%x\n", 
                sc->sc_dev.dv_xname, chan, cur);
 #endif
 
@@ -2418,7 +2418,7 @@ void *arg;
     EN_INTR_RET(0); /* not us */
 
 #ifdef EN_DEBUG
-  printf("%s: interrupt=0x%b\n", sc->sc_dev.dv_xname, reg, MID_INTBITS);
+  kprintf("%s: interrupt=0x%b\n", sc->sc_dev.dv_xname, reg, MID_INTBITS);
 #endif
 
   /*
@@ -2426,7 +2426,7 @@ void *arg;
    */
 
   if ((reg & (MID_INT_IDENT|MID_INT_LERR|MID_INT_DMA_ERR|MID_INT_SUNI)) != 0) {
-    printf("%s: unexpected interrupt=0x%b, resetting card\n", 
+    kprintf("%s: unexpected interrupt=0x%b, resetting card\n", 
        sc->sc_dev.dv_xname, reg, MID_INTBITS);
 #ifdef EN_DEBUG
 #ifdef DDB
@@ -2463,7 +2463,7 @@ void *arg;
        else
          sc->txslot[lcv].bfree = (val + (EN_TXSZ*1024)) - sc->txslot[lcv].cur;
 #ifdef EN_DEBUG
-       printf("%s: tx%d: trasmit done.   %d bytes now free in buffer\n",
+       kprintf("%s: tx%d: trasmit done.   %d bytes now free in buffer\n",
                sc->sc_dev.dv_xname, lcv, sc->txslot[lcv].bfree);
 #endif
       }
@@ -2483,7 +2483,7 @@ void *arg;
       kick = MID_NTX_CH - 1;           /* assume power of 2, kick all! */
       sc->need_dtqs = 0;               /* recalculated in "kick" loop below */
 #ifdef EN_DEBUG
-      printf("%s: cleared need DTQ condition\n", sc->sc_dev.dv_xname);
+      kprintf("%s: cleared need DTQ condition\n", sc->sc_dev.dv_xname);
 #endif
     }
     while (idx != val) {
@@ -2495,7 +2495,7 @@ void *arg;
        if (!m) panic("enintr: dtqsync");
        sc->txslot[slot].mbsize -= EN_DQ_LEN(dtq);
 #ifdef EN_DEBUG
-       printf("%s: tx%d: free %d dma bytes, mbsize now %d\n",
+       kprintf("%s: tx%d: free %d dma bytes, mbsize now %d\n",
                sc->sc_dev.dv_xname, slot, EN_DQ_LEN(dtq), 
                sc->txslot[slot].mbsize);
 #endif
@@ -2513,7 +2513,7 @@ void *arg;
 
   if (kick) {
 #ifdef EN_DEBUG
-  printf("%s: tx kick mask = 0x%x\n", sc->sc_dev.dv_xname, kick);
+  kprintf("%s: tx kick mask = 0x%x\n", sc->sc_dev.dv_xname, kick);
 #endif
     for (mask = 1, lcv = 0 ; lcv < EN_NTX ; lcv++, mask = mask * 2) {
       if ((kick & mask) && sc->txslot[lcv].q.ifq_head) {
@@ -2560,7 +2560,7 @@ void *arg;
            sc->rxslot[slot].atm_vci = RX_NONE;
            sc->rxvc2slot[vci] = RX_NONE;
 #ifdef EN_DEBUG
-           printf("%s: rx%d: VCI %d now free\n", sc->sc_dev.dv_xname,
+           kprintf("%s: rx%d: VCI %d now free\n", sc->sc_dev.dv_xname,
                        slot, vci);
 #endif
          }
@@ -2569,7 +2569,7 @@ void *arg;
          ATM_PH_VPI(&ah) = 0;
          ATM_PH_SETVCI(&ah, sc->rxslot[slot].atm_vci);
 #ifdef EN_DEBUG
-         printf("%s: rx%d: rxvci%d: atm_input, mbuf %p, len %d, hand %p\n",
+         kprintf("%s: rx%d: rxvci%d: atm_input, mbuf %p, len %d, hand %p\n",
                sc->sc_dev.dv_xname, slot, sc->rxslot[slot].atm_vci, m,
                EN_DQ_LEN(drq), sc->rxslot[slot].rxhand);
 #endif
@@ -2591,7 +2591,7 @@ void *arg;
       need_softserv = 1;
       sc->need_drqs = 0;
 #ifdef EN_DEBUG
-       printf("%s: cleared need DRQ condition\n", sc->sc_dev.dv_xname);
+       kprintf("%s: cleared need DRQ condition\n", sc->sc_dev.dv_xname);
 #endif
     }
   }
@@ -2611,7 +2611,7 @@ void *arg;
       slot = sc->rxvc2slot[vci];
       if (slot == RX_NONE) {
 #ifdef EN_DEBUG
-       printf("%s: unexpected rx interrupt on VCI %d\n", 
+       kprintf("%s: unexpected rx interrupt on VCI %d\n", 
                sc->sc_dev.dv_xname, vci);
 #endif
        EN_WRITE(sc, MID_VC(vci), MIDV_TRASH);  /* rx off, damn it! */
@@ -2621,7 +2621,7 @@ void *arg;
       EN_COUNT(sc->hwpull);
 
 #ifdef EN_DEBUG
-      printf("%s: pulled VCI %d off hwslist\n", sc->sc_dev.dv_xname, vci);
+      kprintf("%s: pulled VCI %d off hwslist\n", sc->sc_dev.dv_xname, vci);
 #endif
 
       /* add it to the software service list (if needed) */
@@ -2633,7 +2633,7 @@ void *arg;
        EN_WRAPADD(0, MID_SL_N, sc->swsl_tail, 1);
        sc->swsl_size++;
 #ifdef EN_DEBUG
-      printf("%s: added VCI %d to swslist\n", sc->sc_dev.dv_xname, vci);
+      kprintf("%s: added VCI %d to swslist\n", sc->sc_dev.dv_xname, vci);
 #endif
       }
     };
@@ -2653,7 +2653,7 @@ void *arg;
   if (reg & MID_INT_DMA_OVR) {
     EN_COUNT(sc->dmaovr);
 #ifdef EN_DEBUG
-    printf("%s: MID_INT_DMA_OVR\n", sc->sc_dev.dv_xname);
+    kprintf("%s: MID_INT_DMA_OVR\n", sc->sc_dev.dv_xname);
 #endif
   }
   reg = EN_READ(sc, MID_STAT);
@@ -2698,7 +2698,7 @@ struct en_softc *sc;
 next_vci:
   if (sc->swsl_size == 0) {
 #ifdef EN_DEBUG
-    printf("%s: en_service done\n", sc->sc_dev.dv_xname);
+    kprintf("%s: en_service done\n", sc->sc_dev.dv_xname);
 #endif
     return;            /* >>> exit here if swsl now empty <<< */
   }
@@ -2723,7 +2723,7 @@ next_vci:
   cur = sc->rxslot[slot].cur;
 
 #ifdef EN_DEBUG
-  printf("%s: rx%d: service vci=%d raw=%d start/stop/cur=0x%x 0x%x 0x%x\n",
+  kprintf("%s: rx%d: service vci=%d raw=%d start/stop/cur=0x%x 0x%x 0x%x\n",
        sc->sc_dev.dv_xname, slot, vci, raw, start, stop, cur);
 #endif
 
@@ -2739,7 +2739,7 @@ defer:                                    /* defer processing */
     sc->swsl_size--;
                                        /* >>> remove from swslist <<< */
 #ifdef EN_DEBUG
-    printf("%s: rx%d: remove vci %d from swslist\n", 
+    kprintf("%s: rx%d: remove vci %d from swslist\n", 
                sc->sc_dev.dv_xname, slot, vci);
 #endif
     goto next_vci;
@@ -2776,7 +2776,7 @@ defer:                                    /* defer processing */
       fill = MID_RBD_SIZE;
       EN_COUNT(sc->ttrash);
 #ifdef EN_DEBUG
-      printf("RX overflow lost %d cells!\n", MID_RBD_CNT(rbd));
+      kprintf("RX overflow lost %d cells!\n", MID_RBD_CNT(rbd));
 #endif
     } else if (!aal5) {
       mlen = MID_RBD_SIZE + MID_CHDR_SIZE + MID_ATMDATASZ; /* 1 cell (ick!) */
@@ -2794,14 +2794,14 @@ defer:                                  /* defer processing */
        static int first = 1;
 
        if (first) {
-         printf("%s: %s, dropping frame\n", sc->sc_dev.dv_xname,
+         kprintf("%s: %s, dropping frame\n", sc->sc_dev.dv_xname,
                 (rbd & MID_RBD_CRCERR) ?
                 "CRC error" : "invalid AAL5 PDU length");
-         printf("%s: got %d cells (%d bytes), AAL5 len is %d bytes (pdu=0x%x)\n",
+         kprintf("%s: got %d cells (%d bytes), AAL5 len is %d bytes (pdu=0x%x)\n",
                 sc->sc_dev.dv_xname, MID_RBD_CNT(rbd),
                 tlen - MID_RBD_SIZE, MID_PDU_LEN(pdu), pdu);
 #ifndef EN_DEBUG
-         printf("CRC error report disabled from now on!\n");
+         kprintf("CRC error report disabled from now on!\n");
          first = 0;
 #endif
        }
@@ -2835,7 +2835,7 @@ defer:                                    /* defer processing */
     sav = mtod(m, u_int32_t *);
     if (sav[0] != cur) {
 #ifdef EN_DEBUG
-      printf("%s: rx%d: q'ed mbuf %p not ours\n", 
+      kprintf("%s: rx%d: q'ed mbuf %p not ours\n", 
                sc->sc_dev.dv_xname, slot, m);
 #endif
       m = NULL;                        /* wasn't ours */
@@ -2845,7 +2845,7 @@ defer:                                    /* defer processing */
       IF_DEQUEUE(&sc->rxslot[slot].q, m);
       drqneed = sav[1];
 #ifdef EN_DEBUG
-      printf("%s: rx%d: recovered q'ed mbuf %p (drqneed=%d)\n", 
+      kprintf("%s: rx%d: recovered q'ed mbuf %p (drqneed=%d)\n", 
        sc->sc_dev.dv_xname, slot, m, drqneed);
 #endif
     }
@@ -2858,17 +2858,17 @@ defer:                                  /* defer processing */
       mlen = 0;
       EN_COUNT(sc->rxmbufout);
 #ifdef EN_DEBUG
-      printf("%s: rx%d: out of mbufs\n", sc->sc_dev.dv_xname, slot);
+      kprintf("%s: rx%d: out of mbufs\n", sc->sc_dev.dv_xname, slot);
 #endif
     }
 #ifdef EN_DEBUG
-    printf("%s: rx%d: allocate mbuf %p, mlen=%d, drqneed=%d\n", 
+    kprintf("%s: rx%d: allocate mbuf %p, mlen=%d, drqneed=%d\n", 
        sc->sc_dev.dv_xname, slot, m, mlen, drqneed);
 #endif
   }
 
 #ifdef EN_DEBUG
-  printf("%s: rx%d: VCI %d, mbuf_chain %p, mlen %d, fill %d\n",
+  kprintf("%s: rx%d: VCI %d, mbuf_chain %p, mlen %d, fill %d\n",
        sc->sc_dev.dv_xname, slot, vci, m, mlen, fill);
 #endif
 
@@ -2883,7 +2883,7 @@ defer:                                    /* defer processing */
     if (m == NULL) {
       EN_COUNT(sc->rxoutboth);
 #ifdef EN_DEBUG
-      printf("%s: rx%d: out of DRQs *and* mbufs!\n", sc->sc_dev.dv_xname, slot);
+      kprintf("%s: rx%d: out of DRQs *and* mbufs!\n", sc->sc_dev.dv_xname, slot);
 #endif
       return;          /* >>> exit here if out of both mbufs and DRQs <<< */
     }
@@ -2893,7 +2893,7 @@ defer:                                    /* defer processing */
     IF_ENQUEUE(&sc->rxslot[slot].q, m);
     EN_COUNT(sc->rxdrqout);
 #ifdef EN_DEBUG
-    printf("%s: rx%d: out of DRQs\n", sc->sc_dev.dv_xname, slot);
+    kprintf("%s: rx%d: out of DRQs\n", sc->sc_dev.dv_xname, slot);
 #endif
     return;            /* >>> exit here if out of DRQs <<< */
   }
@@ -2922,7 +2922,7 @@ defer:                                    /* defer processing */
     data = mtod(tmp, u_int32_t *);
 
 #ifdef EN_DEBUG
-    printf("%s: rx%d: load mbuf %p, m_len=%d, m_data=%p, tlen=%d\n",
+    kprintf("%s: rx%d: load mbuf %p, m_len=%d, m_data=%p, tlen=%d\n",
        sc->sc_dev.dv_xname, slot, tmp, tmp->m_len, tmp->m_data, tlen);
 #endif
     
@@ -2937,7 +2937,7 @@ defer:                                    /* defer processing */
       }
       need -= tlen;
 #ifdef EN_DEBUG
-      printf("%s: rx%d: vci%d: copied %d bytes (%d left)\n",
+      kprintf("%s: rx%d: vci%d: copied %d bytes (%d left)\n",
                sc->sc_dev.dv_xname, slot, vci, tlen, need);
 #endif
       continue;
@@ -2947,7 +2947,7 @@ defer:                                    /* defer processing */
     if (dma != cur) {
       EN_DRQADD(sc, WORD_IDX(start,cur), vci, MIDDMA_JK, 0, 0, 0, 0);
 #ifdef EN_DEBUG
-      printf("%s: rx%d: vci%d: drq_sync: advance pointer to %d\n",
+      kprintf("%s: rx%d: vci%d: drq_sync: advance pointer to %d\n",
                sc->sc_dev.dv_xname, slot, vci, cur);
 #endif
     }
@@ -2962,7 +2962,7 @@ defer:                                    /* defer processing */
       need -= tlen;
       EN_WRAPADD(start, stop, cur, tlen);
 #ifdef EN_DEBUG
-      printf("%s: rx%d: vci%d: adp_dma %d bytes (%d left)\n",
+      kprintf("%s: rx%d: vci%d: adp_dma %d bytes (%d left)\n",
                sc->sc_dev.dv_xname, slot, vci, tlen, need);
 #endif
       end = (need == 0 && !fill) ? MID_DMA_END : 0;
@@ -2997,7 +2997,7 @@ defer:                                    /* defer processing */
       need -= cnt;
       EN_WRAPADD(start, stop, cur, cnt);
 #ifdef EN_DEBUG
-      printf("%s: rx%d: vci%d: al_dma %d bytes (%d left)\n",
+      kprintf("%s: rx%d: vci%d: al_dma %d bytes (%d left)\n",
                sc->sc_dev.dv_xname, slot, vci, cnt, need);
 #endif
       tlen -= cnt;
@@ -3016,7 +3016,7 @@ defer:                                    /* defer processing */
       need -= cnt;
       EN_WRAPADD(start, stop, cur, cnt);
 #ifdef EN_DEBUG
-      printf("%s: rx%d: vci%d: best_dma %d bytes (%d left)\n",
+      kprintf("%s: rx%d: vci%d: best_dma %d bytes (%d left)\n",
                sc->sc_dev.dv_xname, slot, vci, cnt, need);
 #endif
       tlen -= cnt;
@@ -3035,7 +3035,7 @@ defer:                                    /* defer processing */
       need -= tlen;
       EN_WRAPADD(start, stop, cur, tlen);
 #ifdef EN_DEBUG
-      printf("%s: rx%d: vci%d: cleanup_dma %d bytes (%d left)\n",
+      kprintf("%s: rx%d: vci%d: cleanup_dma %d bytes (%d left)\n",
                sc->sc_dev.dv_xname, slot, vci, tlen, need);
 #endif
       end = (need == 0 && !fill) ? MID_DMA_END : 0;
@@ -3054,10 +3054,10 @@ defer:                                  /* defer processing */
   if (fill || dma != cur) {
 #ifdef EN_DEBUG
       if (fill)
-        printf("%s: rx%d: vci%d: skipping %d bytes of fill\n",
+        kprintf("%s: rx%d: vci%d: skipping %d bytes of fill\n",
                sc->sc_dev.dv_xname, slot, vci, fill);
       else
-        printf("%s: rx%d: vci%d: syncing chip from 0x%x to 0x%x [cur]\n",
+        kprintf("%s: rx%d: vci%d: syncing chip from 0x%x to 0x%x [cur]\n",
                sc->sc_dev.dv_xname, slot, vci, dma, cur);
 #endif
     EN_WRAPADD(start, stop, cur, fill);
@@ -3087,7 +3087,7 @@ done:
   sc->rxslot[slot].cur = cur;          /* update master copy of 'cur' */
 
 #ifdef EN_DEBUG
-  printf("%s: rx%d: vci%d: DONE!   cur now =0x%x\n", 
+  kprintf("%s: rx%d: vci%d: DONE!   cur now =0x%x\n", 
        sc->sc_dev.dv_xname, slot, vci, cur);
 #endif
 
@@ -3130,89 +3130,89 @@ int unit, level;
     if (unit != -1 && unit != lcv)
       continue;
 
-    printf("dumping device %s at level 0x%b\n", sc->sc_dev.dv_xname, level,
+    kprintf("dumping device %s at level 0x%b\n", sc->sc_dev.dv_xname, level,
                        END_BITS);
 
     if (sc->dtq_us == 0) {
-      printf("<hasn't been en_init'd yet>\n");
+      kprintf("<hasn't been en_init'd yet>\n");
       continue;
     }
 
     if (level & END_STATS) {
-      printf("  en_stats:\n");
-      printf("    %d mfix (%d failed); %d/%d head/tail byte DMAs, %d flushes\n",
+      kprintf("  en_stats:\n");
+      kprintf("    %d mfix (%d failed); %d/%d head/tail byte DMAs, %d flushes\n",
           sc->mfix, sc->mfixfail, sc->headbyte, sc->tailbyte, sc->tailflush);
-      printf("    %d rx dma overflow interrupts\n", sc->dmaovr);
-      printf("    %d times we ran out of TX space and stalled\n", 
+      kprintf("    %d rx dma overflow interrupts\n", sc->dmaovr);
+      kprintf("    %d times we ran out of TX space and stalled\n", 
                                                        sc->txoutspace);
-      printf("    %d times we ran out of DTQs\n", sc->txdtqout);
-      printf("    %d times we launched a packet\n", sc->launch);
-      printf("    %d times we launched without on-board header\n", sc->lheader);
-      printf("    %d times we launched without on-board tail\n", sc->ltail);
-      printf("    %d times we pulled the hw service list\n", sc->hwpull);
-      printf("    %d times we pushed a vci on the sw service list\n", 
+      kprintf("    %d times we ran out of DTQs\n", sc->txdtqout);
+      kprintf("    %d times we launched a packet\n", sc->launch);
+      kprintf("    %d times we launched without on-board header\n", sc->lheader);
+      kprintf("    %d times we launched without on-board tail\n", sc->ltail);
+      kprintf("    %d times we pulled the hw service list\n", sc->hwpull);
+      kprintf("    %d times we pushed a vci on the sw service list\n", 
                                                                sc->swadd);
-      printf("    %d times RX pulled an mbuf from Q that wasn't ours\n", 
+      kprintf("    %d times RX pulled an mbuf from Q that wasn't ours\n", 
                                                         sc->rxqnotus);
-      printf("    %d times RX pulled a good mbuf from Q\n", sc->rxqus);
-      printf("    %d times we ran out of mbufs *and* DRQs\n", sc->rxoutboth);
-      printf("    %d times we ran out of DRQs\n", sc->rxdrqout);
-
-      printf("    %d trasmit packets dropped due to mbsize\n", sc->txmbovr);
-      printf("    %d cells trashed due to turned off rxvc\n", sc->vtrash);
-      printf("    %d cells trashed due to totally full buffer\n", sc->otrash);
-      printf("    %d cells trashed due almost full buffer\n", sc->ttrash);
-      printf("    %d rx mbuf allocation failures\n", sc->rxmbufout);
+      kprintf("    %d times RX pulled a good mbuf from Q\n", sc->rxqus);
+      kprintf("    %d times we ran out of mbufs *and* DRQs\n", sc->rxoutboth);
+      kprintf("    %d times we ran out of DRQs\n", sc->rxdrqout);
+
+      kprintf("    %d trasmit packets dropped due to mbsize\n", sc->txmbovr);
+      kprintf("    %d cells trashed due to turned off rxvc\n", sc->vtrash);
+      kprintf("    %d cells trashed due to totally full buffer\n", sc->otrash);
+      kprintf("    %d cells trashed due almost full buffer\n", sc->ttrash);
+      kprintf("    %d rx mbuf allocation failures\n", sc->rxmbufout);
 #if defined(NATM) && defined(NATM_STAT)
-      printf("    natmintr so_rcv: ok/drop cnt: %d/%d, ok/drop bytes: %d/%d\n",
+      kprintf("    natmintr so_rcv: ok/drop cnt: %d/%d, ok/drop bytes: %d/%d\n",
        natm_sookcnt, natm_sodropcnt, natm_sookbytes, natm_sodropbytes);
 #endif
     }
 
     if (level & END_MREGS) {
-      printf("mregs:\n");
-      printf("resid = 0x%lx\n", (u_long)EN_READ(sc, MID_RESID));
-      printf("interrupt status = 0x%b\n", 
+      kprintf("mregs:\n");
+      kprintf("resid = 0x%lx\n", (u_long)EN_READ(sc, MID_RESID));
+      kprintf("interrupt status = 0x%b\n", 
                                (int)EN_READ(sc, MID_INTSTAT), MID_INTBITS);
-      printf("interrupt enable = 0x%b\n", 
+      kprintf("interrupt enable = 0x%b\n", 
                                (int)EN_READ(sc, MID_INTENA), MID_INTBITS);
-      printf("mcsr = 0x%b\n", (int)EN_READ(sc, MID_MAST_CSR), MID_MCSRBITS);
-      printf("serv_write = [chip=%ld] [us=%d]\n",
+      kprintf("mcsr = 0x%b\n", (int)EN_READ(sc, MID_MAST_CSR), MID_MCSRBITS);
+      kprintf("serv_write = [chip=%ld] [us=%d]\n",
                        (long)EN_READ(sc, MID_SERV_WRITE),
                        MID_SL_A2REG(sc->hwslistp));
-      printf("dma addr = 0x%lx\n", (u_long)EN_READ(sc, MID_DMA_ADDR));
-      printf("DRQ: chip[rd=0x%lx,wr=0x%lx], sc[chip=0x%x,us=0x%x]\n",
+      kprintf("dma addr = 0x%lx\n", (u_long)EN_READ(sc, MID_DMA_ADDR));
+      kprintf("DRQ: chip[rd=0x%lx,wr=0x%lx], sc[chip=0x%x,us=0x%x]\n",
        (u_long)MID_DRQ_REG2A(EN_READ(sc, MID_DMA_RDRX)), 
        (u_long)MID_DRQ_REG2A(EN_READ(sc, MID_DMA_WRRX)),
        sc->drq_chip, sc->drq_us);
-      printf("DTQ: chip[rd=0x%lx,wr=0x%lx], sc[chip=0x%x,us=0x%x]\n",
+      kprintf("DTQ: chip[rd=0x%lx,wr=0x%lx], sc[chip=0x%x,us=0x%x]\n",
        (u_long)MID_DTQ_REG2A(EN_READ(sc, MID_DMA_RDTX)), 
        (u_long)MID_DTQ_REG2A(EN_READ(sc, MID_DMA_WRTX)),
        sc->dtq_chip, sc->dtq_us);
 
-      printf("  unusal txspeeds: ");
+      kprintf("  unusal txspeeds: ");
       for (cnt = 0 ; cnt < MID_N_VC ; cnt++)
        if (sc->txspeed[cnt])
-         printf(" vci%d=0x%x", cnt, sc->txspeed[cnt]);
-      printf("\n");
+         kprintf(" vci%d=0x%x", cnt, sc->txspeed[cnt]);
+      kprintf("\n");
 
-      printf("  rxvc slot mappings: ");
+      kprintf("  rxvc slot mappings: ");
       for (cnt = 0 ; cnt < MID_N_VC ; cnt++)
        if (sc->rxvc2slot[cnt] != RX_NONE)
-         printf("  %d->%d", cnt, sc->rxvc2slot[cnt]);
-      printf("\n");
+         kprintf("  %d->%d", cnt, sc->rxvc2slot[cnt]);
+      kprintf("\n");
 
     }
 
     if (level & END_TX) {
-      printf("tx:\n");
+      kprintf("tx:\n");
       for (slot = 0 ; slot < EN_NTX; slot++) {
-       printf("tx%d: start/stop/cur=0x%x/0x%x/0x%x [%d]  ", slot,
+       kprintf("tx%d: start/stop/cur=0x%x/0x%x/0x%x [%d]  ", slot,
          sc->txslot[slot].start, sc->txslot[slot].stop, sc->txslot[slot].cur,
                (sc->txslot[slot].cur - sc->txslot[slot].start)/4);
-       printf("mbsize=%d, bfree=%d\n", sc->txslot[slot].mbsize,
+       kprintf("mbsize=%d, bfree=%d\n", sc->txslot[slot].mbsize,
                sc->txslot[slot].bfree);
-        printf("txhw: base_address=0x%lx, size=%ld, read=%ld, descstart=%ld\n",
+        kprintf("txhw: base_address=0x%lx, size=%ld, read=%ld, descstart=%ld\n",
          (u_long)MIDX_BASE(EN_READ(sc, MIDX_PLACE(slot))), 
          (u_long)MIDX_SZ(EN_READ(sc, MIDX_PLACE(slot))),
          (long)EN_READ(sc, MIDX_READPTR(slot)),
@@ -3221,15 +3221,15 @@ int unit, level;
     }
 
     if (level & END_RX) {
-      printf("  recv slots:\n");
+      kprintf("  recv slots:\n");
       for (slot = 0 ; slot < sc->en_nrx; slot++) {
-       printf("rx%d: vci=%d: start/stop/cur=0x%x/0x%x/0x%x ", slot,
+       kprintf("rx%d: vci=%d: start/stop/cur=0x%x/0x%x/0x%x ", slot,
          sc->rxslot[slot].atm_vci, sc->rxslot[slot].start, 
          sc->rxslot[slot].stop, sc->rxslot[slot].cur);
-       printf("mode=0x%x, atm_flags=0x%x, oth_flags=0x%x\n", 
+       kprintf("mode=0x%x, atm_flags=0x%x, oth_flags=0x%x\n", 
        sc->rxslot[slot].mode, sc->rxslot[slot].atm_flags, 
                sc->rxslot[slot].oth_flags);
-        printf("RXHW: mode=0x%lx, DST_RP=0x%lx, WP_ST_CNT=0x%lx\n",
+        kprintf("RXHW: mode=0x%lx, DST_RP=0x%lx, WP_ST_CNT=0x%lx\n",
          (u_long)EN_READ(sc, MID_VC(sc->rxslot[slot].atm_vci)),
          (u_long)EN_READ(sc, MID_DST_RP(sc->rxslot[slot].atm_vci)),
          (u_long)EN_READ(sc, MID_WP_ST_CNT(sc->rxslot[slot].atm_vci)));
@@ -3237,12 +3237,12 @@ int unit, level;
     }
 
     if (level & END_DTQ) {
-      printf("  dtq [need_dtqs=%d,dtq_free=%d]:\n", 
+      kprintf("  dtq [need_dtqs=%d,dtq_free=%d]:\n", 
                                        sc->need_dtqs, sc->dtq_free);
       ptr = sc->dtq_chip;
       while (ptr != sc->dtq_us) {
         reg = EN_READ(sc, ptr);
-        printf("\t0x%x=[cnt=%d, chan=%d, end=%d, type=%d @ 0x%lx]\n", 
+        kprintf("\t0x%x=[cnt=%d, chan=%d, end=%d, type=%d @ 0x%lx]\n", 
            sc->dtq[MID_DTQ_A2REG(ptr)], MID_DMA_CNT(reg), MID_DMA_TXCHAN(reg),
            (reg & MID_DMA_END) != 0, MID_DMA_TYPE(reg),
            (u_long)EN_READ(sc, ptr+4));
@@ -3251,12 +3251,12 @@ int unit, level;
     }
 
     if (level & END_DRQ) {
-      printf("  drq [need_drqs=%d,drq_free=%d]:\n", 
+      kprintf("  drq [need_drqs=%d,drq_free=%d]:\n", 
                                        sc->need_drqs, sc->drq_free);
       ptr = sc->drq_chip;
       while (ptr != sc->drq_us) {
         reg = EN_READ(sc, ptr);
-       printf("\t0x%x=[cnt=%d, chan=%d, end=%d, type=%d @ 0x%lx]\n", 
+       kprintf("\t0x%x=[cnt=%d, chan=%d, end=%d, type=%d @ 0x%lx]\n", 
          sc->drq[MID_DRQ_A2REG(ptr)], MID_DMA_CNT(reg), MID_DMA_RXVCI(reg),
          (reg & MID_DMA_END) != 0, MID_DMA_TYPE(reg),
          (u_long)EN_READ(sc, ptr+4));
@@ -3265,11 +3265,11 @@ int unit, level;
     }
 
     if (level & END_SWSL) {
-      printf(" swslist [size=%d]: ", sc->swsl_size);
+      kprintf(" swslist [size=%d]: ", sc->swsl_size);
       for (cnt = sc->swsl_head ; cnt != sc->swsl_tail ; 
                        cnt = (cnt + 1) % MID_SL_N)
-        printf("0x%x ", sc->swslist[cnt]);
-      printf("\n");
+        kprintf("0x%x ", sc->swslist[cnt]);
+      kprintf("\n");
     }
   }
   return(0);
@@ -3290,18 +3290,18 @@ int unit, addr, len;
 
   if (unit < 0 || unit > en_cd.cd_ndevs ||
        (sc = (struct en_softc *) en_cd.cd_devs[unit]) == NULL) {
-    printf("invalid unit number: %d\n", unit);
+    kprintf("invalid unit number: %d\n", unit);
     return(0);
   }
   addr = addr & ~3;
   if (addr < MID_RAMOFF || addr + len*4 > MID_MAXOFF || len <= 0) {
-    printf("invalid addr/len number: %d, %d\n", addr, len);
+    kprintf("invalid addr/len number: %d, %d\n", addr, len);
     return(0);
   }
-  printf("dumping %d words starting at offset 0x%x\n", len, addr);
+  kprintf("dumping %d words starting at offset 0x%x\n", len, addr);
   while (len--) {
     reg = EN_READ(sc, addr);
-    printf("mem[0x%x] = 0x%x\n", addr, reg);
+    kprintf("mem[0x%x] = 0x%x\n", addr, reg);
     addr += 4;
   }
   return(0);
index cf00925..0a03287 100644 (file)
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.5.2.5 2003/06/04 17:56:59 sam Exp $ */
-/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.12 2006/10/25 20:55:52 dillon Exp $ */
+/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.13 2006/12/22 23:26:15 swildner Exp $ */
 /*     $OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $  */
 
 /*
@@ -837,7 +837,7 @@ hifn_reset_board(struct hifn_softc *sc, int full)
                        DELAY(1000);
                }
                if (reg == 1000)
-                       printf(": cram init timeout\n");
+                       kprintf(": cram init timeout\n");
        }
 }
 
@@ -1864,7 +1864,7 @@ hifn_crypto(
         */
 #ifdef HIFN_DEBUG
        if (hifn_debug)
-               printf("load res\n");
+               kprintf("load res\n");
 #endif
        if (dma->resi == HIFN_D_RES_RSIZE) {
                dma->resi = 0;
index 6ffea02..f26d7b7 100644 (file)
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.12 2003/06/04 17:56:59 sam Exp $ */
-/* $DragonFly: src/sys/dev/crypto/ubsec/ubsec.c,v 1.12 2006/10/25 20:55:52 dillon Exp $ */
+/* $DragonFly: src/sys/dev/crypto/ubsec/ubsec.c,v 1.13 2006/12/22 23:26:15 swildner Exp $ */
 /*     $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $       */
 
 /*
@@ -675,7 +675,7 @@ ubsec_intr(void *arg)
                if (ubsec_debug) {
                        volatile u_int32_t a = READ_REG(sc, BS_ERR);
 
-                       printf("dmaerr %s@%08x\n",
+                       kprintf("dmaerr %s@%08x\n",
                            (a & BS_ERR_READ) ? "read" : "write",
                            a & BS_ERR_ADDR);
                }
@@ -750,7 +750,7 @@ ubsec_feed(struct ubsec_softc *sc)
        ubsecstats.hst_totbatch += npkts-1;
 #ifdef UBSEC_DEBUG
        if (ubsec_debug)
-               printf("merging %d records\n", npkts);
+               kprintf("merging %d records\n", npkts);
 #endif /* UBSEC_DEBUG */
 
        q = SIMPLEQ_FIRST(&sc->sc_queue);
@@ -802,7 +802,7 @@ feed1:
            offsetof(struct ubsec_dmachunk, d_mcr));
 #ifdef UBSEC_DEBUG
        if (ubsec_debug)
-               printf("feed1: q->chip %p %08x stat %08x\n",
+               kprintf("feed1: q->chip %p %08x stat %08x\n",
                      q, (u_int32_t)vtophys(&q->q_dma->d_dma->d_mcr),
                      stat);
 #endif /* UBSEC_DEBUG */
@@ -984,7 +984,7 @@ ubsec_op_cb(void *arg, bus_dma_segment_t *seg, int nsegs, bus_size_t mapsize, in
                ("Too many DMA segments returned when mapping operand"));
 #ifdef UBSEC_DEBUG
        if (ubsec_debug)
-               printf("ubsec_op_cb: mapsize %u nsegs %d\n",
+               kprintf("ubsec_op_cb: mapsize %u nsegs %d\n",
                        (u_int) mapsize, nsegs);
 #endif
        op->mapsize = mapsize;
@@ -1190,13 +1190,13 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
                cpoffset = cpskip + dtheend;
 #ifdef UBSEC_DEBUG
                if (ubsec_debug) {
-                       printf("mac: skip %d, len %d, inject %d\n",
+                       kprintf("mac: skip %d, len %d, inject %d\n",
                            maccrd->crd_skip, maccrd->crd_len, maccrd->crd_inject);
-                       printf("enc: skip %d, len %d, inject %d\n",
+                       kprintf("enc: skip %d, len %d, inject %d\n",
                            enccrd->crd_skip, enccrd->crd_len, enccrd->crd_inject);
-                       printf("src: skip %d, len %d\n", sskip, stheend);
-                       printf("dst: skip %d, len %d\n", dskip, dtheend);
-                       printf("ubs: coffset %d, pktlen %d, cpskip %d, cpoffset %d\n",
+                       kprintf("src: skip %d, len %d\n", sskip, stheend);
+                       kprintf("dst: skip %d, len %d\n", dskip, dtheend);
+                       kprintf("ubs: coffset %d, pktlen %d, cpskip %d, cpoffset %d\n",
                            coffset, stheend, cpskip, cpoffset);
                }
 #endif
@@ -1238,7 +1238,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
 
 #ifdef UBSEC_DEBUG
        if (ubsec_debug)
-               printf("src skip: %d nicealign: %u\n", sskip, nicealign);
+               kprintf("src skip: %d nicealign: %u\n", sskip, nicealign);
 #endif
        for (i = j = 0; i < q->q_src_nsegs; i++) {
                struct ubsec_pktbuf *pb;
@@ -1292,7 +1292,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
                    offsetof(struct ubsec_dmachunk, d_macbuf[0]));
 #ifdef UBSEC_DEBUG
                if (ubsec_debug)
-                       printf("opkt: %x %x %x\n",
+                       kprintf("opkt: %x %x %x\n",
                            dmap->d_dma->d_mcr.mcr_opktbuf.pb_addr,
                            dmap->d_dma->d_mcr.mcr_opktbuf.pb_len,
                            dmap->d_dma->d_mcr.mcr_opktbuf.pb_next);
@@ -1413,7 +1413,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint)
 
 #ifdef UBSEC_DEBUG
                if (ubsec_debug)
-                       printf("dst skip: %d\n", dskip);
+                       kprintf("dst skip: %d\n", dskip);
 #endif
                for (i = j = 0; i < q->q_dst_nsegs; i++) {
                        struct ubsec_pktbuf *pb;
@@ -2222,7 +2222,7 @@ ubsec_kprocess_modexp_sw(struct ubsec_softc *sc, struct cryptkop *krp, int hint)
 
 #ifdef UBSEC_DEBUG
        if (ubsec_debug) {
-               printf("Epb ");
+               kprintf("Epb ");
                ubsec_dump_pb(epb);
        }
 #endif
@@ -2420,7 +2420,7 @@ ubsec_kprocess_modexp_hw(struct ubsec_softc *sc, struct cryptkop *krp, int hint)
 
 #ifdef UBSEC_DEBUG
        if (ubsec_debug) {
-               printf("Epb ");
+               kprintf("Epb ");
                ubsec_dump_pb(epb);
        }
 #endif
@@ -2698,14 +2698,14 @@ errout:
 static void
 ubsec_dump_pb(volatile struct ubsec_pktbuf *pb)
 {
-       printf("addr 0x%x (0x%x) next 0x%x\n",
+       kprintf("addr 0x%x (0x%x) next 0x%x\n",
            pb->pb_addr, pb->pb_len, pb->pb_next);
 }
 
 static void
 ubsec_dump_ctx2(struct ubsec_ctx_keyop *c)
 {
-       printf("CTX (0x%x):\n", c->ctx_len);
+       kprintf("CTX (0x%x):\n", c->ctx_len);
        switch (letoh16(c->ctx_op)) {
        case UBS_CTXOP_RNGBYPASS:
        case UBS_CTXOP_RNGSHA1:
@@ -2715,18 +2715,18 @@ ubsec_dump_ctx2(struct ubsec_ctx_keyop *c)
                struct ubsec_ctx_modexp *cx = (void *)c;
                int i, len;
 
-               printf(" Elen %u, Nlen %u\n",
+               kprintf(" Elen %u, Nlen %u\n",
                    letoh16(cx->me_E_len), letoh16(cx->me_N_len));
                len = (cx->me_N_len + 7)/8;
                for (i = 0; i < len; i++)
-                       printf("%s%02x", (i == 0) ? " N: " : ":", cx->me_N[i]);
-               printf("\n");
+                       kprintf("%s%02x", (i == 0) ? " N: " : ":", cx->me_N[i]);
+               kprintf("\n");
                break;
        }
        default:
-               printf("unknown context: %x\n", c->ctx_op);
+               kprintf("unknown context: %x\n", c->ctx_op);
        }
-       printf("END CTX\n");
+       kprintf("END CTX\n");
 }
 
 static void
@@ -2735,21 +2735,21 @@ ubsec_dump_mcr(struct ubsec_mcr *mcr)
        volatile struct ubsec_mcr_add *ma;
        int i;
 
-       printf("MCR:\n");
-       printf(" pkts: %u, flags 0x%x\n",
+       kprintf("MCR:\n");
+       kprintf(" pkts: %u, flags 0x%x\n",
            letoh16(mcr->mcr_pkts), letoh16(mcr->mcr_flags));
        ma = (volatile struct ubsec_mcr_add *)&mcr->mcr_cmdctxp;
        for (i = 0; i < letoh16(mcr->mcr_pkts); i++) {
-               printf(" %d: ctx 0x%x len 0x%x rsvd 0x%x\n", i,
+               kprintf(" %d: ctx 0x%x len 0x%x rsvd 0x%x\n", i,
                    letoh32(ma->mcr_cmdctxp), letoh16(ma->mcr_pktlen),
                    letoh16(ma->mcr_reserved));
-               printf(" %d: ipkt ", i);
+               kprintf(" %d: ipkt ", i);
                ubsec_dump_pb(&ma->mcr_ipktbuf);
-               printf(" %d: opkt ", i);
+               kprintf(" %d: opkt ", i);
                ubsec_dump_pb(&ma->mcr_opktbuf);
                ma++;
        }
-       printf("END MCR\n");
+       kprintf("END MCR\n");
 }
 #endif /* UBSEC_DEBUG */
 
index ccf97d3..6c47a9c 100644 (file)
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/advansys/adv_eisa.c,v 1.9.2.1 2000/04/14 13:32:44 nyan Exp $
- * $DragonFly: src/sys/dev/disk/advansys/adv_eisa.c,v 1.6 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/adv_eisa.c,v 1.7 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -116,7 +116,7 @@ adv_eisa_probe(device_t dev)
        case 5:
            break;
        default:
-           printf("adv at slot %d: illegal "
+           kprintf("adv at slot %d: illegal "
                   "irq setting %d\n", eisa_get_slot(dev),
                   irq);
            return ENXIO;
@@ -180,7 +180,7 @@ adv_eisa_attach(device_t dev)
                                           &adv_b->parent_dmat);
  
                if (error != 0) {
-                       printf("%s: Could not allocate DMA tag - error %d\n",
+                       kprintf("%s: Could not allocate DMA tag - error %d\n",
                               adv_name(adv_b), error);
                        adv_free(adv_b);
                        goto bad;
@@ -215,7 +215,7 @@ adv_eisa_attach(device_t dev)
                                           &adv->parent_dmat);
  
                if (error != 0) {
-                       printf("%s: Could not allocate DMA tag - error %d\n",
+                       kprintf("%s: Could not allocate DMA tag - error %d\n",
                               adv_name(adv), error);
                        adv_free(adv);
                        goto bad;
@@ -224,7 +224,7 @@ adv_eisa_attach(device_t dev)
                adv->init_level++;
                break;
        default: 
-               printf("adveisaattach: Unknown device type!\n");
+               kprintf("adveisaattach: Unknown device type!\n");
                goto bad;
                break;
        }
index a0f3c23..d457c77 100644 (file)
@@ -45,7 +45,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/advansys/adv_isa.c,v 1.14.2.5 2002/01/06 21:21:42 dwmalone Exp $
- * $DragonFly: src/sys/dev/disk/advansys/adv_isa.c,v 1.6 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/adv_isa.c,v 1.7 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -123,7 +123,7 @@ adv_isa_probe(device_t dev)
                if ((port_index > max_port_index)
                 || (iobase != adv_isa_ioports[port_index])) {
                        if (bootverbose)
-                           printf("adv%d: Invalid baseport of 0x%lx specified. "
+                           kprintf("adv%d: Invalid baseport of 0x%lx specified. "
                                "Nearest valid baseport is 0x%x.  Failing "
                                "probe.\n", device_get_unit(dev), iobase,
                                (port_index <= max_port_index) ?
@@ -229,7 +229,7 @@ adv_isa_probe(device_t dev)
                                           &adv->parent_dmat); 
 
                if (error != 0) {
-                       printf("%s: Could not allocate DMA tag - error %d\n",
+                       kprintf("%s: Could not allocate DMA tag - error %d\n",
                               adv_name(adv), error); 
                        adv_free(adv); 
                        bus_release_resource(dev, SYS_RES_IOPORT, 0, iores);
index a784deb..6e748e6 100644 (file)
@@ -58,7 +58,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/advansys/adv_pci.c,v 1.11.2.3 2001/06/02 04:38:10 nyan Exp $
- * $DragonFly: src/sys/dev/disk/advansys/adv_pci.c,v 1.6 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/adv_pci.c,v 1.7 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -194,7 +194,7 @@ adv_pci_attach(device_t dev)
                                   &adv->parent_dmat);
  
        if (error != 0) {
-               printf("%s: Could not allocate DMA tag - error %d\n",
+               kprintf("%s: Could not allocate DMA tag - error %d\n",
                       adv_name(adv), error);
                adv_free(adv);
                bus_release_resource(dev, SYS_RES_IOPORT, rid, iores);
index a004f4b..4f638e3 100644 (file)
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/advansys/advansys.c,v 1.14.2.4 2002/01/06 21:21:42 dwmalone Exp $
- * $DragonFly: src/sys/dev/disk/advansys/advansys.c,v 1.10 2006/12/20 18:14:38 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/advansys.c,v 1.11 2006/12/22 23:26:15 swildner Exp $
  */
 /*
  * Ported from:
@@ -163,7 +163,7 @@ adv_clear_state_really(struct adv_softc *adv, union ccb* ccb)
                                ccb_h = LIST_NEXT(ccb_h, sim_links.le);
                        }
                        adv->state &= ~ADV_IN_TIMEOUT;
-                       printf("%s: No longer in timeout\n", adv_name(adv));
+                       kprintf("%s: No longer in timeout\n", adv_name(adv));
                }
        }
        if (adv->state == 0)
@@ -630,7 +630,7 @@ adv_alloc_ccb_info(struct adv_softc *adv)
        error = bus_dmamap_create(adv->buffer_dmat, /*flags*/0,
                                  &cinfo->dmamap);
        if (error != 0) {
-               printf("%s: Unable to allocate CCB info "
+               kprintf("%s: Unable to allocate CCB info "
                       "dmamap - error %d\n", adv_name(adv), error);
                return (NULL);
        }
@@ -656,7 +656,7 @@ adv_timeout(void *arg)
        cinfo = (struct adv_ccb_info *)ccb->ccb_h.ccb_cinfo_ptr;
 
        xpt_print_path(ccb->ccb_h.path);
-       printf("Timed out\n");
+       kprintf("Timed out\n");
 
        crit_enter();
        /* Have we been taken care of already?? */
@@ -694,7 +694,7 @@ adv_timeout(void *arg)
                /* XXX Should send a BDR */
                /* Attempt an abort as our first tact */
                xpt_print_path(ccb->ccb_h.path);
-               printf("Attempting abort\n");
+               kprintf("Attempting abort\n");
                adv_abort_ccb(adv, ccb->ccb_h.target_id,
                              ccb->ccb_h.target_lun, ccb,
                              CAM_CMD_TIMEOUT, /*queued_only*/FALSE);
@@ -702,7 +702,7 @@ adv_timeout(void *arg)
        } else {
                /* Our attempt to perform an abort failed, go for a reset */
                xpt_print_path(ccb->ccb_h.path);
-               printf("Resetting bus\n");              
+               kprintf("Resetting bus\n");             
                ccb->ccb_h.status &= ~CAM_STATUS_MASK;
                ccb->ccb_h.status |= CAM_CMD_TIMEOUT;
                adv_reset_bus(adv, /*initiate_reset*/TRUE);
@@ -778,13 +778,13 @@ adv_init(struct adv_softc *adv)
        adv_write_lram_16(adv, ADV_HALTCODE_W, 0x00FE);
        adv_stop_execution(adv);
        if (adv_stop_chip(adv) == 0 || adv_is_chip_halted(adv) == 0) {
-               printf("adv%d: Unable to halt adapter. Initialization"
+               kprintf("adv%d: Unable to halt adapter. Initialization"
                       "failed\n", adv->unit);
                return (1);
        }
        ADV_OUTW(adv, ADV_REG_PROG_COUNTER, ADV_MCODE_START_ADDR);
        if (ADV_INW(adv, ADV_REG_PROG_COUNTER) != ADV_MCODE_START_ADDR) {
-               printf("adv%d: Unable to set program counter. Initialization"
+               kprintf("adv%d: Unable to set program counter. Initialization"
                       "failed\n", adv->unit);
                return (1);
        }
@@ -860,7 +860,7 @@ adv_init(struct adv_softc *adv)
        } else {
                u_int8_t sync_data;
 
-               printf("adv%d: Warning EEPROM Checksum mismatch. "
+               kprintf("adv%d: Warning EEPROM Checksum mismatch. "
                       "Using default device parameters\n", adv->unit);
 
                /* Set reasonable defaults since we can't read the EEPROM */
@@ -924,7 +924,7 @@ adv_init(struct adv_softc *adv)
         * to be 100% correct.
         */
        if (adv_set_eeprom_config(adv, &eeprom_config) != 0)
-               printf("%s: WARNING! Failure writing to EEPROM.\n",
+               kprintf("%s: WARNING! Failure writing to EEPROM.\n",
                       adv_name(adv));
 #endif
 
@@ -953,7 +953,7 @@ adv_init(struct adv_softc *adv)
        }
        adv_write_lram_8(adv, ADVV_USE_TAGGED_QNG_B, TARGET_BIT_VECTOR_SET);
        adv_write_lram_8(adv, ADVV_CAN_TAGGED_QNG_B, TARGET_BIT_VECTOR_SET);
-       printf("adv%d: AdvanSys %s Host Adapter, SCSI ID %d, queue depth %d\n",
+       kprintf("adv%d: AdvanSys %s Host Adapter, SCSI ID %d, queue depth %d\n",
               adv->unit, (adv->type & ADV_ULTRA) && (max_sync == 0)
                          ? "Ultra SCSI" : "SCSI",
               adv->scsi_id, adv->max_openings);
@@ -984,7 +984,7 @@ adv_intr(void *arg)
                                       ADV_CC_TEST));
 
        if ((chipstat & (ADV_CSW_SCSI_RESET_LATCH|ADV_CSW_SCSI_RESET_ACTIVE))) {
-               printf("Detected Bus Reset\n");
+               kprintf("Detected Bus Reset\n");
                adv_reset_bus(adv, /*initiate_reset*/FALSE);
                return;
        }
@@ -1133,7 +1133,7 @@ adv_done(struct adv_softc *adv, union ccb *ccb, u_int done_stat,
                        break;
                }
                xpt_print_path(ccb->ccb_h.path);
-               printf("adv_done - queue done without error, "
+               kprintf("adv_done - queue done without error, "
                       "but host status non-zero(%x)\n", host_stat);
                /*FALLTHROUGH*/
        case QD_WITH_ERROR:
@@ -1236,7 +1236,7 @@ adv_done(struct adv_softc *adv, union ccb *ccb, u_int done_stat,
 
        default:
                xpt_print_path(ccb->ccb_h.path);
-               printf("adv_done - queue done with unknown status %x:%x\n",
+               kprintf("adv_done - queue done with unknown status %x:%x\n",
                       done_stat, host_stat);
                ccb->ccb_h.status = CAM_REQ_CMP_ERR;
                break;
@@ -1363,7 +1363,7 @@ adv_attach(adv)
         * Fire up the chip
         */
        if (adv_start_chip(adv) != 1) {
-               printf("adv%d: Unable to start on board processor. Aborting.\n",
+               kprintf("adv%d: Unable to start on board processor. Aborting.\n",
                       adv->unit);
                return (ENXIO);
        }
index 4a32140..7b5ddec 100644 (file)
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/advansys/advlib.c,v 1.15.2.1 2000/04/14 13:32:49 nyan Exp $
- * $DragonFly: src/sys/dev/disk/advansys/advlib.c,v 1.7 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/advlib.c,v 1.8 2006/12/22 23:26:15 swildner Exp $
  */
 /*
  * Ported from:
@@ -511,7 +511,7 @@ adv_get_eeprom_config(struct adv_softc *adv, struct
                *wbuf = adv_read_eeprom_16(adv, s_addr);
                sum += *wbuf;
 #if ADV_DEBUG_EEPROM
-               printf("Addr 0x%x: 0x%04x\n", s_addr, *wbuf);
+               kprintf("Addr 0x%x: 0x%04x\n", s_addr, *wbuf);
 #endif
        }
        *wbuf = adv_read_eeprom_16(adv, s_addr);
@@ -590,7 +590,7 @@ adv_init_lram_and_mcode(struct adv_softc *adv)
        retval = adv_load_microcode(adv, 0, (u_int16_t *)adv_mcode,
                                    adv_mcode_size);
        if (retval != adv_mcode_chksum) {
-               printf("adv%d: Microcode download failed checksum!\n",
+               kprintf("adv%d: Microcode download failed checksum!\n",
                       adv->unit);
                return (1);
        }
@@ -1056,7 +1056,7 @@ adv_isr_chip_halted(struct adv_softc *adv)
                scsi_busy &= ~target_mask;
                adv_write_lram_8(adv, ADVV_SCSIBUSY_B, scsi_busy);              
        } else {
-               printf("Unhandled Halt Code %x\n", int_halt_code);
+               kprintf("Unhandled Halt Code %x\n", int_halt_code);
        }
        adv_write_lram_16(adv, ADVV_HALTCODE_W, 0);
 }
@@ -1492,7 +1492,7 @@ adv_init_microcode_var(struct adv_softc *adv)
 
        ADV_OUTW(adv, ADV_REG_PROG_COUNTER, ADV_MCODE_START_ADDR);
        if (ADV_INW(adv, ADV_REG_PROG_COUNTER) != ADV_MCODE_START_ADDR) {
-               printf("adv%d: Unable to set program counter. Aborting.\n",
+               kprintf("adv%d: Unable to set program counter. Aborting.\n",
                       adv->unit);
                return (1);
        }
index 20dece6..0400423 100644 (file)
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/advansys/adw_pci.c,v 1.12.2.1 2000/08/02 22:22:40 peter Exp $
- * $DragonFly: src/sys/dev/disk/advansys/adw_pci.c,v 1.4 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/adw_pci.c,v 1.5 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -266,7 +266,7 @@ adw_pci_attach(device_t dev)
        adw->init_level++;
  
        if (error != 0) {
-               printf("%s: Could not allocate DMA tag - error %d\n",
+               kprintf("%s: Could not allocate DMA tag - error %d\n",
                       adw_name(adw), error);
                adw_free(adw);
                return (error);
index 5951170..875a936 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/advansys/adwcam.c,v 1.7.2.2 2001/03/05 13:08:55 obrien Exp $
- * $DragonFly: src/sys/dev/disk/advansys/adwcam.c,v 1.14 2006/12/20 18:14:38 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/adwcam.c,v 1.15 2006/12/22 23:26:15 swildner Exp $
  */
 /*
  * Ported from:
@@ -115,7 +115,7 @@ adwgetacb(struct adw_softc *adw)
                adwallocacbs(adw);
                acb = SLIST_FIRST(&adw->free_acb_list);
                if (acb == NULL)
-                       printf("%s: Can't malloc ACB\n", adw_name(adw));
+                       kprintf("%s: Can't malloc ACB\n", adw_name(adw));
                else {
                        SLIST_REMOVE_HEAD(&adw->free_acb_list, links);
                }
@@ -235,7 +235,7 @@ adwexecuteacb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
 
        if (error != 0) {
                if (error != EFBIG)
-                       printf("%s: Unexepected error 0x%x returned from "
+                       kprintf("%s: Unexepected error 0x%x returned from "
                               "bus_dmamap_load\n", adw_name(adw), error);
                if (ccb->ccb_h.status == CAM_REQ_INPROG) {
                        xpt_freeze_devq(ccb->ccb_h.path, /*count*/1);
@@ -498,7 +498,7 @@ adw_action(struct cam_sim *sim, union ccb *ccb)
                        ccb->ccb_h.status = CAM_REQ_CMP;
                        if (bootverbose) {
                                xpt_print_path(ccb->ccb_h.path);
-                               printf("BDR Delivered\n");
+                               kprintf("BDR Delivered\n");
                        }
                } else
                        ccb->ccb_h.status = CAM_REQ_CMP_ERR;
@@ -748,7 +748,7 @@ adw_action(struct cam_sim *sim, union ccb *ccb)
                } else {
                        if (bootverbose) {
                                xpt_print_path(adw->path);
-                               printf("Bus Reset Delivered\n");
+                               kprintf("Bus Reset Delivered\n");
                        }
                        ccb->ccb_h.status = CAM_REQ_CMP;
                }
@@ -887,7 +887,7 @@ adw_init(struct adw_softc *adw)
                u_int16_t serial_number[3];
 
                adw->flags |= ADW_EEPROM_FAILED;
-               printf("%s: EEPROM checksum failed.  Restoring Defaults\n",
+               kprintf("%s: EEPROM checksum failed.  Restoring Defaults\n",
                       adw_name(adw));
 
                /*
@@ -967,9 +967,9 @@ adw_init(struct adw_softc *adw)
        if ((adw->features & ADW_ULTRA2) != 0) {
                switch (eep_config.termination_lvd) {
                default:
-                       printf("%s: Invalid EEPROM LVD Termination Settings.\n",
+                       kprintf("%s: Invalid EEPROM LVD Termination Settings.\n",
                               adw_name(adw));
-                       printf("%s: Reverting to Automatic LVD Termination\n",
+                       kprintf("%s: Reverting to Automatic LVD Termination\n",
                               adw_name(adw));
                        /* FALLTHROUGH */
                case ADW_EEPROM_TERM_AUTO:
@@ -988,9 +988,9 @@ adw_init(struct adw_softc *adw)
 
        switch (eep_config.termination_se) {
        default:
-               printf("%s: Invalid SE EEPROM Termination Settings.\n",
+               kprintf("%s: Invalid SE EEPROM Termination Settings.\n",
                       adw_name(adw));
-               printf("%s: Reverting to Automatic SE Termination\n",
+               kprintf("%s: Reverting to Automatic SE Termination\n",
                       adw_name(adw));
                /* FALLTHROUGH */
        case ADW_EEPROM_TERM_AUTO:
@@ -1005,7 +1005,7 @@ adw_init(struct adw_softc *adw)
                scsicfg1 |= ADW_SCSI_CFG1_TERM_CTL_MANUAL;
                break;
        }
-       printf("%s: SCSI ID %d, ", adw_name(adw), adw->initiator_id);
+       kprintf("%s: SCSI ID %d, ", adw_name(adw), adw->initiator_id);
 
        /* DMA tag for mapping buffers into device visible space. */
        if (bus_dma_tag_create(adw->parent_dmat, /*alignment*/1, /*boundary*/0,
@@ -1127,7 +1127,7 @@ adw_init(struct adw_softc *adw)
        if (adw_init_chip(adw, scsicfg1) != 0)
                return (ENXIO);
 
-       printf("Queue Depth %d\n", adw->max_acbs);
+       kprintf("Queue Depth %d\n", adw->max_acbs);
 
        return (0);
 }
@@ -1220,7 +1220,7 @@ adw_intr(void *arg)
                        /*
                         * The firmware detected a SCSI Bus reset.
                         */
-                       printf("Someone Reset the Bus\n");
+                       kprintf("Someone Reset the Bus\n");
                        adw_handle_bus_reset(adw, /*initiated*/FALSE);
                        break;
                case ADW_ASYNC_RDMA_FAILURE:
@@ -1240,7 +1240,7 @@ adw_intr(void *arg)
                        adw_handle_bus_reset(adw, /*initiated*/TRUE);
                        break;
                default:
-                       printf("adw_intr: unknown async code 0x%x\n",
+                       kprintf("adw_intr: unknown async code 0x%x\n",
                               intrb_code);
                        break;
                }
@@ -1255,7 +1255,7 @@ adw_intr(void *arg)
                union ccb *ccb;
 
 #if 0
-               printf("0x%x, 0x%x, 0x%x, 0x%x\n",
+               kprintf("0x%x, 0x%x, 0x%x, 0x%x\n",
                       adw->responseq->carr_offset,
                       adw->responseq->carr_ba,
                       adw->responseq->areq_ba,
@@ -1357,7 +1357,7 @@ adwprocesserror(struct adw_softc *adw, struct acb *acb)
                        break;
                case QHSTA_M_QUEUE_ABORTED:
                        /* BDR or Bus Reset */
-                       printf("Saw Queue Aborted\n");
+                       kprintf("Saw Queue Aborted\n");
                        ccb->ccb_h.status = adw->last_reset;
                        break;
                case QHSTA_M_SXFR_SDMA_ERR:
@@ -1370,7 +1370,7 @@ adwprocesserror(struct adw_softc *adw, struct acb *acb)
                {
                        /* The SCSI bus hung in a phase */
                        xpt_print_path(adw->path);
-                       printf("Watch Dog timer expired.  Reseting bus\n");
+                       kprintf("Watch Dog timer expired.  Reseting bus\n");
                        adw_reset_bus(adw);
                        break;
                }
@@ -1429,13 +1429,13 @@ adwtimeout(void *arg)
        ccb = acb->ccb;
        adw = (struct adw_softc *)ccb->ccb_h.ccb_adw_ptr;
        xpt_print_path(ccb->ccb_h.path);
-       printf("ACB %p - timed out\n", (void *)acb);
+       kprintf("ACB %p - timed out\n", (void *)acb);
 
        crit_enter();
 
        if ((acb->state & ACB_ACTIVE) == 0) {
                xpt_print_path(ccb->ccb_h.path);
-               printf("ACB %p - timed out CCB already completed\n",
+               kprintf("ACB %p - timed out CCB already completed\n",
                       (void *)acb);
                crit_exit();
                return;
@@ -1449,13 +1449,13 @@ adwtimeout(void *arg)
                                   ccb->ccb_h.target_id);
        crit_exit();
        if (status == ADW_IDLE_CMD_SUCCESS) {
-               printf("%s: BDR Delivered.  No longer in timeout\n",
+               kprintf("%s: BDR Delivered.  No longer in timeout\n",
                       adw_name(adw));
                adw_handle_device_reset(adw, target_id);
        } else {
                adw_reset_bus(adw);
                xpt_print_path(adw->path);
-               printf("Bus Reset Delivered.  No longer in timeout\n");
+               kprintf("Bus Reset Delivered.  No longer in timeout\n");
        }
 }
 
index 4634117..aa93d29 100644 (file)
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/advansys/adwlib.c,v 1.6.2.1 2000/04/14 13:32:50 nyan Exp $
- * $DragonFly: src/sys/dev/disk/advansys/adwlib.c,v 1.5 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/adwlib.c,v 1.6 2006/12/22 23:26:15 swildner Exp $
  */
 /*
  * Ported from:
@@ -203,7 +203,7 @@ adw_reset_bus(struct adw_softc *adw)
            adw_idle_cmd_send(adw, ADW_IDLE_CMD_SCSI_RESET_START, /*param*/0);
        if (status != ADW_IDLE_CMD_SUCCESS) {
                xpt_print_path(adw->path);
-               printf("Bus Reset start attempt failed\n");
+               kprintf("Bus Reset start attempt failed\n");
                return (1);
        }
        DELAY(ADW_BUS_RESET_HOLD_DELAY_US);
@@ -211,7 +211,7 @@ adw_reset_bus(struct adw_softc *adw)
            adw_idle_cmd_send(adw, ADW_IDLE_CMD_SCSI_RESET_END, /*param*/0);
        if (status != ADW_IDLE_CMD_SUCCESS) {
                xpt_print_path(adw->path);
-               printf("Bus Reset end attempt failed\n");
+               kprintf("Bus Reset end attempt failed\n");
                return (1);
        }
        return (0);
@@ -474,7 +474,7 @@ adw_init_chip(struct adw_softc *adw, u_int term_scsicfg1)
                checksum += adw_inw(adw, ADW_RAM_DATA);
 
        if (checksum != adw->mcode_data->mcode_chksum) {
-               printf("%s: Firmware load failed!\n", adw_name(adw));
+               kprintf("%s: Firmware load failed!\n", adw_name(adw));
                return (EIO);
        }
 
@@ -551,8 +551,8 @@ adw_init_chip(struct adw_softc *adw, u_int term_scsicfg1)
         * this condition is found.
         */
        if ((adw_inw(adw, ADW_SCSI_CTRL) & 0x3F07) == 0x3F07) {
-               printf("%s: Illegal Cable Config!\n", adw_name(adw));
-               printf("%s: Internal cable is reversed!\n", adw_name(adw));
+               kprintf("%s: Illegal Cable Config!\n", adw_name(adw));
+               kprintf("%s: Internal cable is reversed!\n", adw_name(adw));
                return (EIO);
        }
 
@@ -563,16 +563,16 @@ adw_init_chip(struct adw_softc *adw, u_int term_scsicfg1)
        if ((adw->features & ADW_ULTRA) != 0)  {
                if ((scsicfg1 & ADW_SCSI_CFG1_DIFF_MODE) != 0
                 && (scsicfg1 & ADW_SCSI_CFG1_DIFF_SENSE) == 0) {
-                       printf("%s: A Single Ended Device is attached to our "
+                       kprintf("%s: A Single Ended Device is attached to our "
                               "differential bus!\n", adw_name(adw));
                        return (EIO);
                }
        } else {
                if ((scsicfg1 & ADW2_SCSI_CFG1_DEV_DETECT_HVD) != 0) {
-                       printf("%s: A High Voltage Differential Device "
+                       kprintf("%s: A High Voltage Differential Device "
                               "is attached to this controller.\n",
                               adw_name(adw));
-                       printf("%s: HVD devices are not supported.\n",
+                       kprintf("%s: HVD devices are not supported.\n",
                               adw_name(adw));
                        return (EIO);
                }
@@ -648,9 +648,9 @@ adw_init_chip(struct adw_softc *adw, u_int term_scsicfg1)
                                cable_count++;
 
                        if (cable_count == 3) {
-                               printf("%s: Illegal Cable Config!\n",
+                               kprintf("%s: Illegal Cable Config!\n",
                                       adw_name(adw));
-                               printf("%s: Only Two Ports may be used at "
+                               kprintf("%s: Only Two Ports may be used at "
                                       "a time!\n", adw_name(adw));
                        } else if (cable_count <= 1) {
                                /*
@@ -669,13 +669,13 @@ adw_init_chip(struct adw_softc *adw, u_int term_scsicfg1)
        /* Tell the user about our decission */
        switch (term_scsicfg1 & ADW_SCSI_CFG1_TERM_CTL_MASK) {
        case ADW_SCSI_CFG1_TERM_CTL_MASK:
-               printf("High & Low SE Term Enabled, ");
+               kprintf("High & Low SE Term Enabled, ");
                break;
        case ADW_SCSI_CFG1_TERM_CTL_H:
-               printf("High SE Termination Enabled, ");
+               kprintf("High SE Termination Enabled, ");
                break;
        case ADW_SCSI_CFG1_TERM_CTL_L:
-               printf("Low SE Term Enabled, ");
+               kprintf("Low SE Term Enabled, ");
                break;
        default:
                break;
@@ -683,7 +683,7 @@ adw_init_chip(struct adw_softc *adw, u_int term_scsicfg1)
 
        if ((adw->features & ADW_ULTRA2) != 0
         && (term_scsicfg1 & ADW2_SCSI_CFG1_TERM_CTL_LVD) != 0)
-               printf("LVD Term Enabled, ");
+               kprintf("LVD Term Enabled, ");
 
        /*
         * Invert the TERM_CTL_H and TERM_CTL_L bits and then
index 287dd9c..ac7e0ca 100644 (file)
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/advansys/adwlib.h,v 1.4 2000/03/02 00:08:35 gibbs Exp $
- * $DragonFly: src/sys/dev/disk/advansys/adwlib.h,v 1.3 2003/08/07 21:16:50 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/adwlib.h,v 1.4 2006/12/22 23:26:15 swildner Exp $
  */
 /*
  * Ported from:
@@ -863,7 +863,7 @@ adw_send_acb(struct adw_softc *adw, struct acb *acb, u_int32_t acb_baddr)
        adw->commandq->areq_ba = acbvtob(adw, acb);
        adw->commandq->next_ba = new_cq->carr_ba;
 #if 0
-       printf("EnQ 0x%x 0x%x 0x%x 0x%x\n",
+       kprintf("EnQ 0x%x 0x%x 0x%x 0x%x\n",
               adw->commandq->carr_offset,
               adw->commandq->carr_ba,
               adw->commandq->areq_ba,
index 4bd3c0d..380874f 100644 (file)
@@ -56,7 +56,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/aha/aha.c,v 1.34.2.1 2000/08/02 22:24:39 peter Exp $
- * $DragonFly: src/sys/dev/disk/aha/aha.c,v 1.15 2006/12/20 18:14:38 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/aha/aha.c,v 1.16 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -499,8 +499,8 @@ aha_init(struct aha_softc* aha)
               aha->model, aha->fw_major, aha->fw_minor, aha->boardid);
 
        if (aha->diff_bus != 0)
-               printf("Diff ");
-       printf("SCSI Host Adapter, SCSI ID %d, %d CCBs\n", aha->scsi_id,
+               kprintf("Diff ");
+       kprintf("SCSI Host Adapter, SCSI ID %d, %d CCBs\n", aha->scsi_id,
               aha->max_ccbs);
 
        /*
@@ -681,7 +681,7 @@ aha_find_probe_range(int ioport, int *port_index, int *max_port_index)
                                break;
                if ((i >= AHA_NUM_ISAPORTS)
                 || (ioport != aha_isa_ports[i].addr)) {
-                       printf("\n"
+                       kprintf("\n"
 "aha_isa_probe: Invalid baseport of 0x%x specified.\n"
 "aha_isa_probe: Nearest valid baseport is 0x%x.\n"
 "aha_isa_probe: Failing probe.\n",
@@ -1853,13 +1853,13 @@ ahatimeout(void *arg)
        ccb = accb->ccb;
        aha = (struct aha_softc *)ccb->ccb_h.ccb_aha_ptr;
        xpt_print_path(ccb->ccb_h.path);
-       printf("CCB %p - timed out\n", (void *)accb);
+       kprintf("CCB %p - timed out\n", (void *)accb);
 
        crit_enter();
 
        if ((accb->flags & ACCB_ACTIVE) == 0) {
                xpt_print_path(ccb->ccb_h.path);
-               printf("CCB %p - timed out CCB already completed\n",
+               kprintf("CCB %p - timed out CCB already completed\n",
                       (void *)accb);
                crit_exit();
                return;
index 32dead1..7eb8844 100644 (file)
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.17.2.1 2000/08/02 22:24:40 peter Exp $
- * $DragonFly: src/sys/dev/disk/aha/aha_isa.c,v 1.9 2006/10/25 20:55:53 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/aha/aha_isa.c,v 1.10 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -143,7 +143,7 @@ aha_isa_probe(device_t dev)
                    DEFAULT_CMD_TIMEOUT);
 
                if (error != 0) {
-                       printf("aha_isa_probe: Could not determine IRQ or DMA "
+                       kprintf("aha_isa_probe: Could not determine IRQ or DMA "
                            "settings for adapter at 0x%x.  Failing probe\n",
                            ioport);
                        aha_free(aha);
@@ -165,7 +165,7 @@ aha_isa_probe(device_t dev)
                        drq = 7;
                        break;
                default:
-                       printf("aha_isa_probe: Invalid DMA setting "
+                       kprintf("aha_isa_probe: Invalid DMA setting "
                            "detected for adapter at 0x%x.  "
                            "Failing probe\n", ioport);
                        return (ENXIO);
index 9df5635..113692c 100644 (file)
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.18.2.3 2001/03/05 13:08:55 obrien Exp $
- * $DragonFly: src/sys/dev/disk/ahb/ahb.c,v 1.13 2006/10/25 20:55:53 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ahb/ahb.c,v 1.14 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -229,7 +229,7 @@ ahbprobe(device_t dev)
            irq = 15;
            break;
        default:
-           printf("Adaptec 174X at slot %d: illegal "
+           kprintf("Adaptec 174X at slot %d: illegal "
                   "irq setting %d\n", eisa_get_slot(dev),
                   (intdef & 0x7));
            irq = 0;
@@ -435,7 +435,7 @@ ahbreset(struct ahb_softc *ahb)
        int     test;
 
        if ((ahb_inb(ahb, PORTADDR) & PORTADDR_ENHANCED) == 0) {
-               printf("ahb_reset: Controller not in enhanced mode\n");
+               kprintf("ahb_reset: Controller not in enhanced mode\n");
                return (-1);
        }
 
@@ -449,11 +449,11 @@ ahbreset(struct ahb_softc *ahb)
        }
 
        if (wait == 0) {
-               printf("ahbreset: No answer from aha1742 board\n");
+               kprintf("ahbreset: No answer from aha1742 board\n");
                return (-1);
        }
        if ((test = ahb_inb(ahb, MBOXIN0)) != 0) {
-               printf("ahb_reset: self test failed, val = 0x%x\n", test);
+               kprintf("ahb_reset: self test failed, val = 0x%x\n", test);
                return (-1);
        }
        while (ahb_inb(ahb, HOSTSTAT) & HOSTSTAT_INTPEND) {
@@ -510,7 +510,7 @@ ahbxptattach(struct ahb_softc *ahb)
 
        ahb->num_ecbs = MIN(ahb->num_ecbs,
                            ahb->ha_inq_data->scsi_data.reserved[1]);
-       printf("ahb%ld: %.8s %s SCSI Adapter, FW Rev. %.4s, ID=%d, %d ECBs\n",
+       kprintf("ahb%ld: %.8s %s SCSI Adapter, FW Rev. %.4s, ID=%d, %d ECBs\n",
               ahb->unit, ahb->ha_inq_data->scsi_data.product,
               (ahb->ha_inq_data->scsi_data.flags & 0x4) ? "Differential"
                                                         : "Single Ended",
@@ -558,7 +558,7 @@ ahbhandleimmed(struct ahb_softc *ahb, u_int32_t mbox, u_int intstat)
        u_int target_id;
 
        if (ahb->immed_cmd == 0) {
-               printf("ahb%ld: Immediate Command complete with no "
+               kprintf("ahb%ld: Immediate Command complete with no "
                       " pending command\n", ahb->unit);
                return;
        }
@@ -599,11 +599,11 @@ ahbhandleimmed(struct ahb_softc *ahb, u_int32_t mbox, u_int intstat)
 
        if (ahb->immed_ecb != NULL) {
                ahb->immed_ecb = NULL;
-               printf("ahb%ld: No longer in timeout\n", ahb->unit);
+               kprintf("ahb%ld: No longer in timeout\n", ahb->unit);
        } else if (target_id == ahb->scsi_id)
-               printf("ahb%ld: SCSI Bus Reset Delivered\n", ahb->unit);
+               kprintf("ahb%ld: SCSI Bus Reset Delivered\n", ahb->unit);
        else
-               printf("ahb%ld:  Bus Device Reset Delibered to target %d\n",
+               kprintf("ahb%ld:  Bus Device Reset Delibered to target %d\n",
                       ahb->unit, target_id);
 
        ahb->immed_cmd = 0;
@@ -703,7 +703,7 @@ ahbprocesserror(struct ahb_softc *ahb, struct ecb *ecb, union ccb *ccb)
                struct ccb_trans_settings neg; 
 
                xpt_print_path(ccb->ccb_h.path);
-               printf("refuses tagged commands.  Performing "
+               kprintf("refuses tagged commands.  Performing "
                       "non-tagged I/O\n");
                neg.flags = 0;
                neg.valid = CCB_TRANS_TQ_VALID;
@@ -729,7 +729,7 @@ ahbprocesserror(struct ahb_softc *ahb, struct ecb *ecb, union ccb *ccb)
                ccb->ccb_h.status = CAM_SCSI_BUS_RESET;
                break;
        case HS_INVALID_ECB_PARAM:
-               printf("ahb%ld: opcode 0x%02x, flag_word1 0x%02x, flag_word2 0x%02x\n",
+               kprintf("ahb%ld: opcode 0x%02x, flag_word1 0x%02x, flag_word2 0x%02x\n",
                        ahb->unit, hecb->opcode, hecb->flag_word1, hecb->flag_word2);   
                ccb->ccb_h.status = CAM_SCSI_BUS_RESET;
                break;
@@ -786,7 +786,7 @@ ahbdone(struct ahb_softc *ahb, u_int32_t mbox, u_int intstat)
        } else {
                /* Non CCB Command */
                if ((intstat & INTSTAT_MASK) != INTSTAT_ECB_OK) {
-                       printf("ahb%ld: Command 0%x Failed %x:%x:%x\n",
+                       kprintf("ahb%ld: Command 0%x Failed %x:%x:%x\n",
                               ahb->unit, ecb->hecb.opcode,
                               *((u_int16_t*)&ecb->status),
                               ecb->status.ha_status, ecb->status.resid_count);
@@ -834,11 +834,11 @@ ahbintr(void *arg)
                                xpt_print_path(ahb->path);
                                switch (mbox) {
                                case HS_SCSI_RESET_ADAPTER:
-                                       printf("Host Adapter Initiated "
+                                       kprintf("Host Adapter Initiated "
                                               "Bus Reset occurred\n");
                                        break;
                                case HS_SCSI_RESET_INCOMING:
-                                       printf("Bus Reset Initiated "
+                                       kprintf("Bus Reset Initiated "
                                               "by another device occurred\n");
                                        break;
                                }
@@ -846,7 +846,7 @@ ahbintr(void *arg)
                                xpt_async(AC_BUS_RESET, ahb->path, NULL);
                                break;
                        }
-                       printf("Unsupported initiator selection AEN occured\n");
+                       kprintf("Unsupported initiator selection AEN occured\n");
                        break;
                case INTSTAT_IMMED_OK:
                case INTSTAT_IMMED_ERR:
@@ -872,7 +872,7 @@ ahbexecuteecb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
 
        if (error != 0) {
                if (error != EFBIG)
-                       printf("ahb%ld: Unexepected error 0x%x returned from "
+                       kprintf("ahb%ld: Unexepected error 0x%x returned from "
                               "bus_dmamap_load\n", ahb->unit, error);
                if (ccb->ccb_h.status == CAM_REQ_INPROG) {
                        xpt_freeze_devq(ccb->ccb_h.path, /*count*/1);
@@ -1235,13 +1235,13 @@ ahbtimeout(void *arg)
        ccb = ecb->ccb;
        ahb = (struct ahb_softc *)ccb->ccb_h.ccb_ahb_ptr;
        xpt_print_path(ccb->ccb_h.path);
-       printf("ECB %p - timed out\n", (void *)ecb);
+       kprintf("ECB %p - timed out\n", (void *)ecb);
 
        crit_enter();
 
        if ((ecb->state & ECB_ACTIVE) == 0) {
                xpt_print_path(ccb->ccb_h.path);
-               printf("ECB %p - timed out ECB already completed\n",
+               kprintf("ECB %p - timed out ECB already completed\n",
                       (void *)ecb);
                crit_exit();
                return;
@@ -1288,7 +1288,7 @@ ahbtimeout(void *arg)
                 * later which will attempt a bus reset.
                 */
                xpt_print_path(ccb->ccb_h.path);
-               printf("Queuing BDR\n");
+               kprintf("Queuing BDR\n");
                ecb->state |= ECB_DEVICE_RESET;
                callout_reset(&ccb->ccb_h.timeout_ch, 2 * hz, ahbtimeout, ecb);
 
@@ -1300,7 +1300,7 @@ ahbtimeout(void *arg)
                 * have already attempted to clear the condition with a BDR.
                 */
                xpt_print_path(ccb->ccb_h.path);
-               printf("Attempting SCSI Bus reset\n");
+               kprintf("Attempting SCSI Bus reset\n");
                ecb->state |= ECB_SCSIBUS_RESET;
                callout_reset(&ccb->ccb_h.timeout_ch, 2 * hz, ahbtimeout, ecb);
                ahb->immed_cmd = IMMED_RESET;
index 8f6b3b1..8428541 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/aic/aic.c,v 1.8 2000/01/14 23:42:35 imp Exp $
- * $DragonFly: src/sys/dev/disk/aic/aic.c,v 1.8 2006/10/25 20:55:53 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/aic/aic.c,v 1.9 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -450,7 +450,7 @@ aic_reselected(struct aic_softc *aic)
        selid = aic_inb(aic, SELID) & ~(1 << aic->initiator);
        if (selid & (selid - 1)) {
                /* this should never have happened */
-               printf("aic_reselected: invalid selid %x\n", selid);
+               kprintf("aic_reselected: invalid selid %x\n", selid);
                aic_reset(aic, /*initiate_reset*/TRUE);
                return;
        }
@@ -651,7 +651,7 @@ aic_handle_msgin(struct aic_softc *aic)
                                /*scsi_sense_print(csio);*/
                        } else {
                                ccb_h->status |= CAM_AUTOSENSE_FAIL;
-                               printf("ccb %p sense failed %x\n",
+                               kprintf("ccb %p sense failed %x\n",
                                    ccb_h, scb->status);
                        }
                } else {
@@ -1124,17 +1124,17 @@ aic_timeout(void *arg)
        struct aic_softc *aic = (struct aic_softc *)ccb->ccb_h.ccb_aic_ptr;
 
        xpt_print_path(ccb->ccb_h.path);
-       printf("ccb %p - timed out", ccb);
+       kprintf("ccb %p - timed out", ccb);
        if (aic->nexus && aic->nexus != scb)
-               printf(", nexus %p", aic->nexus->ccb);
-       printf(", phase 0x%x, state %d\n", aic_inb(aic, SCSISIGI), aic->state);
+               kprintf(", nexus %p", aic->nexus->ccb);
+       kprintf(", phase 0x%x, state %d\n", aic_inb(aic, SCSISIGI), aic->state);
 
        crit_enter();
 
        if ((scb->flags & SCB_ACTIVE) == 0) {
                crit_exit();
                xpt_print_path(ccb->ccb_h.path);
-               printf("ccb %p - timed out already completed\n", ccb);
+               kprintf("ccb %p - timed out already completed\n", ccb);
                return;
        }
 
@@ -1296,7 +1296,7 @@ aic_intr(void *arg)
                return;
        }
 
-       printf("aic_intr: unexpected intr sstat0 %x sstat1 %x\n",
+       kprintf("aic_intr: unexpected intr sstat0 %x sstat1 %x\n",
                sstat0, sstat1);
        aic_outb(aic, DMACNTRL0, INTEN);
 }
@@ -1497,15 +1497,15 @@ aic_attach(struct aic_softc *aic)
 
        aic_init(aic);
 
-       printf("aic%d: %s", aic->unit,
+       kprintf("aic%d: %s", aic->unit,
            aic_inb(aic, REV) > 0 ? "aic6360" : "aic6260");
        if (aic->flags & AIC_DMA_ENABLE)
-               printf(", dma");
+               kprintf(", dma");
        if (aic->flags & AIC_DISC_ENABLE)
-               printf(", disconnection");
+               kprintf(", disconnection");
        if (aic->flags & AIC_PARITY_ENABLE)
-               printf(", parity check");
-       printf("\n");
+               kprintf(", parity check");
+       kprintf("\n");
        return (0);
 }
 
index 9f133e0..a098cb2 100644 (file)
@@ -29,7 +29,7 @@
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahc_eisa.c#11 $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.15.2.11 2003/06/10 03:26:07 gibbs Exp $
- * $DragonFly: src/sys/dev/disk/aic7xxx/ahc_eisa.c,v 1.5 2006/09/05 00:55:37 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/aic7xxx/ahc_eisa.c,v 1.6 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include "aic7xxx_osm.h"
@@ -91,7 +91,7 @@ aic7770_probe(device_t dev)
        case 15:
                break;
        default:
-               printf("aic7770 at slot %d: illegal irq setting %d\n",
+               kprintf("aic7770 at slot %d: illegal irq setting %d\n",
                       eisa_get_slot(dev), intdef);
                error = ENXIO;
        }
@@ -142,7 +142,7 @@ aic7770_attach(device_t dev)
                                   &ahc->parent_dmat);
 
        if (error != 0) {
-               printf("ahc_eisa_attach: Could not allocate DMA tag "
+               kprintf("ahc_eisa_attach: Could not allocate DMA tag "
                       "- error %d\n", error);
                ahc_free(ahc);
                return (ENOMEM);
index b54bdc7..feee138 100644 (file)
@@ -31,7 +31,7 @@
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahc_pci.c#13 $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.29.2.14 2003/06/10 03:26:07 gibbs Exp $
- * $DragonFly: src/sys/dev/disk/aic7xxx/ahc_pci.c,v 1.7 2006/09/05 16:50:50 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/aic7xxx/ahc_pci.c,v 1.8 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include "aic7xxx_osm.h"
@@ -124,7 +124,7 @@ ahc_pci_attach(device_t dev)
                                   &ahc->parent_dmat);
 
        if (error != 0) {
-               printf("ahc_pci_attach: Could not allocate DMA tag "
+               kprintf("ahc_pci_attach: Could not allocate DMA tag "
                       "- error %d\n", error);
                ahc_free(ahc);
                return (ENOMEM);
@@ -162,11 +162,11 @@ ahc_pci_map_registers(struct ahc_softc *ahc)
                        device_printf(ahc->dev_softc, "Defaulting to MEMIO ");
 #ifdef AHC_ALLOW_MEMIO
                if (bootverbose)
-                       printf("on\n");
+                       kprintf("on\n");
                allow_memio = 1;
 #else
                if (bootverbose)
-                       printf("off\n");
+                       kprintf("off\n");
                allow_memio = 0;
 #endif
        }
index 0084197..8a38d2c 100644 (file)
@@ -31,7 +31,7 @@
  * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahd_pci.c#13 $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.2.2.5 2003/06/10 03:26:07 gibbs Exp $
- * $DragonFly: src/sys/dev/disk/aic7xxx/ahd_pci.c,v 1.6 2006/09/05 00:55:37 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/aic7xxx/ahd_pci.c,v 1.7 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include "aic79xx_osm.h"
@@ -125,7 +125,7 @@ ahd_pci_attach(device_t dev)
                                   &ahd->parent_dmat);
 
        if (error != 0) {
-               printf("ahd_pci_attach: Could not allocate DMA tag "
+               kprintf("ahd_pci_attach: Could not allocate DMA tag "
                       "- error %d\n", error);
                ahd_free(ahd);
                return (ENOMEM);
index 746eefc..62ff171 100644 (file)
@@ -40,7 +40,7 @@
  * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#32 $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7770.c,v 1.1.2.9 2003/06/10 03:26:07 gibbs Exp $
- * $DragonFly: src/sys/dev/disk/aic7xxx/aic7770.c,v 1.5 2006/09/05 00:55:37 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/aic7xxx/aic7770.c,v 1.6 2006/12/22 23:26:15 swildner Exp $
  */
 
 #ifdef __linux__
@@ -176,7 +176,7 @@ aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io)
        case 15:
                break;
        default:
-               printf("aic7770_config: illegal irq setting %d\n", intdef);
+               kprintf("aic7770_config: illegal irq setting %d\n", intdef);
                return (ENXIO);
        }
 
@@ -318,7 +318,7 @@ aha2840_load_seeprom(struct ahc_softc *ahc)
        sc = ahc->seep_config;
 
        if (bootverbose)
-               printf("%s: Reading SEEPROM...", ahc_name(ahc));
+               kprintf("%s: Reading SEEPROM...", ahc_name(ahc));
        have_seeprom = ahc_read_seeprom(&sd, (uint16_t *)sc,
                                        /*start_addr*/0, sizeof(*sc)/2);
 
@@ -326,16 +326,16 @@ aha2840_load_seeprom(struct ahc_softc *ahc)
 
                if (ahc_verify_cksum(sc) == 0) {
                        if(bootverbose)
-                               printf ("checksum error\n");
+                               kprintf ("checksum error\n");
                        have_seeprom = 0;
                } else if (bootverbose) {
-                       printf("done.\n");
+                       kprintf("done.\n");
                }
        }
 
        if (!have_seeprom) {
                if (bootverbose)
-                       printf("%s: No SEEPROM available\n", ahc_name(ahc));
+                       kprintf("%s: No SEEPROM available\n", ahc_name(ahc));
                ahc->flags |= AHC_USEDEFAULTS;
        } else {
                /*
index 4c2d1b2..5aa7bba 100644 (file)
@@ -40,7 +40,7 @@
  * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#198 $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.3.2.5 2003/06/10 03:26:07 gibbs Exp $
- * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx.c,v 1.11 2006/12/20 18:14:38 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx.c,v 1.12 2006/12/22 23:26:15 swildner Exp $
  */
 
 #include "aic79xx_osm.h"
@@ -338,7 +338,7 @@ ahd_clear_fifo(struct ahd_softc *ahd, u_int fifo)
 
 #ifdef AHD_DEBUG
        if ((ahd_debug & AHD_SHOW_FIFOS) != 0)
-               printf("%s: Clearing FIFO %d\n", ahd_name(ahd), fifo);
+               kprintf("%s: Clearing FIFO %d\n", ahd_name(ahd), fifo);
 #endif
        saved_modes = ahd_save_modes(ahd);
        ahd_set_modes(ahd, fifo, fifo);
@@ -404,7 +404,7 @@ ahd_flush_qoutfifo(struct ahd_softc *ahd)
                next_scbid = ahd_inw_scbram(ahd, SCB_NEXT_COMPLETE);
                scb = ahd_lookup_scb(ahd, scbid);
                if (scb == NULL) {
-                       printf("%s: Warning - DMA-up and complete "
+                       kprintf("%s: Warning - DMA-up and complete "
                               "SCB %d invalid\n", ahd_name(ahd), scbid);
                        continue;
                }
@@ -424,7 +424,7 @@ ahd_flush_qoutfifo(struct ahd_softc *ahd)
                next_scbid = ahd_inw_scbram(ahd, SCB_NEXT_COMPLETE);
                scb = ahd_lookup_scb(ahd, scbid);
                if (scb == NULL) {
-                       printf("%s: Warning - Complete SCB %d invalid\n",
+                       kprintf("%s: Warning - Complete SCB %d invalid\n",
                               ahd_name(ahd), scbid);
                        continue;
                }
@@ -444,7 +444,7 @@ ahd_flush_qoutfifo(struct ahd_softc *ahd)
                      | ahd_inb(ahd, GSFIFO);
                scb = ahd_lookup_scb(ahd, scbid);
                if (scb == NULL) {
-                       printf("%s: Warning - GSFIFO SCB %d invalid\n",
+                       kprintf("%s: Warning - GSFIFO SCB %d invalid\n",
                               ahd_name(ahd), scbid);
                        continue;
                }
@@ -475,7 +475,7 @@ ahd_run_qoutfifo(struct ahd_softc *ahd)
                                      & ~QOUTFIFO_ENTRY_VALID_LE);
                scb = ahd_lookup_scb(ahd, scb_index);
                if (scb == NULL) {
-                       printf("%s: WARNING no command for scb %d "
+                       kprintf("%s: WARNING no command for scb %d "
                               "(cmdcmplt)\nQOUTPOS = %d\n",
                               ahd_name(ahd), scb_index,
                               ahd->qoutfifonext);
@@ -504,7 +504,7 @@ ahd_handle_hwerrint(struct ahd_softc *ahd)
        error = ahd_inb(ahd, ERROR);
        for (i = 0; i < num_errors; i++) {
                if ((error & ahd_hard_errors[i].error) != 0)
-                       printf("%s: hwerrint, %s\n",
+                       kprintf("%s: hwerrint, %s\n",
                               ahd_name(ahd), ahd_hard_errors[i].errmesg);
        }
 
@@ -547,7 +547,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
        ahd_update_modes(ahd);
 #ifdef AHD_DEBUG
        if ((ahd_debug & AHD_SHOW_MISC) != 0)
-               printf("%s: Handle Seqint Called for code %d\n",
+               kprintf("%s: Handle Seqint Called for code %d\n",
                       ahd_name(ahd), seqintcode);
 #endif
        switch (seqintcode) {
@@ -562,7 +562,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                if (scb != NULL) {
                        ahd_complete_scb(ahd, scb);
                } else {
-                       printf("%s: WARNING no command for scb %d "
+                       kprintf("%s: WARNING no command for scb %d "
                               "(bad status)\n", ahd_name(ahd), scbid);
                        ahd_dump_card_state(ahd);
                }
@@ -601,18 +601,18 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                         */
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_RECOVERY) != 0)
-                               printf("%s: Assuming LQIPHASE_NLQ with "
+                               kprintf("%s: Assuming LQIPHASE_NLQ with "
                                       "P0 assertion\n", ahd_name(ahd));
 #endif
                }
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_RECOVERY) != 0)
-                       printf("%s: Entering NONPACK\n", ahd_name(ahd));
+                       kprintf("%s: Entering NONPACK\n", ahd_name(ahd));
 #endif
                break;
        }
        case INVALID_SEQINT:
-               printf("%s: Invalid Sequencer interrupt occurred.\n",
+               kprintf("%s: Invalid Sequencer interrupt occurred.\n",
                       ahd_name(ahd));
                ahd_dump_card_state(ahd);
                ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE);
@@ -627,8 +627,8 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                if (scb != NULL)
                        ahd_print_path(ahd, scb);
                else
-                       printf("%s: ", ahd_name(ahd));
-               printf("SCB %d Packetized Status Overrun", scbid);
+                       kprintf("%s: ", ahd_name(ahd));
+               kprintf("SCB %d Packetized Status Overrun", scbid);
                ahd_dump_card_state(ahd);
                ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE);
                break;
@@ -642,7 +642,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                scb = ahd_lookup_scb(ahd, scbid);
                if (scb == NULL) {
                        ahd_dump_card_state(ahd);
-                       printf("CFG4ISTAT: Free SCB %d referenced", scbid);
+                       kprintf("CFG4ISTAT: Free SCB %d referenced", scbid);
                        panic("For safety");
                }
                ahd_outq(ahd, HADDR, scb->sense_busaddr);
@@ -657,7 +657,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                u_int bus_phase;
 
                bus_phase = ahd_inb(ahd, SCSISIGI) & PHASE_MASK;
-               printf("%s: ILLEGAL_PHASE 0x%x\n",
+               kprintf("%s: ILLEGAL_PHASE 0x%x\n",
                       ahd_name(ahd), bus_phase);
 
                switch (bus_phase) {
@@ -669,7 +669,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                case P_STATUS:
                case P_MESGIN:
                        ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE);
-                       printf("%s: Issued Bus Reset.\n", ahd_name(ahd));
+                       kprintf("%s: Issued Bus Reset.\n", ahd_name(ahd));
                        break;
                case P_COMMAND:
                {
@@ -694,7 +694,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                        scbid = ahd_get_scbptr(ahd);
                        scb = ahd_lookup_scb(ahd, scbid);
                        if (scb == NULL) {
-                               printf("Invalid phase with no valid SCB.  "
+                               kprintf("Invalid phase with no valid SCB.  "
                                       "Resetting bus.\n");
                                ahd_reset_channel(ahd, 'A',
                                                  /*Initiate Reset*/TRUE);
@@ -753,7 +753,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_RECOVERY) != 0) {
                                ahd_print_path(ahd, scb);
-                               printf("Unexpected command phase from "
+                               kprintf("Unexpected command phase from "
                                       "packetized target\n");
                        }
 #endif
@@ -769,7 +769,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_RECOVERY) != 0) {
-                       printf("%s: CFG4OVERRUN mode = %x\n", ahd_name(ahd),
+                       kprintf("%s: CFG4OVERRUN mode = %x\n", ahd_name(ahd),
                               ahd_inb(ahd, MODE_PTR));
                }
 #endif
@@ -804,7 +804,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
        {
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_RECOVERY) != 0) {
-                       printf("%s: PDATA_REINIT - DFCNTRL = 0x%x "
+                       kprintf("%s: PDATA_REINIT - DFCNTRL = 0x%x "
                               "SG_CACHE_SHADOW = 0x%x\n",
                               ahd_name(ahd), ahd_inb(ahd, DFCNTRL),
                               ahd_inb(ahd, SG_CACHE_SHADOW));
@@ -837,7 +837,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                        bus_phase = ahd_inb(ahd, SCSISIGI) & PHASE_MASK;
                        if (bus_phase != P_MESGIN
                         && bus_phase != P_MESGOUT) {
-                               printf("ahd_intr: HOST_MSG_LOOP bad "
+                               kprintf("ahd_intr: HOST_MSG_LOOP bad "
                                       "phase 0x%x\n", bus_phase);
                                /*
                                 * Probably transitioned to bus free before
@@ -886,29 +886,29 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                AHD_ASSERT_MODES(ahd, AHD_MODE_SCSI_MSK, AHD_MODE_SCSI_MSK);
                ahd_outb(ahd, SCSISEQ0, ahd_inb(ahd, SCSISEQ0) & ~ENSELO);
 
-               printf("%s:%c:%d: no active SCB for reconnecting "
+               kprintf("%s:%c:%d: no active SCB for reconnecting "
                       "target - issuing BUS DEVICE RESET\n",
                       ahd_name(ahd), 'A', ahd_inb(ahd, SELID) >> 4);
-               printf("SAVED_SCSIID == 0x%x, SAVED_LUN == 0x%x, "
+               kprintf("SAVED_SCSIID == 0x%x, SAVED_LUN == 0x%x, "
                       "REG0 == 0x%x ACCUM = 0x%x\n",
                       ahd_inb(ahd, SAVED_SCSIID), ahd_inb(ahd, SAVED_LUN),
                       ahd_inw(ahd, REG0), ahd_inb(ahd, ACCUM));
-               printf("SEQ_FLAGS == 0x%x, SCBPTR == 0x%x, BTT == 0x%x, "
+               kprintf("SEQ_FLAGS == 0x%x, SCBPTR == 0x%x, BTT == 0x%x, "
                       "SINDEX == 0x%x\n",
                       ahd_inb(ahd, SEQ_FLAGS), ahd_get_scbptr(ahd),
                       ahd_find_busy_tcl(ahd,
                                         BUILD_TCL(ahd_inb(ahd, SAVED_SCSIID),
                                                   ahd_inb(ahd, SAVED_LUN))),
                       ahd_inw(ahd, SINDEX));
-               printf("SELID == 0x%x, SCB_SCSIID == 0x%x, SCB_LUN == 0x%x, "
+               kprintf("SELID == 0x%x, SCB_SCSIID == 0x%x, SCB_LUN == 0x%x, "
                       "SCB_CONTROL == 0x%x\n",
                       ahd_inb(ahd, SELID), ahd_inb_scbram(ahd, SCB_SCSIID),
                       ahd_inb_scbram(ahd, SCB_LUN),
                       ahd_inb_scbram(ahd, SCB_CONTROL));
-               printf("SCSIBUS[0] == 0x%x, SCSISIGI == 0x%x\n",
+               kprintf("SCSIBUS[0] == 0x%x, SCSISIGI == 0x%x\n",
                       ahd_inb(ahd, SCSIBUS), ahd_inb(ahd, SCSISIGI));
-               printf("SXFRCTL0 == 0x%x\n", ahd_inb(ahd, SXFRCTL0));
-               printf("SEQCTL0 == 0x%x\n", ahd_inb(ahd, SEQCTL0));
+               kprintf("SXFRCTL0 == 0x%x\n", ahd_inb(ahd, SXFRCTL0));
+               kprintf("SEQCTL0 == 0x%x\n", ahd_inb(ahd, SEQCTL0));
                ahd_dump_card_state(ahd);
                ahd->msgout_buf[0] = MSG_BUS_DEV_RESET;
                ahd->msgout_len = 1;
@@ -936,7 +936,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                u_int lastphase;
 
                lastphase = ahd_inb(ahd, LASTPHASE);
-               printf("%s:%c:%d: unknown scsi bus phase %x, "
+               kprintf("%s:%c:%d: unknown scsi bus phase %x, "
                       "lastphase = 0x%x.  Attempting to continue\n",
                       ahd_name(ahd), 'A',
                       SCSIID_TARGET(ahd, ahd_inb(ahd, SAVED_SCSIID)),
@@ -948,7 +948,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                u_int lastphase;
 
                lastphase = ahd_inb(ahd, LASTPHASE);
-               printf("%s:%c:%d: Missed busfree. "
+               kprintf("%s:%c:%d: Missed busfree. "
                       "Lastphase = 0x%x, Curphase = 0x%x\n",
                       ahd_name(ahd), 'A',
                       SCSIID_TARGET(ahd, ahd_inb(ahd, SAVED_SCSIID)),
@@ -978,11 +978,11 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                lastphase = ahd_inb(ahd, LASTPHASE);
                if ((ahd_debug & AHD_SHOW_RECOVERY) != 0) {
                        ahd_print_path(ahd, scb);
-                       printf("data overrun detected %s.  Tag == 0x%x.\n",
+                       kprintf("data overrun detected %s.  Tag == 0x%x.\n",
                               ahd_lookup_phase_entry(lastphase)->phasemsg,
                               SCB_GET_TAG(scb));
                        ahd_print_path(ahd, scb);
-                       printf("%s seen Data Phase.  Length = %ld.  "
+                       kprintf("%s seen Data Phase.  Length = %ld.  "
                               "NumSGs = %d.\n",
                               ahd_inb(ahd, SEQ_FLAGS) & DPHASE
                               ? "Have" : "Haven't",
@@ -1007,7 +1007,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                u_int scbid;
 
                ahd_fetch_devinfo(ahd, &devinfo);
-               printf("%s:%c:%d:%d: Attempt to issue message failed\n",
+               kprintf("%s:%c:%d:%d: Attempt to issue message failed\n",
                       ahd_name(ahd), devinfo.channel, devinfo.target,
                       devinfo.lun);
                scbid = ahd_get_scbptr(ahd);
@@ -1040,7 +1040,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                        cam_status error;
 
                        ahd_print_path(ahd, scb);
-                       printf("Task Management Func 0x%x Complete\n",
+                       kprintf("Task Management Func 0x%x Complete\n",
                               scb->hscb->task_management);
                        lun = CAM_LUN_WILDCARD;
                        tag = SCB_LIST_NULL;
@@ -1096,7 +1096,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                         * the QINFIFO if it is still there.
                          */
                        ahd_print_path(ahd, scb);
-                       printf("SCB completes before TMF\n");
+                       kprintf("SCB completes before TMF\n");
                        /*
                         * Handle losing the race.  Wait until any
                         * current selection completes.  We will then
@@ -1121,7 +1121,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
        case TRACEPOINT1:
        case TRACEPOINT2:
        case TRACEPOINT3:
-               printf("%s: Tracepoint %d\n", ahd_name(ahd),
+               kprintf("%s: Tracepoint %d\n", ahd_name(ahd),
                       seqintcode - TRACEPOINT0);
                break;
        case NO_SEQINT:
@@ -1130,7 +1130,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                ahd_handle_hwerrint(ahd);
                break;
        default:
-               printf("%s: Unexpected SEQINTCODE %d\n", ahd_name(ahd),
+               kprintf("%s: Unexpected SEQINTCODE %d\n", ahd_name(ahd),
                       seqintcode);
                break;
        }
@@ -1184,7 +1184,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
                u_int now_lvd;
 
                now_lvd = ahd_inb(ahd, SBLKCTL) & ENAB40;
-               printf("%s: Transceiver State Has Changed to %s mode\n",
+               kprintf("%s: Transceiver State Has Changed to %s mode\n",
                       ahd_name(ahd), now_lvd ? "LVD" : "SE");
                ahd_outb(ahd, CLRSINT0, CLRIOERR);
                /*
@@ -1195,16 +1195,16 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
                ahd_setup_iocell_workaround(ahd);
                ahd_unpause(ahd);
        } else if ((status0 & OVERRUN) != 0) {
-               printf("%s: SCSI offset overrun detected.  Resetting bus.\n",
+               kprintf("%s: SCSI offset overrun detected.  Resetting bus.\n",
                       ahd_name(ahd));
                ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE);
        } else if ((status & SCSIRSTI) != 0) {
-               printf("%s: Someone reset channel A\n", ahd_name(ahd));
+               kprintf("%s: Someone reset channel A\n", ahd_name(ahd));
                ahd_reset_channel(ahd, 'A', /*Initiate Reset*/FALSE);
        } else if ((status & SCSIPERR) != 0) {
                ahd_handle_transmission_error(ahd);
        } else if (lqostat0 != 0) {
-               printf("%s: lqostat0 == 0x%x!\n", ahd_name(ahd), lqostat0);
+               kprintf("%s: lqostat0 == 0x%x!\n", ahd_name(ahd), lqostat0);
                ahd_outb(ahd, CLRLQOINT0, lqostat0);
                if ((ahd->bugs & AHD_CLRLQO_AUTOCLR_BUG) != 0) {
                        ahd_outb(ahd, CLRLQOINT1, 0);
@@ -1234,7 +1234,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
                scbid = ahd_inw(ahd, WAITING_TID_HEAD);
                scb = ahd_lookup_scb(ahd, scbid);
                if (scb == NULL) {
-                       printf("%s: ahd_intr - referenced scb not "
+                       kprintf("%s: ahd_intr - referenced scb not "
                               "valid during SELTO scb(0x%x)\n",
                               ahd_name(ahd), scbid);
                        ahd_dump_card_state(ahd);
@@ -1243,7 +1243,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_SELTO) != 0) {
                                ahd_print_path(ahd, scb);
-                               printf("Saw Selection Timeout for SCB 0x%x\n",
+                               kprintf("Saw Selection Timeout for SCB 0x%x\n",
                                       scbid);
                        }
 #endif
@@ -1268,7 +1268,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
                ahd_iocell_first_selection(ahd);
                ahd_unpause(ahd);
        } else if (status3 != 0) {
-               printf("%s: SCSI Cell parity error SSTAT3 == 0x%x\n",
+               kprintf("%s: SCSI Cell parity error SSTAT3 == 0x%x\n",
                       ahd_name(ahd), status3);
                ahd_outb(ahd, CLRSINT3, status3);
        } else if ((lqistat1 & (LQIPHASE_LQ|LQIPHASE_NLQ)) != 0) {
@@ -1316,7 +1316,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
                        scbid = ahd_get_scbptr(ahd);
                        scb = ahd_lookup_scb(ahd, scbid);
                        if (scb == NULL) {
-                               printf("%s: Invalid SCB %d in DFF%d "
+                               kprintf("%s: Invalid SCB %d in DFF%d "
                                       "during unexpected busfree\n",
                                       ahd_name(ahd), scbid, mode);
                                packetized = 0;
@@ -1340,7 +1340,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
 
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_MISC) != 0)
-                       printf("Saw Busfree.  Busfreetime = 0x%x.\n",
+                       kprintf("Saw Busfree.  Busfreetime = 0x%x.\n",
                               busfreetime);
 #endif
                /*
@@ -1381,7 +1381,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
                        ahd_unpause(ahd);
                }
        } else {
-               printf("%s: Missing case in ahd_handle_scsiint. status = %x\n",
+               kprintf("%s: Missing case in ahd_handle_scsiint. status = %x\n",
                       ahd_name(ahd), status);
                ahd_dump_card_state(ahd);
                ahd_clear_intstat(ahd);
@@ -1417,7 +1417,7 @@ ahd_handle_transmission_error(struct ahd_softc *ahd)
                 || (lqistate == 0x29)) {
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_RECOVERY) != 0) {
-                               printf("%s: NLQCRC found via LQISTATE\n",
+                               kprintf("%s: NLQCRC found via LQISTATE\n",
                                       ahd_name(ahd));
                        }
 #endif
@@ -1449,18 +1449,18 @@ ahd_handle_transmission_error(struct ahd_softc *ahd)
 
        cur_col = 0;
        if (silent == FALSE) {
-               printf("%s: Transmission error detected\n", ahd_name(ahd));
+               kprintf("%s: Transmission error detected\n", ahd_name(ahd));
                ahd_lqistat1_print(lqistat1, &cur_col, 50);
                ahd_lastphase_print(lastphase, &cur_col, 50);
                ahd_scsisigi_print(curphase, &cur_col, 50);
                ahd_perrdiag_print(perrdiag, &cur_col, 50);
-               printf("\n");
+               kprintf("\n");
                ahd_dump_card_state(ahd);
        }
 
        if ((lqistat1 & (LQIOVERI_LQ|LQIOVERI_NLQ)) != 0) {
                if (silent == FALSE) {
-                       printf("%s: Gross protocol error during incoming "
+                       kprintf("%s: Gross protocol error during incoming "
                               "packet.  lqistat1 == 0x%x.  Resetting bus.\n",
                               ahd_name(ahd), lqistat1);
                }
@@ -1489,7 +1489,7 @@ ahd_handle_transmission_error(struct ahd_softc *ahd)
                 * (SPI4R09 10.7.3.3.3)
                 */
                ahd_outb(ahd, LQCTL2, LQIRETRY);
-               printf("LQIRetry for LQICRCI_LQ to release ACK\n");
+               kprintf("LQIRetry for LQICRCI_LQ to release ACK\n");
        } else if ((lqistat1 & LQICRCI_NLQ) != 0) {
                /*
                 * We detected a CRC error in a NON-LQ packet.
@@ -1537,22 +1537,22 @@ ahd_handle_transmission_error(struct ahd_softc *ahd)
                 * Busfree detection is enabled.
                 */
                if (silent == FALSE)
-                       printf("LQICRC_NLQ\n");
+                       kprintf("LQICRC_NLQ\n");
                if (scb == NULL) {
-                       printf("%s: No SCB valid for LQICRC_NLQ.  "
+                       kprintf("%s: No SCB valid for LQICRC_NLQ.  "
                               "Resetting bus\n", ahd_name(ahd));
                        ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE);
                        return;
                }
        } else if ((lqistat1 & LQIBADLQI) != 0) {
-               printf("Need to handle BADLQI!\n");
+               kprintf("Need to handle BADLQI!\n");
                ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE);
                return;
        } else if ((perrdiag & (PARITYERR|PREVPHASE)) == PARITYERR) {
                if ((curphase & ~P_DATAIN_DT) != 0) {
                        /* Ack the byte.  So we can continue. */
                        if (silent == FALSE)
-                               printf("Acking %s to clear perror\n",
+                               kprintf("Acking %s to clear perror\n",
                                    ahd_lookup_phase_entry(curphase)->phasemsg);
                        ahd_inb(ahd, SCSIDAT);
                }
@@ -1597,10 +1597,10 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1)
        if ((ahd_inb(ahd, SCSISIGO) & ATNO) != 0
         && (ahd_inb(ahd, MDFFSTAT) & DLZERO) != 0) {
                if ((lqistat1 & LQIPHASE_LQ) != 0) {
-                       printf("LQIRETRY for LQIPHASE_LQ\n");
+                       kprintf("LQIRETRY for LQIPHASE_LQ\n");
                        ahd_outb(ahd, LQCTL2, LQIRETRY);
                } else if ((lqistat1 & LQIPHASE_NLQ) != 0) {
-                       printf("LQIRETRY for LQIPHASE_NLQ\n");
+                       kprintf("LQIRETRY for LQIPHASE_NLQ\n");
                        ahd_outb(ahd, LQCTL2, LQIRETRY);
                } else
                        panic("ahd_handle_lqiphase_error: No phase errors\n");
@@ -1608,7 +1608,7 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1)
                ahd_outb(ahd, CLRINT, CLRSCSIINT);
                ahd_unpause(ahd);
        } else {
-               printf("Reseting Channel for LQI Phase error\n");
+               kprintf("Reseting Channel for LQI Phase error\n");
                ahd_dump_card_state(ahd);
                ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE);
        }
@@ -1635,7 +1635,7 @@ ahd_handle_pkt_busfree(struct ahd_softc *ahd, u_int busfreetime)
                u_int next;
 
                if ((busfreetime & BUSFREE_LQO) == 0)
-                       printf("%s: Warning, BUSFREE time is 0x%x.  "
+                       kprintf("%s: Warning, BUSFREE time is 0x%x.  "
                               "Expected BUSFREE_LQO.\n",
                               ahd_name(ahd), busfreetime);
                /*
@@ -1700,7 +1700,7 @@ ahd_handle_pkt_busfree(struct ahd_softc *ahd, u_int busfreetime)
                if (scb->crc_retry_count < AHD_MAX_LQ_CRC_ERRORS) {
                        if (SCB_IS_SILENT(scb) == FALSE) {
                                ahd_print_path(ahd, scb);
-                               printf("Probable outgoing LQ CRC error.  "
+                               kprintf("Probable outgoing LQ CRC error.  "
                                       "Retrying command\n");
                        }
                        scb->crc_retry_count++;
@@ -1722,7 +1722,7 @@ ahd_handle_pkt_busfree(struct ahd_softc *ahd, u_int busfreetime)
                ahd_outb(ahd, CLRSINT1, CLRSCSIPERR|CLRBUSFREE);
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_MASKED_ERRORS) != 0)
-                       printf("%s: Parity on last REQ detected "
+                       kprintf("%s: Parity on last REQ detected "
                               "during busfree phase.\n",
                               ahd_name(ahd));
 #endif
@@ -1736,7 +1736,7 @@ ahd_handle_pkt_busfree(struct ahd_softc *ahd, u_int busfreetime)
                scbid = ahd_get_scbptr(ahd);
                scb = ahd_lookup_scb(ahd, scbid);
                ahd_print_path(ahd, scb);
-               printf("Unexpected PKT busfree condition\n");
+               kprintf("Unexpected PKT busfree condition\n");
                ahd_dump_card_state(ahd);
                ahd_abort_scbs(ahd, SCB_GET_TARGET(ahd, scb), 'A',
                               SCB_GET_LUN(scb), SCB_GET_TAG(scb),
@@ -1745,7 +1745,7 @@ ahd_handle_pkt_busfree(struct ahd_softc *ahd, u_int busfreetime)
                /* Return restarting the sequencer. */
                return (1);
        }
-       printf("%s: Unexpected PKT busfree condition\n", ahd_name(ahd));
+       kprintf("%s: Unexpected PKT busfree condition\n", ahd_name(ahd));
        ahd_dump_card_state(ahd);
        /* Restart the sequencer. */
        return (1);
@@ -1800,14 +1800,14 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
 
                        if (scb == NULL) {
                                ahd_print_devinfo(ahd, &devinfo);
-                               printf("Abort for unidentified "
+                               kprintf("Abort for unidentified "
                                       "connection completed.\n");
                                /* restart the sequencer. */
                                return (1);
                        }
                        sent_msg = ahd->msgout_buf[ahd->msgout_index - 1];
                        ahd_print_path(ahd, scb);
-                       printf("SCB %d - Abort%s Completed.\n",
+                       kprintf("SCB %d - Abort%s Completed.\n",
                               SCB_GET_TAG(scb),
                               sent_msg == MSG_ABORT_TAG ? "" : " Tag");
 
@@ -1833,7 +1833,7 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                        found = ahd_abort_scbs(ahd, target, 'A', saved_lun,
                                               tag, ROLE_INITIATOR,
                                               CAM_REQ_ABORTED);
-                       printf("found == 0x%x\n", found);
+                       kprintf("found == 0x%x\n", found);
                        printerror = 0;
                } else if (ahd_sent_msg(ahd, AHDMSG_1B,
                                        MSG_BUS_DEV_RESET, TRUE)) {
@@ -1865,7 +1865,7 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                         */
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                               printf("PPR negotiation rejected busfree.\n");
+                               kprintf("PPR negotiation rejected busfree.\n");
 #endif
                        tinfo = ahd_fetch_transinfo(ahd, devinfo.channel,
                                                    devinfo.our_scsiid,
@@ -1883,7 +1883,7 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                         */
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                               printf("WDTR negotiation rejected busfree.\n");
+                               kprintf("WDTR negotiation rejected busfree.\n");
 #endif
                        ahd_set_width(ahd, &devinfo,
                                      MSG_EXT_WDTR_BUS_8_BIT,
@@ -1899,7 +1899,7 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                         */
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                               printf("SDTR negotiation rejected busfree.\n");
+                               kprintf("SDTR negotiation rejected busfree.\n");
 #endif
                        ahd_set_syncrate(ahd, &devinfo,
                                        /*period*/0, /*offset*/0,
@@ -1914,7 +1914,7 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
 
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                               printf("Expected IDE Busfree\n");
+                               kprintf("Expected IDE Busfree\n");
 #endif
                        printerror = 0;
                } else if ((ahd->msg_flags & MSG_FLAG_EXPECT_QASREJ_BUSFREE)
@@ -1923,7 +1923,7 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
 
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                               printf("Expected QAS Reject Busfree\n");
+                               kprintf("Expected QAS Reject Busfree\n");
 #endif
                        printerror = 0;
                }
@@ -1949,7 +1949,7 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                } else {
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                               printf("PPR Negotiation Busfree.\n");
+                               kprintf("PPR Negotiation Busfree.\n");
 #endif
                        ahd_done(ahd, scb);
                }
@@ -1976,11 +1976,11 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                         * We had not fully identified this connection,
                         * so we cannot abort anything.
                         */
-                       printf("%s: ", ahd_name(ahd));
+                       kprintf("%s: ", ahd_name(ahd));
                }
                if (lastphase != P_BUSFREE)
                        ahd_force_renegotiation(ahd, &devinfo);
-               printf("Unexpected busfree %s, %d SCBs aborted, "
+               kprintf("Unexpected busfree %s, %d SCBs aborted, "
                       "PRGMCNT == 0x%x\n",
                       ahd_lookup_phase_entry(lastphase)->phasemsg,
                       aborted,
@@ -2017,7 +2017,7 @@ ahd_handle_proto_violation(struct ahd_softc *ahd)
                 * to match.
                 */
                ahd_print_devinfo(ahd, &devinfo);
-               printf("Target did not send an IDENTIFY message. "
+               kprintf("Target did not send an IDENTIFY message. "
                       "LASTPHASE = 0x%x.\n", lastphase);
                scb = NULL;
        } else if (scb == NULL) {
@@ -2026,13 +2026,13 @@ ahd_handle_proto_violation(struct ahd_softc *ahd)
                 * transaction.  Print an error and reset the bus.
                 */
                ahd_print_devinfo(ahd, &devinfo);
-               printf("No SCB found during protocol violation\n");
+               kprintf("No SCB found during protocol violation\n");
                goto proto_violation_reset;
        } else {
                ahd_set_transaction_status(scb, CAM_SEQUENCE_FAIL);
                if ((seq_flags & NO_CDB_SENT) != 0) {
                        ahd_print_path(ahd, scb);
-                       printf("No or incomplete CDB sent to device.\n");
+                       kprintf("No or incomplete CDB sent to device.\n");
                } else if ((ahd_inb_scbram(ahd, SCB_CONTROL)
                          & STATUS_RCVD) == 0) {
                        /*
@@ -2043,10 +2043,10 @@ ahd_handle_proto_violation(struct ahd_softc *ahd)
                         * message.
                         */
                        ahd_print_path(ahd, scb);
-                       printf("Completed command without status.\n");
+                       kprintf("Completed command without status.\n");
                } else {
                        ahd_print_path(ahd, scb);
-                       printf("Unknown protocol violation.\n");
+                       kprintf("Unknown protocol violation.\n");
                        ahd_dump_card_state(ahd);
                }
        }
@@ -2060,7 +2060,7 @@ proto_violation_reset:
                 * it away with a bus reset.
                 */
                found = ahd_reset_channel(ahd, 'A', TRUE);
-               printf("%s: Issued Channel %c Bus Reset. "
+               kprintf("%s: Issued Channel %c Bus Reset. "
                       "%d SCBs aborted\n", ahd_name(ahd), 'A', found);
        } else {
                /*
@@ -2082,7 +2082,7 @@ proto_violation_reset:
                        ahd_print_path(ahd, scb);
                        scb->flags |= SCB_ABORT;
                }
-               printf("Protocol violation %s.  Attempting to abort.\n",
+               kprintf("Protocol violation %s.  Attempting to abort.\n",
                       ahd_lookup_phase_entry(curphase)->phasemsg);
        }
 }
@@ -2100,7 +2100,7 @@ ahd_force_renegotiation(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
 #ifdef AHD_DEBUG
        if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) {
                ahd_print_devinfo(ahd, devinfo);
-               printf("Forcing renegotiation\n");
+               kprintf("Forcing renegotiation\n");
        }
 #endif
        targ_info = ahd_fetch_transinfo(ahd,
@@ -2162,7 +2162,7 @@ ahd_clear_critical_section(struct ahd_softc *ahd)
                        break;
 
                if (steps > AHD_MAX_STEPS) {
-                       printf("%s: Infinite loop in critical section\n"
+                       kprintf("%s: Infinite loop in critical section\n"
                               "%s: First Instruction 0x%x now 0x%x\n",
                               ahd_name(ahd), ahd_name(ahd), first_instr,
                               seqaddr);
@@ -2173,7 +2173,7 @@ ahd_clear_critical_section(struct ahd_softc *ahd)
                steps++;
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_MISC) != 0)
-                       printf("%s: Single stepping at 0x%x\n", ahd_name(ahd),
+                       kprintf("%s: Single stepping at 0x%x\n", ahd_name(ahd),
                               seqaddr);
 #endif
                if (stepping == FALSE) {
@@ -2270,16 +2270,16 @@ ahd_print_scb(struct scb *scb)
        int i;
 
        hscb = scb->hscb;
-       printf("scb:%p control:0x%x scsiid:0x%x lun:%d cdb_len:%d\n",
+       kprintf("scb:%p control:0x%x scsiid:0x%x lun:%d cdb_len:%d\n",
               (void *)scb,
               hscb->control,
               hscb->scsiid,
               hscb->lun,
               hscb->cdb_len);
-       printf("Shared Data: ");
+       kprintf("Shared Data: ");
        for (i = 0; i < sizeof(hscb->shared_data.idata.cdb); i++)
-               printf("%#02x", hscb->shared_data.idata.cdb[i]);
-       printf("        dataptr:%#x%x datacnt:%#x sgptr:%#x tag:%#x\n",
+               kprintf("%#02x", hscb->shared_data.idata.cdb[i]);
+       kprintf("        dataptr:%#x%x datacnt:%#x sgptr:%#x tag:%#x\n",
               (uint32_t)((ahd_le64toh(hscb->dataptr) >> 32) & 0xFFFFFFFF),
               (uint32_t)(ahd_le64toh(hscb->dataptr) & 0xFFFFFFFF),
               ahd_le32toh(hscb->datacnt),
@@ -2304,7 +2304,7 @@ ahd_dump_sglist(struct scb *scb)
 
                                addr = ahd_le64toh(sg_list[i].addr);
                                len = ahd_le32toh(sg_list[i].len);
-                               printf("sg[%d] - Addr 0x%x%x : Length %d%s\n",
+                               kprintf("sg[%d] - Addr 0x%x%x : Length %d%s\n",
                                       i,
                                       (uint32_t)((addr >> 32) & 0xFFFFFFFF),
                                       (uint32_t)(addr & 0xFFFFFFFF),
@@ -2320,7 +2320,7 @@ ahd_dump_sglist(struct scb *scb)
                                uint32_t len;
 
                                len = ahd_le32toh(sg_list[i].len);
-                               printf("sg[%d] - Addr 0x%x%x : Length %d%s\n",
+                               kprintf("sg[%d] - Addr 0x%x%x : Length %d%s\n",
                                       i,
                                       (len >> 24) & SG_HIGH_ADDR_BITS,
                                       ahd_le32toh(sg_list[i].addr),
@@ -2651,37 +2651,37 @@ ahd_set_syncrate(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                        if (offset != 0) {
                                int options;
 
-                               printf("%s: target %d synchronous with "
+                               kprintf("%s: target %d synchronous with "
                                       "period = 0x%x, offset = 0x%x",
                                       ahd_name(ahd), devinfo->target,
                                       period, offset);
                                options = 0;
                                if ((ppr_options & MSG_EXT_PPR_RD_STRM) != 0) {
-                                       printf("(RDSTRM");
+                                       kprintf("(RDSTRM");
                                        options++;
                                }
                                if ((ppr_options & MSG_EXT_PPR_DT_REQ) != 0) {
-                                       printf("%s", options ? "|DT" : "(DT");
+                                       kprintf("%s", options ? "|DT" : "(DT");
                                        options++;
                                }
                                if ((ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
-                                       printf("%s", options ? "|IU" : "(IU");
+                                       kprintf("%s", options ? "|IU" : "(IU");
                                        options++;
                                }
                                if ((ppr_options & MSG_EXT_PPR_RTI) != 0) {
-                                       printf("%s", options ? "|RTI" : "(RTI");
+                                       kprintf("%s", options ? "|RTI" : "(RTI");
                                        options++;
                                }
                                if ((ppr_options & MSG_EXT_PPR_QAS_REQ) != 0) {
-                                       printf("%s", options ? "|QAS" : "(QAS");
+                                       kprintf("%s", options ? "|QAS" : "(QAS");
                                        options++;
                                }
                                if (options != 0)
-                                       printf(")\n");
+                                       kprintf(")\n");
                                else
-                                       printf("\n");
+                                       kprintf("\n");
                        } else {
-                               printf("%s: target %d using "
+                               kprintf("%s: target %d using "
                                       "asynchronous transfers%s\n",
                                       ahd_name(ahd), devinfo->target,
                                       (ppr_options & MSG_EXT_PPR_QAS_REQ) != 0
@@ -2709,7 +2709,7 @@ ahd_set_syncrate(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
 #ifdef AHD_DEBUG
                                if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) {
                                        ahd_print_devinfo(ahd, devinfo);
-                                       printf("Expecting IU Change busfree\n");
+                                       kprintf("Expecting IU Change busfree\n");
                                }
 #endif
                                ahd->msg_flags |= MSG_FLAG_EXPECT_PPR_BUSFREE
@@ -2718,7 +2718,7 @@ ahd_set_syncrate(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                        if ((old_ppr & MSG_EXT_PPR_IU_REQ) != 0) {
 #ifdef AHD_DEBUG
                                if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                                       printf("PPR with IU_REQ outstanding\n");
+                                       kprintf("PPR with IU_REQ outstanding\n");
 #endif
                                ahd->msg_flags |= MSG_FLAG_EXPECT_PPR_BUSFREE;
                        }
@@ -2770,7 +2770,7 @@ ahd_set_width(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                ahd_send_async(ahd, devinfo->channel, devinfo->target,
                               CAM_LUN_WILDCARD, AC_TRANSFER_NEG, NULL);
                if (bootverbose) {
-                       printf("%s: target %d using %dbit transfers\n",
+                       kprintf("%s: target %d using %dbit transfers\n",
                               ahd_name(ahd), devinfo->target,
                               8 * (0x01 << width));
                }
@@ -3029,7 +3029,7 @@ ahd_fetch_devinfo(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
 void
 ahd_print_devinfo(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
 {
-       printf("%s:%c:%d:%d: ", ahd_name(ahd), 'A',
+       kprintf("%s:%c:%d:%d: ", ahd_name(ahd), 'A',
               devinfo->target, devinfo->lun);
 }
 
@@ -3111,11 +3111,11 @@ ahd_setup_initiator_msgout(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                ahd->msg_type = MSG_TYPE_INITIATOR_MSGOUT;
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                       printf("Setting up for Parity Error delivery\n");
+                       kprintf("Setting up for Parity Error delivery\n");
 #endif
                return;
        } else if (scb == NULL) {
-               printf("%s: WARNING. No pending message for "
+               kprintf("%s: WARNING. No pending message for "
                       "I_T msgin.  Issuing NO-OP\n", ahd_name(ahd));
                ahd->msgout_buf[ahd->msgout_index++] = MSG_NOOP;
                ahd->msgout_len++;
@@ -3146,7 +3146,7 @@ ahd_setup_initiator_msgout(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                ahd->msgout_buf[ahd->msgout_index++] = MSG_BUS_DEV_RESET;
                ahd->msgout_len++;
                ahd_print_path(ahd, scb);
-               printf("Bus Device Reset Message Sent\n");
+               kprintf("Bus Device Reset Message Sent\n");
                /*
                 * Clear our selection hardware in advance of
                 * the busfree.  We may have an entry in the waiting
@@ -3164,7 +3164,7 @@ ahd_setup_initiator_msgout(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                }
                ahd->msgout_len++;
                ahd_print_path(ahd, scb);
-               printf("Abort%s Message Sent\n",
+               kprintf("Abort%s Message Sent\n",
                       (scb->hscb->control & TAG_ENB) != 0 ? " Tag" : "");
                /*
                 * Clear our selection hardware in advance of
@@ -3185,9 +3185,9 @@ ahd_setup_initiator_msgout(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                 */
                ahd_outb(ahd, SCSISEQ0, 0);
        } else {
-               printf("ahd_intr: AWAITING_MSG for an SCB that "
+               kprintf("ahd_intr: AWAITING_MSG for an SCB that "
                       "does not have a waiting message\n");
-               printf("SCSIID = %x, target_mask = %x\n", scb->hscb->scsiid,
+               kprintf("SCSIID = %x, target_mask = %x\n", scb->hscb->scsiid,
                       devinfo->target_mask);
                panic("SCB = %d, SCB Control = %x:%x, MSG_OUT = %x "
                      "SCB flags = %x", SCB_GET_TAG(scb), scb->hscb->control,
@@ -3269,7 +3269,7 @@ ahd_build_transfer_msg(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
 
                if (bootverbose) {
                        ahd_print_devinfo(ahd, devinfo);
-                       printf("Ensuring async\n");
+                       kprintf("Ensuring async\n");
                }
        }
        /* Target initiated PPR is not allowed in the SCSI spec */
@@ -3319,7 +3319,7 @@ ahd_construct_sdtr(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
        ahd->msgout_buf[ahd->msgout_index++] = offset;
        ahd->msgout_len += 5;
        if (bootverbose) {
-               printf("(%s:%c:%d:%d): Sending SDTR period %x, offset %x\n",
+               kprintf("(%s:%c:%d:%d): Sending SDTR period %x, offset %x\n",
                       ahd_name(ahd), devinfo->channel, devinfo->target,
                       devinfo->lun, period, offset);
        }
@@ -3339,7 +3339,7 @@ ahd_construct_wdtr(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
        ahd->msgout_buf[ahd->msgout_index++] = bus_width;
        ahd->msgout_len += 4;
        if (bootverbose) {
-               printf("(%s:%c:%d:%d): Sending WDTR %x\n",
+               kprintf("(%s:%c:%d:%d): Sending WDTR %x\n",
                       ahd_name(ahd), devinfo->channel, devinfo->target,
                       devinfo->lun, bus_width);
        }
@@ -3373,7 +3373,7 @@ ahd_construct_ppr(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
        ahd->msgout_buf[ahd->msgout_index++] = ppr_options;
        ahd->msgout_len += 8;
        if (bootverbose) {
-               printf("(%s:%c:%d:%d): Sending PPR bus_width %x, period %x, "
+               kprintf("(%s:%c:%d:%d): Sending PPR bus_width %x, period %x, "
                       "offset %x, ppr_options %x\n", ahd_name(ahd),
                       devinfo->channel, devinfo->target, devinfo->lun,
                       bus_width, period, offset, ppr_options);
@@ -3423,7 +3423,7 @@ ahd_handle_message_phase(struct ahd_softc *ahd)
        bus_phase = ahd_inb(ahd, LASTPHASE);
 
        if ((ahd_inb(ahd, LQISTAT2) & LQIPHASE_OUTPKT) != 0) {
-               printf("LQIRETRY for LQIPHASE_OUTPKT\n");
+               kprintf("LQIRETRY for LQIPHASE_OUTPKT\n");
                ahd_outb(ahd, LQCTL2, LQIRETRY);
        }
 reswitch:
@@ -3440,14 +3440,14 @@ reswitch:
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) {
                        ahd_print_devinfo(ahd, &devinfo);
-                       printf("INITIATOR_MSG_OUT");
+                       kprintf("INITIATOR_MSG_OUT");
                }
 #endif
                phasemis = bus_phase != P_MESGOUT;
                if (phasemis) {
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) {
-                               printf(" PHASEMIS %s\n",
+                               kprintf(" PHASEMIS %s\n",
                                       ahd_lookup_phase_entry(bus_phase)
                                                             ->phasemsg);
                        }
@@ -3474,7 +3474,7 @@ reswitch:
                        ahd_outb(ahd, CLRSINT1, CLRREQINIT);
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                               printf(" byte 0x%x\n", ahd->send_msg_perror);
+                               kprintf(" byte 0x%x\n", ahd->send_msg_perror);
 #endif
                        /*
                         * If we are notifying the target of a CRC error
@@ -3515,7 +3515,7 @@ reswitch:
                ahd_outb(ahd, CLRSINT1, CLRREQINIT);
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                       printf(" byte 0x%x\n",
+                       kprintf(" byte 0x%x\n",
                               ahd->msgout_buf[ahd->msgout_index]);
 #endif
                ahd_outb(ahd, RETURN_2, ahd->msgout_buf[ahd->msgout_index++]);
@@ -3530,14 +3530,14 @@ reswitch:
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) {
                        ahd_print_devinfo(ahd, &devinfo);
-                       printf("INITIATOR_MSG_IN");
+                       kprintf("INITIATOR_MSG_IN");
                }
 #endif
                phasemis = bus_phase != P_MESGIN;
                if (phasemis) {
 #ifdef AHD_DEBUG
                        if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) {
-                               printf(" PHASEMIS %s\n",
+                               kprintf(" PHASEMIS %s\n",
                                       ahd_lookup_phase_entry(bus_phase)
                                                             ->phasemsg);
                        }
@@ -3558,7 +3558,7 @@ reswitch:
                ahd->msgin_buf[ahd->msgin_index] = ahd_inb(ahd, SCSIBUS);
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                       printf(" byte 0x%x\n",
+                       kprintf(" byte 0x%x\n",
                               ahd->msgin_buf[ahd->msgin_index]);
 #endif
 
@@ -3580,7 +3580,7 @@ reswitch:
 #ifdef AHD_DEBUG
                                if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) {
                                        ahd_print_devinfo(ahd, &devinfo);
-                                       printf("Asserting ATN for response\n");
+                                       kprintf("Asserting ATN for response\n");
                                }
 #endif
                                ahd_assert_atn(ahd);
@@ -3728,7 +3728,7 @@ reswitch:
 
        if (end_session) {
                if ((ahd->msg_flags & MSG_FLAG_PACKETIZED) != 0) {
-                       printf("%s: Returning to Idle Loop\n",
+                       kprintf("%s: Returning to Idle Loop\n",
                               ahd_name(ahd));
                        ahd_outb(ahd, LASTPHASE, P_BUSFREE);
                        ahd_clear_msg_state(ahd);
@@ -3875,7 +3875,7 @@ ahd_parse_msg(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                        ahd_validate_offset(ahd, tinfo, period, &offset,
                                            tinfo->curr.width, devinfo->role);
                        if (bootverbose) {
-                               printf("(%s:%c:%d:%d): Received "
+                               kprintf("(%s:%c:%d:%d): Received "
                                       "SDTR period %x, offset %x\n\t"
                                       "Filtered to period %x, offset %x\n",
                                       ahd_name(ahd), devinfo->channel,
@@ -3905,7 +3905,7 @@ ahd_parse_msg(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                                 */
                                if (bootverbose
                                 && devinfo->role == ROLE_INITIATOR) {
-                                       printf("(%s:%c:%d:%d): Target "
+                                       kprintf("(%s:%c:%d:%d): Target "
                                               "Initiated SDTR\n",
                                               ahd_name(ahd), devinfo->channel,
                                               devinfo->target, devinfo->lun);
@@ -3947,7 +3947,7 @@ ahd_parse_msg(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                        ahd_validate_width(ahd, tinfo, &bus_width,
                                           devinfo->role);
                        if (bootverbose) {
-                               printf("(%s:%c:%d:%d): Received WDTR "
+                               kprintf("(%s:%c:%d:%d): Received WDTR "
                                       "%x filtered to %x\n",
                                       ahd_name(ahd), devinfo->channel,
                                       devinfo->target, devinfo->lun,
@@ -3963,7 +3963,7 @@ ahd_parse_msg(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                                 */
                                if (saved_width > bus_width) {
                                        reject = TRUE;
-                                       printf("(%s:%c:%d:%d): requested %dBit "
+                                       kprintf("(%s:%c:%d:%d): requested %dBit "
                                               "transfers.  Rejecting...\n",
                                               ahd_name(ahd), devinfo->channel,
                                               devinfo->target, devinfo->lun,
@@ -3976,7 +3976,7 @@ ahd_parse_msg(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                                 */
                                if (bootverbose
                                 && devinfo->role == ROLE_INITIATOR) {
-                                       printf("(%s:%c:%d:%d): Target "
+                                       kprintf("(%s:%c:%d:%d): Target "
                                               "Initiated WDTR\n",
                                               ahd_name(ahd), devinfo->channel,
                                               devinfo->target, devinfo->lun);
@@ -4088,12 +4088,12 @@ ahd_parse_msg(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                                }
                        } else {
                                if (devinfo->role != ROLE_TARGET)
-                                       printf("(%s:%c:%d:%d): Target "
+                                       kprintf("(%s:%c:%d:%d): Target "
                                               "Initiated PPR\n",
                                               ahd_name(ahd), devinfo->channel,
                                               devinfo->target, devinfo->lun);
                                else
-                                       printf("(%s:%c:%d:%d): Initiator "
+                                       kprintf("(%s:%c:%d:%d): Initiator "
                                               "Initiated PPR\n",
                                               ahd_name(ahd), devinfo->channel,
                                               devinfo->target, devinfo->lun);
@@ -4105,7 +4105,7 @@ ahd_parse_msg(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                                response = TRUE;
                        }
                        if (bootverbose) {
-                               printf("(%s:%c:%d:%d): Received PPR width %x, "
+                               kprintf("(%s:%c:%d:%d): Received PPR width %x, "
                                       "period %x, offset %x,options %x\n"
                                       "\tFiltered to width %x, period %x, "
                                       "offset %x, options %x\n",
@@ -4181,7 +4181,7 @@ ahd_parse_msg(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
        case MSG_QAS_REQUEST:
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                       printf("%s: QAS request.  SCSISIGI == 0x%x\n",
+                       kprintf("%s: QAS request.  SCSISIGI == 0x%x\n",
                               ahd_name(ahd), ahd_inb(ahd, SCSISIGI));
 #endif
                ahd->msg_flags |= MSG_FLAG_EXPECT_QASREJ_BUSFREE;
@@ -4246,7 +4246,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                         * off these options.
                         */
                        if (bootverbose) {
-                               printf("(%s:%c:%d:%d): PPR Rejected. "
+                               kprintf("(%s:%c:%d:%d): PPR Rejected. "
                                       "Trying simple U160 PPR\n",
                                       ahd_name(ahd), devinfo->channel,
                                       devinfo->target, devinfo->lun);
@@ -4261,7 +4261,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                         * Attempt to negotiate SPI-2 style.
                         */
                        if (bootverbose) {
-                               printf("(%s:%c:%d:%d): PPR Rejected. "
+                               kprintf("(%s:%c:%d:%d): PPR Rejected. "
                                       "Trying WDTR/SDTR\n",
                                       ahd_name(ahd), devinfo->channel,
                                       devinfo->target, devinfo->lun);
@@ -4278,7 +4278,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
        } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, /*full*/FALSE)) {
 
                /* note 8bit xfers */
-               printf("(%s:%c:%d:%d): refuses WIDE negotiation.  Using "
+               kprintf("(%s:%c:%d:%d): refuses WIDE negotiation.  Using "
                       "8bit transfers\n", ahd_name(ahd),
                       devinfo->channel, devinfo->target, devinfo->lun);
                ahd_set_width(ahd, devinfo, MSG_EXT_WDTR_BUS_8_BIT,
@@ -4306,7 +4306,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                                 /*offset*/0, /*ppr_options*/0,
                                 AHD_TRANS_ACTIVE|AHD_TRANS_GOAL,
                                 /*paused*/TRUE);
-               printf("(%s:%c:%d:%d): refuses synchronous negotiation. "
+               kprintf("(%s:%c:%d:%d): refuses synchronous negotiation. "
                       "Using asynchronous transfers\n",
                       ahd_name(ahd), devinfo->channel,
                       devinfo->target, devinfo->lun);
@@ -4317,13 +4317,13 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                tag_type = (scb->hscb->control & MSG_SIMPLE_TASK);
 
                if (tag_type == MSG_SIMPLE_TASK) {
-                       printf("(%s:%c:%d:%d): refuses tagged commands.  "
+                       kprintf("(%s:%c:%d:%d): refuses tagged commands.  "
                               "Performing non-tagged I/O\n", ahd_name(ahd),
                               devinfo->channel, devinfo->target, devinfo->lun);
                        ahd_set_tags(ahd, devinfo, AHD_QUEUE_NONE);
                        mask = ~0x23;
                } else {
-                       printf("(%s:%c:%d:%d): refuses %s tagged commands.  "
+                       kprintf("(%s:%c:%d:%d): refuses %s tagged commands.  "
                               "Performing simple queue tagged I/O only\n",
                               ahd_name(ahd), devinfo->channel, devinfo->target,
                               devinfo->lun, tag_type == MSG_ORDERED_TASK
@@ -4374,7 +4374,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
                /*
                 * Otherwise, we ignore it.
                 */
-               printf("%s:%c:%d: Message reject for %x -- ignored\n",
+               kprintf("%s:%c:%d: Message reject for %x -- ignored\n",
                       ahd_name(ahd), devinfo->channel, devinfo->target,
                       last_msg);
        }
@@ -4560,7 +4560,7 @@ ahd_reinitialize_dataptrs(struct ahd_softc *ahd)
        } while (--wait && !(ahd_inb(ahd, MDFFSTAT) & FIFOFREE));
        if (wait == 0) {
                ahd_print_path(ahd, scb);
-               printf("ahd_reinitialize_dataptrs: Forcing FIFO free.\n");
+               kprintf("ahd_reinitialize_dataptrs: Forcing FIFO free.\n");
                ahd_outb(ahd, DFFSXFRCTL, RSTCHN|CLRSHCNT);
        }
        saved_modes = ahd_save_modes(ahd);
@@ -4682,7 +4682,7 @@ ahd_handle_devreset(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
 
        if (message != NULL
         && (verbose_level <= bootverbose))
-               printf("%s: %s on %c:%d. %d SCBs aborted\n", ahd_name(ahd),
+               kprintf("%s: %s on %c:%d. %d SCBs aborted\n", ahd_name(ahd),
                       message, devinfo->channel, devinfo->target, found);
 }
 
@@ -4811,7 +4811,7 @@ ahd_alloc(void *platform_arg, char *name)
        }
 #ifdef AHD_DEBUG
        if ((ahd_debug & AHD_SHOW_MEMORY) != 0) {
-               printf("%s: scb size = 0x%x, hscb size = 0x%x\n",
+               kprintf("%s: scb size = 0x%x, hscb size = 0x%x\n",
                       ahd_name(ahd), (u_int)sizeof(struct scb),
                       (u_int)sizeof(struct hardware_scb));
        }
@@ -5060,7 +5060,7 @@ ahd_reset(struct ahd_softc *ahd, int reinit)
        } while (--wait && !(ahd_inb(ahd, HCNTRL) & CHIPRSTACK));
 
        if (wait == 0) {
-               printf("%s: WARNING - Failed chip reset!  "
+               kprintf("%s: WARNING - Failed chip reset!  "
                       "Trying to initialize anyway.\n", ahd_name(ahd));
        }
        ahd_outb(ahd, HCNTRL, ahd->pause);
@@ -5182,7 +5182,7 @@ ahd_init_scbdata(struct ahd_softc *ahd)
        /* Determine the number of hardware SCBs and initialize them */
        scb_data->maxhscbs = ahd_probe_scbs(ahd);
        if (scb_data->maxhscbs == 0) {
-               printf("%s: No SCB space found\n", ahd_name(ahd));
+               kprintf("%s: No SCB space found\n", ahd_name(ahd));
                return (ENXIO);
        }
 
@@ -5225,7 +5225,7 @@ ahd_init_scbdata(struct ahd_softc *ahd)
        }
 #ifdef AHD_DEBUG
        if ((ahd_debug & AHD_SHOW_MEMORY) != 0)
-               printf("%s: ahd_sglist_allocsize = 0x%x\n", ahd_name(ahd),
+               kprintf("%s: ahd_sglist_allocsize = 0x%x\n", ahd_name(ahd),
                       ahd_sglist_allocsize(ahd));
 #endif
 
@@ -5249,7 +5249,7 @@ ahd_init_scbdata(struct ahd_softc *ahd)
        ahd_alloc_scbs(ahd);
 
        if (scb_data->numscbs == 0) {
-               printf("%s: ahd_init_scbdata - "
+               kprintf("%s: ahd_init_scbdata - "
                       "Unable to allocate initial scbs\n",
                       ahd_name(ahd));
                goto error_exit;
@@ -5384,7 +5384,7 @@ ahd_setup_iocell_workaround(struct ahd_softc *ahd)
        ahd_outb(ahd, SIMODE0, ahd_inb(ahd, SIMODE0) | (ENSELDO|ENSELDI));
 #ifdef AHD_DEBUG
        if ((ahd_debug & AHD_SHOW_MISC) != 0)
-               printf("%s: Setting up iocell workaround\n", ahd_name(ahd));
+               kprintf("%s: Setting up iocell workaround\n", ahd_name(ahd));
 #endif
        ahd_restore_modes(ahd, saved_modes);
 }
@@ -5401,14 +5401,14 @@ ahd_iocell_first_selection(struct ahd_softc *ahd)
        ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG);
 #ifdef AHD_DEBUG
        if ((ahd_debug & AHD_SHOW_MISC) != 0)
-               printf("%s: iocell first selection\n", ahd_name(ahd));
+               kprintf("%s: iocell first selection\n", ahd_name(ahd));
 #endif
        if ((sblkctl & ENAB40) != 0) {
                ahd_outb(ahd, DSPDATACTL,
                         ahd_inb(ahd, DSPDATACTL) & ~BYPASSENAB);
 #ifdef AHD_DEBUG
                if ((ahd_debug & AHD_SHOW_MISC) != 0)
-                       printf("%s: BYPASS now disabled\n", ahd_name(ahd));
+                       kprintf("%s: BYPASS now disabled\n", ahd_name(ahd));
 #endif
        }
        ahd_outb(ahd, SIMODE0, ahd_inb(ahd, SIMODE0) & ~(ENSELDO|ENSELDI));
@@ -5642,7 +5642,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
                    ahd_sglist_allocsize(ahd) / ahd_sglist_size(ahd);
 #ifdef AHD_DEBUG
                if (ahd_debug & AHD_SHOW_MEMORY)
-                       printf("Mapped SG data\n");
+                       kprintf("Mapped SG data\n");
 #endif
        }
 
@@ -5675,7 +5675,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
                scb_data->sense_left = PAGE_SIZE / AHD_SENSE_BUFSIZE;
 #ifdef AHD_DEBUG
                if (ahd_debug & AHD_SHOW_MEMORY)
-                       printf("Mapped sense data\n");
+                       kprintf("Mapped sense data\n");
 #endif
        }
 
@@ -5941,20 +5941,20 @@ ahd_init(struct ahd_softc *ahd)
        error = ahd_write_flexport(ahd, FLXADDR_ROMSTAT_CURSENSECTL,
                                   CURSENSE_ENB);
        if (error != 0) {
-               printf("%s: current sensing timeout 1\n", ahd_name(ahd));
+               kprintf("%s: current sensing timeout 1\n", ahd_name(ahd));
                goto init_done;
        }
        for (i = 20, fstat = FLX_FSTAT_BUSY;
             (fstat & FLX_FSTAT_BUSY) != 0 && i; i--) {
                error = ahd_read_flexport(ahd, FLXADDR_FLEXSTAT, &fstat);
                if (error != 0) {
-                       printf("%s: current sensing timeout 2\n",
+                       kprintf("%s: current sensing timeout 2\n",
                               ahd_name(ahd));
                        goto init_done;
                }
        }
        if (i == 0) {
-               printf("%s: Timedout during current-sensing test\n",
+               kprintf("%s: Timedout during current-sensing test\n",
                       ahd_name(ahd));
                goto init_done;
        }
@@ -5962,7 +5962,7 @@ ahd_init(struct ahd_softc *ahd)
        /* Latch Current Sensing status. */
        error = ahd_read_flexport(ahd, FLXADDR_CURRENT_STAT, &current_sensing);
        if (error != 0) {
-               printf("%s: current sensing timeout 3\n", ahd_name(ahd));
+               kprintf("%s: current sensing timeout 3\n", ahd_name(ahd));
                goto init_done;
        }
 
@@ -5971,7 +5971,7 @@ ahd_init(struct ahd_softc *ahd)
 
 #ifdef AHD_DEBUG
        if ((ahd_debug & AHD_SHOW_TERMCTL) != 0) {
-               printf("%s: current_sensing == 0x%x\n",
+               kprintf("%s: current_sensing == 0x%x\n",
                       ahd_name(ahd), current_sensing);