Fixed printf format errors (only 1 left in GENERIC now).

This commit is contained in:
Bruce Evans 1998-07-13 09:53:11 +00:00
parent 6baa65474d
commit 9bffbcd4f5
18 changed files with 117 additions and 108 deletions

View File

@ -36,7 +36,7 @@
* future.
*/
#ident "$Id: dpt_control.c,v 1.5 1998/06/02 00:32:38 eivind Exp $"
#ident "$Id: dpt_control.c,v 1.6 1998/06/07 17:09:42 dfr Exp $"
#include "opt_dpt.h"
@ -837,7 +837,7 @@ dpt_ioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, struct proc * p)
}
default:
printf("dpt%d: Invalid (%x) IOCTL\n", dpt->unit, cmd);
printf("dpt%d: Invalid (%lx) IOCTL\n", dpt->unit, cmd);
return (EINVAL);
}

View File

@ -64,7 +64,7 @@
* 3. dpt_handle_timeouts potentially inserts into the queue
*/
#ident "$Id: dpt_scsi.c,v 1.5 1998/03/11 00:30:08 julian Exp $"
#ident "$Id: dpt_scsi.c,v 1.6 1998/06/02 00:32:38 eivind Exp $"
#define _DPT_C_
#include "opt_dpt.h"
@ -1866,7 +1866,7 @@ dpt_scsi_cmd(struct scsi_xfer * xs)
if (xs->flags & SCSI_RESET) {
printf("dpt%d: Unsupported option...\n"
" I refuse to Reset b%dt%du%d...!\n",
__FILE__, __LINE__, channel, target, lun);
dpt->unit, channel, target, lun);
xs->error = XS_DRIVER_STUFFUP;
return (COMPLETE);
}
@ -2163,7 +2163,7 @@ dptminphys(struct buf * bp)
}
if (bp->b_bcount > ((dpt_min_segs - 1) * PAGE_SIZE)) {
#ifdef DPT_DEBUG_MINPHYS
printf("DPT: Block size of %x is larger than %x. Truncating\n",
printf("DPT: Block size of %lx is larger than %x. Truncating\n",
bp->b_bcount, ((dpt_min_segs - 1) * PAGE_SIZE));
#endif
bp->b_bcount = ((dpt_min_segs - 1) * PAGE_SIZE);
@ -2380,9 +2380,10 @@ dpt_intr(void *arg)
if ((dccb == NULL)
|| (dccb == (dpt_ccb_t *) ~ 0)
|| (dccb == (dpt_ccb_t *) 0x55555555)) {
printf("dpt%d: BAD (%x) CCB in SP (AUX status = %s).\n",
dpt->unit, dccb, i2bin((unsigned long) aux_status,
sizeof(aux_status) * 8));
printf("dpt%d: BAD (%p) CCB in SP (AUX status = %s).\n",
dpt->unit, (void *)dccb,
i2bin((unsigned long) aux_status,
sizeof(aux_status) * 8));
#ifdef DPT_MEASURE_PERFORMANCE
++dpt->performance.aborted_interrupts;
#endif
@ -2394,29 +2395,29 @@ dpt_intr(void *arg)
(tccb != NULL) && (tccb != dccb);
tccb = TAILQ_NEXT(tccb, links));
if (tccb == NULL) {
printf("dpt%d: %x is not in the SUBMITTED queue\n",
dpt->unit, dccb);
printf("dpt%d: %p is not in the SUBMITTED queue\n",
dpt->unit, (void *)dccb);
for (tccb = TAILQ_FIRST(&dpt->completed_ccbs);
(tccb != NULL) && (tccb != dccb);
tccb = TAILQ_NEXT(tccb, links));
if (tccb != NULL)
printf("dpt%d: %x is in the COMPLETED queue\n",
dpt->unit, dccb);
printf("dpt%d: %p is in the COMPLETED queue\n",
dpt->unit, (void *)dccb);
for (tccb = TAILQ_FIRST(&dpt->waiting_ccbs);
(tccb != NULL) && (tccb != dccb);
tccb = TAILQ_NEXT(tccb, links));
if (tccb != NULL)
printf("dpt%d: %x is in the WAITING queue\n",
dpt->unit, dccb);
printf("dpt%d: %p is in the WAITING queue\n",
dpt->unit, (void *)dccb);
for (tccb = TAILQ_FIRST(&dpt->free_ccbs);
(tccb != NULL) && (tccb != dccb);
tccb = TAILQ_NEXT(tccb, links));
if (tccb != NULL)
printf("dpt%d: %x is in the FREE queue\n",
dpt->unit, dccb);
printf("dpt%d: %p is in the FREE queue\n",
dpt->unit, (void *)dccb);
#ifdef DPT_MEASURE_PERFORMANCE
++dpt->performance.aborted_interrupts;
@ -2459,8 +2460,7 @@ dpt_intr(void *arg)
".... <<----<<",
dpt->unit);
printf(" Incomplete Code; Re-queue the lost "
"commands\n",
dpt->unit);
"commands\n");
Debugger("DPT Rebooted");
#ifdef DPT_MEASURE_PERFORMANCE
@ -2677,8 +2677,8 @@ dpt_process_completion(dpt_softc_t * dpt,
struct scsi_xfer *xs;
if (ccb == NULL) {
panic("dpt%d: Improper argumet to process_completion (%p%p)\n",
dpt->unit, ccb);
panic("dpt%d: Improper argumet to process_completion (%p)\n",
dpt->unit, (void *)ccb);
} else {
xs = ccb->xs;
}

View File

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.52 1998/04/15 17:45:20 bde Exp $
* $Id: if_ie.c,v 1.53 1998/06/07 17:10:32 dfr Exp $
*/
/*
@ -653,7 +653,7 @@ ee16_probe(struct isa_device *dvp)
dvp->id_msize = 0x8000;
if (kvtop(dvp->id_maddr) != bd_maddr) {
printf("ie%d: kernel configured maddr %lx "
"doesn't match board configured maddr %x\n",
"doesn't match board configured maddr %lx\n",
unit, kvtop(dvp->id_maddr), bd_maddr);
}
sc->iomembot = dvp->id_maddr;
@ -695,8 +695,8 @@ ee16_probe(struct isa_device *dvp)
if ((kvtop(dvp->id_maddr) < 0xC0000) ||
(kvtop(dvp->id_maddr) + sc->iosize > 0xF0000)) {
printf("ie%d: mapped memory location %x out of range\n", unit,
dvp->id_maddr);
printf("ie%d: mapped memory location %p out of range\n", unit,
(void *)dvp->id_maddr);
return (0);
}
pg = (kvtop(dvp->id_maddr) & 0x3C000) >> 14;
@ -733,8 +733,8 @@ ee16_probe(struct isa_device *dvp)
if (dvp->id_irq > 0) {
if (irq != dvp->id_irq) {
printf("ie%d: WARNING: board configured "
"at irq %d, using %d\n",
dvp->id_unit, irq);
"at irq %u, using %u\n",
dvp->id_unit, dvp->id_irq, irq);
irq = dvp->id_unit;
}
} else {
@ -2414,11 +2414,12 @@ ie_mc_reset(int unit)
static void
print_rbd(volatile struct ie_recv_buf_desc * rbd)
{
printf("RBD at %08lx:\n"
"actual %04x, next %04x, buffer %08x\n"
printf("RBD at %8p:\n"
"actual %04x, next %04x, buffer %8p\n"
"length %04x, mbz %04x\n",
(unsigned long) rbd,
rbd->ie_rbd_actual, rbd->ie_rbd_next, rbd->ie_rbd_buffer,
(void *) rbd,
rbd->ie_rbd_actual, rbd->ie_rbd_next,
(void *) rbd->ie_rbd_buffer,
rbd->ie_rbd_length, rbd->mbz);
}

View File

@ -1,5 +1,5 @@
/* $FreeBSD$ */
/* $Id: isp_pci.c,v 1.9 1998/04/17 17:44:36 mjacob Exp $ */
/* $Id: isp_pci.c,v 1.1 1998/04/22 18:10:34 mjacob Exp $ */
/*
* PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
* FreeBSD Version.
@ -201,7 +201,7 @@ isp_pci_attach(config_id, unit)
pcs = malloc(sizeof (struct isp_pcisoftc), M_DEVBUF, M_NOWAIT);
if (pcs == NULL) {
printf("isp%ld: cannot allocate softc\n", unit);
printf("isp%d: cannot allocate softc\n", unit);
return;
}
bzero(pcs, sizeof (struct isp_pcisoftc));
@ -224,7 +224,7 @@ isp_pci_attach(config_id, unit)
}
}
if (mapped == 0) {
printf("isp%ld: unable to map any ports!\n", unit);
printf("isp%d: unable to map any ports!\n", unit);
free(pcs, M_DEVBUF);
return;
}
@ -265,7 +265,7 @@ isp_pci_attach(config_id, unit)
if (pci_map_int(config_id, (void (*)(void *))isp_intr,
(void *)isp, &IMASK) == 0) {
printf("%s: could not map interrupt\n");
printf("%s: could not map interrupt\n", isp->isp_name);
free(pcs, M_DEVBUF);
return;
}
@ -553,7 +553,7 @@ isp_pci_dumpregs(isp)
struct ispsoftc *isp;
{
struct isp_pcisoftc *pci = (struct isp_pcisoftc *)isp;
printf("%s: PCI Status Command/Status=%x\n", pci->pci_isp.isp_name,
printf("%s: PCI Status Command/Status=%lx\n", pci->pci_isp.isp_name,
pci_conf_read(pci->pci_id, PCI_COMMAND_STATUS_REG));
}
#endif

View File

@ -40,7 +40,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: mcd.c,v 1.98 1998/06/07 17:10:46 dfr Exp $
* $Id: mcd.c,v 1.99 1998/07/04 22:30:17 julian Exp $
*/
static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@ -415,7 +415,7 @@ mcdstrategy(struct buf *bp)
bp,unit,bp->b_blkno,bp->b_bcount);*/
if (unit >= NMCD || bp->b_blkno < 0) {
printf("mcdstrategy: unit = %d, blkno = %ld, bcount = %ld\n",
unit, bp->b_blkno, bp->b_bcount);
unit, (long)bp->b_blkno, bp->b_bcount);
printf("mcd: mcdstratregy failure");
bp->b_error = EINVAL;
bp->b_flags |= B_ERROR;
@ -529,7 +529,7 @@ int mcdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
if (mcd_getstat(unit, 1) == -1) /* detect disk change too */
return EIO;
MCD_TRACE("ioctl called 0x%x\n", cmd);
MCD_TRACE("ioctl called 0x%lx\n", cmd);
switch (cmd) {
case CDIOCSETPATCH:

View File

@ -41,7 +41,7 @@
*/
/* $Id: scd.c,v 1.38 1998/06/08 09:47:36 bde Exp $ */
/* $Id: scd.c,v 1.39 1998/07/04 22:30:17 julian Exp $ */
/* Please send any comments to micke@dynas.se */
@ -334,11 +334,12 @@ scdstrategy(struct buf *bp)
cd = scd_data + unit;
XDEBUG(2, ("scd%d: DEBUG: strategy: block=%ld, bcount=%ld\n", unit, bp->b_blkno, bp->b_bcount));
XDEBUG(2, ("scd%d: DEBUG: strategy: block=%ld, bcount=%ld\n",
unit, (long)bp->b_blkno, bp->b_bcount));
if (unit >= NSCD || bp->b_blkno < 0 || (bp->b_bcount % SCDBLKSIZE)) {
printf("scd%d: strategy failure: blkno = %ld, bcount = %ld\n",
unit, bp->b_blkno, bp->b_bcount);
unit, (long)bp->b_blkno, bp->b_bcount);
bp->b_error = EINVAL;
bp->b_flags |= B_ERROR;
goto bad;
@ -437,7 +438,7 @@ scdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
part = scd_part(dev);
cd = scd_data + unit;
XDEBUG(1, ("scd%d: ioctl: cmd=0x%x\n", unit, cmd));
XDEBUG(1, ("scd%d: ioctl: cmd=0x%lx\n", unit, cmd));
if (!(cd->flags & SCDVALID))
return EIO;
@ -500,7 +501,7 @@ scdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
#endif
return 0;
default:
printf("scd%d: unsupported ioctl (cmd=0x%x)\n", unit, cmd);
printf("scd%d: unsupported ioctl (cmd=0x%lx)\n", unit, cmd);
return ENOTTY;
}
}

View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_tx.c,v 1.32 1998/07/03 23:59:09 galv Exp $
* $Id: if_tx.c,v 1.13 1998/07/04 08:02:46 semenu Exp $
*
*/
@ -1513,13 +1513,14 @@ epic_dump_state __P((
printf("\ntx%d: dumping tx descriptors",sc->unit);
for(j=0;j<TX_RING_SIZE;j++){
tdesc = sc->tx_desc + j;
printf("\ndesc%d: %4d 0x%04x, 0x%08x, 0x%04x %4d, 0x%08x, mbuf: 0x%08x",
printf(
"\ndesc%d: %4d 0x%04x, 0x%08lx, 0x%04x %4u, 0x%08lx, mbuf: %p",
j,
tdesc->txlength,tdesc->status,
tdesc->bufaddr,
(u_long)tdesc->bufaddr,
tdesc->control,tdesc->buflength,
tdesc->next,
sc->tx_buffer[j].mbuf
(u_long)tdesc->next,
(void *)sc->tx_buffer[j].mbuf
);
}
}

View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_vx.c,v 1.16 1998/02/21 05:35:02 gpalmer Exp $
* $Id: if_vx.c,v 1.17 1998/06/07 17:09:51 dfr Exp $
*
*/
@ -327,7 +327,7 @@ vxgetlink(sc)
if (sc->vx_connector & 0x10) {
sc->vx_connector &= 0x0f;
printf("[*%s*]", conn_tab[sc->vx_connector].name);
printf(": disable 'auto select' with DOS util!", sc->unit);
printf(": disable 'auto select' with DOS util!");
} else {
printf("[*%s*]", conn_tab[sc->vx_connector].name);
}

View File

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.62 1998/04/17 22:36:23 des Exp $
* $Id: aha1742.c,v 1.63 1998/06/08 09:47:34 bde Exp $
*/
#ifdef KERNEL /* don't laugh, it compiles as a program too.. look */
@ -391,7 +391,7 @@ ahb_poll(struct ahb_data *ahb, int wait)
return (EIO);
}
if (cheat != ahb_ecb_phys_kv(ahb, inl(port + MBOXIN0))) {
printf("discarding 0x%lx ", inl(port + MBOXIN0));
printf("discarding 0x%x ", inl(port + MBOXIN0));
outb(port + G2CNTRL, G2CNTRL_CLEAR_EISA_INT);
DELAY(50000);
goto retry;

View File

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.52 1998/04/15 17:45:20 bde Exp $
* $Id: if_ie.c,v 1.53 1998/06/07 17:10:32 dfr Exp $
*/
/*
@ -653,7 +653,7 @@ ee16_probe(struct isa_device *dvp)
dvp->id_msize = 0x8000;
if (kvtop(dvp->id_maddr) != bd_maddr) {
printf("ie%d: kernel configured maddr %lx "
"doesn't match board configured maddr %x\n",
"doesn't match board configured maddr %lx\n",
unit, kvtop(dvp->id_maddr), bd_maddr);
}
sc->iomembot = dvp->id_maddr;
@ -695,8 +695,8 @@ ee16_probe(struct isa_device *dvp)
if ((kvtop(dvp->id_maddr) < 0xC0000) ||
(kvtop(dvp->id_maddr) + sc->iosize > 0xF0000)) {
printf("ie%d: mapped memory location %x out of range\n", unit,
dvp->id_maddr);
printf("ie%d: mapped memory location %p out of range\n", unit,
(void *)dvp->id_maddr);
return (0);
}
pg = (kvtop(dvp->id_maddr) & 0x3C000) >> 14;
@ -733,8 +733,8 @@ ee16_probe(struct isa_device *dvp)
if (dvp->id_irq > 0) {
if (irq != dvp->id_irq) {
printf("ie%d: WARNING: board configured "
"at irq %d, using %d\n",
dvp->id_unit, irq);
"at irq %u, using %u\n",
dvp->id_unit, dvp->id_irq, irq);
irq = dvp->id_unit;
}
} else {
@ -2414,11 +2414,12 @@ ie_mc_reset(int unit)
static void
print_rbd(volatile struct ie_recv_buf_desc * rbd)
{
printf("RBD at %08lx:\n"
"actual %04x, next %04x, buffer %08x\n"
printf("RBD at %8p:\n"
"actual %04x, next %04x, buffer %8p\n"
"length %04x, mbz %04x\n",
(unsigned long) rbd,
rbd->ie_rbd_actual, rbd->ie_rbd_next, rbd->ie_rbd_buffer,
(void *) rbd,
rbd->ie_rbd_actual, rbd->ie_rbd_next,
(void *) rbd->ie_rbd_buffer,
rbd->ie_rbd_length, rbd->mbz);
}

View File

@ -40,7 +40,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: mcd.c,v 1.98 1998/06/07 17:10:46 dfr Exp $
* $Id: mcd.c,v 1.99 1998/07/04 22:30:17 julian Exp $
*/
static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@ -415,7 +415,7 @@ mcdstrategy(struct buf *bp)
bp,unit,bp->b_blkno,bp->b_bcount);*/
if (unit >= NMCD || bp->b_blkno < 0) {
printf("mcdstrategy: unit = %d, blkno = %ld, bcount = %ld\n",
unit, bp->b_blkno, bp->b_bcount);
unit, (long)bp->b_blkno, bp->b_bcount);
printf("mcd: mcdstratregy failure");
bp->b_error = EINVAL;
bp->b_flags |= B_ERROR;
@ -529,7 +529,7 @@ int mcdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
if (mcd_getstat(unit, 1) == -1) /* detect disk change too */
return EIO;
MCD_TRACE("ioctl called 0x%x\n", cmd);
MCD_TRACE("ioctl called 0x%lx\n", cmd);
switch (cmd) {
case CDIOCSETPATCH:

View File

@ -41,7 +41,7 @@
*/
/* $Id: scd.c,v 1.38 1998/06/08 09:47:36 bde Exp $ */
/* $Id: scd.c,v 1.39 1998/07/04 22:30:17 julian Exp $ */
/* Please send any comments to micke@dynas.se */
@ -334,11 +334,12 @@ scdstrategy(struct buf *bp)
cd = scd_data + unit;
XDEBUG(2, ("scd%d: DEBUG: strategy: block=%ld, bcount=%ld\n", unit, bp->b_blkno, bp->b_bcount));
XDEBUG(2, ("scd%d: DEBUG: strategy: block=%ld, bcount=%ld\n",
unit, (long)bp->b_blkno, bp->b_bcount));
if (unit >= NSCD || bp->b_blkno < 0 || (bp->b_bcount % SCDBLKSIZE)) {
printf("scd%d: strategy failure: blkno = %ld, bcount = %ld\n",
unit, bp->b_blkno, bp->b_bcount);
unit, (long)bp->b_blkno, bp->b_bcount);
bp->b_error = EINVAL;
bp->b_flags |= B_ERROR;
goto bad;
@ -437,7 +438,7 @@ scdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
part = scd_part(dev);
cd = scd_data + unit;
XDEBUG(1, ("scd%d: ioctl: cmd=0x%x\n", unit, cmd));
XDEBUG(1, ("scd%d: ioctl: cmd=0x%lx\n", unit, cmd));
if (!(cd->flags & SCDVALID))
return EIO;
@ -500,7 +501,7 @@ scdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
#endif
return 0;
default:
printf("scd%d: unsupported ioctl (cmd=0x%x)\n", unit, cmd);
printf("scd%d: unsupported ioctl (cmd=0x%lx)\n", unit, cmd);
return ENOTTY;
}
}

View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: wfd.c,v 1.11 1998/06/26 18:13:57 phk Exp $
* $Id: wfd.c,v 1.12 1998/07/04 22:30:19 julian Exp $
*/
/*
@ -324,9 +324,9 @@ void wfd_describe (struct wfd *t)
if (!no_print) {
printf ("wfd%d: ", t->lun);
printf ("%lu cyls", t->cap.cyls);
printf (", %lu heads, %lu S/T", t->cap.heads, t->cap.sectors);
printf (", %lu B/S", t->cap.sector_size);
printf ("%u cyls", t->cap.cyls);
printf (", %u heads, %u S/T", t->cap.heads, t->cap.sectors);
printf (", %u B/S", t->cap.sector_size);
printf ("\n");
}
}

View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: wfd.c,v 1.11 1998/06/26 18:13:57 phk Exp $
* $Id: wfd.c,v 1.12 1998/07/04 22:30:19 julian Exp $
*/
/*
@ -324,9 +324,9 @@ void wfd_describe (struct wfd *t)
if (!no_print) {
printf ("wfd%d: ", t->lun);
printf ("%lu cyls", t->cap.cyls);
printf (", %lu heads, %lu S/T", t->cap.heads, t->cap.sectors);
printf (", %lu B/S", t->cap.sector_size);
printf ("%u cyls", t->cap.cyls);
printf (", %u heads, %u S/T", t->cap.heads, t->cap.sectors);
printf (", %u B/S", t->cap.sector_size);
printf ("\n");
}
}

View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_tl.c,v 1.9 1998/06/07 17:12:38 dfr Exp $
* $Id: if_tl.c,v 1.10 1998/06/21 14:53:34 bde Exp $
*/
/*
@ -217,7 +217,7 @@
#ifndef lint
static char rcsid[] =
"$Id: if_tl.c,v 1.9 1998/06/07 17:12:38 dfr Exp $";
"$Id: if_tl.c,v 1.10 1998/06/21 14:53:34 bde Exp $";
#endif
/*
@ -1425,7 +1425,7 @@ tl_attach_ctlr(config_id, unit)
int s, i, phys = 0;
vm_offset_t pbase, vbase;
struct tl_csr *csr;
char eaddr[ETHER_ADDR_LEN];
u_char eaddr[ETHER_ADDR_LEN];
struct tl_mii_frame frame;
u_int32_t command;
struct tl_iflist *ilist;

View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_tx.c,v 1.32 1998/07/03 23:59:09 galv Exp $
* $Id: if_tx.c,v 1.13 1998/07/04 08:02:46 semenu Exp $
*
*/
@ -1513,13 +1513,14 @@ epic_dump_state __P((
printf("\ntx%d: dumping tx descriptors",sc->unit);
for(j=0;j<TX_RING_SIZE;j++){
tdesc = sc->tx_desc + j;
printf("\ndesc%d: %4d 0x%04x, 0x%08x, 0x%04x %4d, 0x%08x, mbuf: 0x%08x",
printf(
"\ndesc%d: %4d 0x%04x, 0x%08lx, 0x%04x %4u, 0x%08lx, mbuf: %p",
j,
tdesc->txlength,tdesc->status,
tdesc->bufaddr,
(u_long)tdesc->bufaddr,
tdesc->control,tdesc->buflength,
tdesc->next,
sc->tx_buffer[j].mbuf
(u_long)tdesc->next,
(void *)sc->tx_buffer[j].mbuf
);
}
}

View File

@ -1,5 +1,5 @@
/* $FreeBSD$ */
/* $Id: isp_pci.c,v 1.9 1998/04/17 17:44:36 mjacob Exp $ */
/* $Id: isp_pci.c,v 1.1 1998/04/22 18:10:34 mjacob Exp $ */
/*
* PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
* FreeBSD Version.
@ -201,7 +201,7 @@ isp_pci_attach(config_id, unit)
pcs = malloc(sizeof (struct isp_pcisoftc), M_DEVBUF, M_NOWAIT);
if (pcs == NULL) {
printf("isp%ld: cannot allocate softc\n", unit);
printf("isp%d: cannot allocate softc\n", unit);
return;
}
bzero(pcs, sizeof (struct isp_pcisoftc));
@ -224,7 +224,7 @@ isp_pci_attach(config_id, unit)
}
}
if (mapped == 0) {
printf("isp%ld: unable to map any ports!\n", unit);
printf("isp%d: unable to map any ports!\n", unit);
free(pcs, M_DEVBUF);
return;
}
@ -265,7 +265,7 @@ isp_pci_attach(config_id, unit)
if (pci_map_int(config_id, (void (*)(void *))isp_intr,
(void *)isp, &IMASK) == 0) {
printf("%s: could not map interrupt\n");
printf("%s: could not map interrupt\n", isp->isp_name);
free(pcs, M_DEVBUF);
return;
}
@ -553,7 +553,7 @@ isp_pci_dumpregs(isp)
struct ispsoftc *isp;
{
struct isp_pcisoftc *pci = (struct isp_pcisoftc *)isp;
printf("%s: PCI Status Command/Status=%x\n", pci->pci_isp.isp_name,
printf("%s: PCI Status Command/Status=%lx\n", pci->pci_isp.isp_name,
pci_conf_read(pci->pci_id, PCI_COMMAND_STATUS_REG));
}
#endif

View File

@ -28,7 +28,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* $Id: od.c,v 1.40 1998/06/17 14:13:14 bde Exp $
* $Id: od.c,v 1.41 1998/07/04 22:30:24 julian Exp $
*/
/*
@ -231,10 +231,9 @@ odattach(struct scsi_link *sc_link)
*/
if(dp->secsiz == 0) dp->secsiz = SECSIZE;
if (dp->disksize != 0) {
printf("%ldMB (%ld %d byte sectors)",
dp->disksize / ((1024L * 1024L) / dp->secsiz),
dp->disksize,
dp->secsiz);
printf("%luMB (%lu %u byte sectors)",
(u_long)(dp->disksize / ((1024L * 1024L) / dp->secsiz)),
(u_long)dp->disksize, dp->secsiz);
} else {
printf("od not present");
}
@ -302,8 +301,8 @@ od_open(dev, mode, fmt, p, sc_link)
}
SC_DEBUG(sc_link, SDEV_DB1,
("od_open: dev=0x%lx (unit %ld, partition %d)\n",
dev, unit, PARTITION(dev)));
("od_open: dev=0x%lx (unit %lu, partition %d)\n",
(u_long)dev, (u_long)unit, PARTITION(dev)));
/*
* Try to start the drive, and try to clear "Unit Attention"
@ -361,8 +360,8 @@ od_open(dev, mode, fmt, p, sc_link)
case 2048 :
break;
default :
printf("od%ld: Can't deal with %d bytes logical blocks\n",
unit, od->params.secsiz);
printf("od%lu: Can't deal with %u bytes logical blocks\n",
(u_long)unit, od->params.secsiz);
Debugger("od");
errcode = ENXIO;
goto bad;
@ -391,7 +390,8 @@ od_open(dev, mode, fmt, p, sc_link)
goto bad;
SC_DEBUG(sc_link, SDEV_DB3, ("Slice tables initialized "));
SC_DEBUG(sc_link, SDEV_DB3, ("open %ld %ld\n", odstrats, odqueues));
SC_DEBUG(sc_link, SDEV_DB3, ("open %lu %lu\n",
(u_long)odstrats, (u_long)odqueues));
return 0;
@ -491,7 +491,9 @@ od_strategy(struct buf *bp, struct scsi_link *sc_link)
/* make sure that the transfer size is a multiple of the sector size */
if( (bp->b_bcount % secsize) != 0 ) {
bp->b_error = EINVAL;
printf("od_strategy: Invalid b_bcount %d at block number: 0x%x\n", bp->b_bcount, bp->b_blkno);
printf(
"od_strategy: Invalid b_bcount %ld at block number: 0x%lx\n",
bp->b_bcount, (long)bp->b_blkno);
goto bad;
}
@ -670,7 +672,7 @@ odstart(u_int32_t unit, u_int32_t flags)
}
} else {
bad:
printf("od%ld: oops not queued\n", unit);
printf("od%lu: oops not queued\n", (u_long)unit);
bp->b_error = EIO;
bp->b_flags |= B_ERROR;
biodone(bp);
@ -694,7 +696,7 @@ od_ioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p,
* Find the device that the user is talking about
*/
od = sc_link->sd;
SC_DEBUG(sc_link, SDEV_DB1, ("odioctl (0x%x)", cmd));
SC_DEBUG(sc_link, SDEV_DB1, ("odioctl (0x%lx)", cmd));
/*
* If the device is not valid.. abandon ship
@ -801,10 +803,11 @@ od_size(unit, flags)
od->params.heads = 64;
} else {
SC_DEBUG(sc_link, SDEV_DB3,
("%ld cyls, %d heads, %d rpm\n",
scsi_3btou(&scsi_sense.pages.rigid_geometry.ncyl_2),
scsi_sense.pages.rigid_geometry.nheads,
scsi_2btou(&scsi_sense.pages.rigid_geometry.medium_rot_rate_1)));
("%lu cyls, %d heads, %lu rpm\n",
(u_long)scsi_3btou(&scsi_sense.pages.rigid_geometry.ncyl_2),
scsi_sense.pages.rigid_geometry.nheads,
(u_long)scsi_2btou(
&scsi_sense.pages.rigid_geometry.medium_rot_rate_1)));
od->params.heads = scsi_sense.pages.rigid_geometry.nheads;
if (od->params.heads == 0)