* SUCH DAMAGE.
*
* $FreeBSD: src/sys/cam/cam_periph.c,v 1.24.2.3 2003/01/25 19:04:40 dillon Exp $
- * $DragonFly: src/sys/bus/cam/cam_periph.c,v 1.16 2006/09/05 00:55:31 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/cam_periph.c,v 1.17 2006/12/20 18:14:33 dillon Exp $
*/
#include <sys/param.h>
unit = 0;
periph_name = p_drv->driver_name;
- snprintf(pathbuf, sizeof(pathbuf), "scbus%d", pathid);
+ ksnprintf(pathbuf, sizeof(pathbuf), "scbus%d", pathid);
i = -1;
for (hit = 0; (i = resource_locate(i, periph_name)) != -1; hit = 0) {
dname = resource_query_name(i);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/cam/cam_xpt.c,v 1.80.2.18 2002/12/09 17:31:55 gibbs Exp $
- * $DragonFly: src/sys/bus/cam/cam_xpt.c,v 1.32 2006/11/07 18:49:57 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/cam_xpt.c,v 1.33 2006/12/20 18:14:33 dillon Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
char buf[32], *strval;
pathid = CAM_XPT_PATH_ID;
- snprintf(buf, sizeof(buf), "%s%d", sim_name, sim_unit);
+ ksnprintf(buf, sizeof(buf), "%s%d", sim_name, sim_unit);
i = -1;
while ((i = resource_locate(i, "scbus")) != -1) {
dunit = resource_query_unit(i);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.14.2.11 2003/10/30 15:06:35 thomas Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_all.c,v 1.5 2005/03/15 20:42:14 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_all.c,v 1.6 2006/12/20 18:14:34 dillon Exp $
*/
#include <sys/param.h>
#ifdef _KERNEL
-#include <opt_scsi.h>
+#include <opt_scsi.h>
#include <sys/systm.h>
+
#else
+
#include <errno.h>
#include <stdio.h>
#include <string.h>
+
+#define ksnprintf snprintf /* ick, userland uses us too */
+
#endif
#include "../cam.h"
}
*cdb_string = '\0';
for (i = 0; i < cdb_len; i++)
- snprintf(cdb_string + strlen(cdb_string),
+ ksnprintf(cdb_string + strlen(cdb_string),
len - strlen(cdb_string), "%x ", cdb_ptr[i]);
return(cdb_string);
if (command_print != 0) {
char cdb_str[(SCSI_MAX_CDBLEN * 3) + 1];
- retlen = snprintf(tmpstr, tmpstrlen, "%s", path_str);
+ retlen = ksnprintf(tmpstr, tmpstrlen, "%s", path_str);
if ((tmplen = str_len - cur_len - 1) < 0)
goto sst_bailout;
str[str_len - 1] = '\0';
if ((csio->ccb_h.flags & CAM_CDB_POINTER) != 0) {
- retlen = snprintf(tmpstr, tmpstrlen, "%s. CDB: %s\n",
+ retlen = ksnprintf(tmpstr, tmpstrlen, "%s. CDB: %s\n",
scsi_op_desc(csio->cdb_io.cdb_ptr[0],
&device->inq_data),
scsi_cdb_string(csio->cdb_io.cdb_ptr,
cdb_str,
sizeof(cdb_str)));
} else {
- retlen = snprintf(tmpstr, tmpstrlen, "%s. CDB: %s\n",
+ retlen = ksnprintf(tmpstr, tmpstrlen, "%s. CDB: %s\n",
scsi_op_desc(csio->cdb_io.cdb_bytes[0],
&device->inq_data), scsi_cdb_string(
csio->cdb_io.cdb_bytes, cdb_str,
}
- retlen = snprintf(tmpstr, tmpstrlen, "%s", path_str);
+ retlen = ksnprintf(tmpstr, tmpstrlen, "%s", path_str);
if ((tmplen = str_len - cur_len - 1) < 0)
goto sst_bailout;
switch (error_code) {
case SSD_DEFERRED_ERROR:
- retlen = snprintf(tmpstr, tmpstrlen, "Deferred Error: ");
+ retlen = ksnprintf(tmpstr, tmpstrlen, "Deferred Error: ");
if ((tmplen = str_len - cur_len - 1) < 0)
goto sst_bailout;
/* FALLTHROUGH */
case SSD_CURRENT_ERROR:
- retlen = snprintf(tmpstr, tmpstrlen, "%s",
+ retlen = ksnprintf(tmpstr, tmpstrlen, "%s",
scsi_sense_key_text[sense_key]);
if ((tmplen = str_len - cur_len - 1) < 0)
case SSD_KEY_DATA_PROTECT:
break;
case SSD_KEY_BLANK_CHECK:
- retlen = snprintf(tmpstr, tmpstrlen,
+ retlen = ksnprintf(tmpstr, tmpstrlen,
" req sz: %d (decimal)",
info);
default:
if (info) {
if (sense->flags & SSD_ILI) {
- retlen = snprintf (tmpstr,
+ retlen = ksnprintf (tmpstr,
tmpstrlen,
" ILI (length "
"mismatch): %d", info);
} else {
- retlen = snprintf(tmpstr,
+ retlen = ksnprintf(tmpstr,
tmpstrlen,
" info:%x",
info);
}
}
} else if (info) {
- retlen = snprintf(tmpstr, tmpstrlen," info?:%x", info);
+ retlen = ksnprintf(tmpstr, tmpstrlen," info?:%x", info);
if ((tmplen = str_len - cur_len -1) < 0)
goto sst_bailout;
if (sense->extra_len >= 4) {
if (bcmp(sense->cmd_spec_info, "\0\0\0\0", 4)) {
- retlen = snprintf(tmpstr, tmpstrlen,
+ retlen = ksnprintf(tmpstr, tmpstrlen,
" csi:%x,%x,%x,%x",
sense->cmd_spec_info[0],
sense->cmd_spec_info[1],
if (asc || ascq) {
const char *desc = scsi_sense_desc(asc, ascq,
&device->inq_data);
- retlen = snprintf(tmpstr, tmpstrlen,
+ retlen = ksnprintf(tmpstr, tmpstrlen,
" asc:%x,%x\n%s%s", asc, ascq,
path_str, desc);
}
if (sense->extra_len >= 7 && sense->fru) {
- retlen = snprintf(tmpstr, tmpstrlen,
+ retlen = ksnprintf(tmpstr, tmpstrlen,
" field replaceable unit: %x",
sense->fru);
if ((sense->extra_len >= 10)
&& (sense->sense_key_spec[0] & SSD_SCS_VALID) != 0) {
- retlen = snprintf(tmpstr, tmpstrlen, " sks:%x,%x",
+ retlen = ksnprintf(tmpstr, tmpstrlen, " sks:%x,%x",
sense->sense_key_spec[0],
scsi_2btoul(&sense->sense_key_spec[1]));
break;
default:
- retlen = snprintf(tmpstr, tmpstrlen, "error code %d",
+ retlen = ksnprintf(tmpstr, tmpstrlen, "error code %d",
sense->error_code & SSD_ERRCODE);
if ((tmplen = str_len - cur_len -1) < 0)
str[str_len - 1] = '\0';
if (sense->error_code & SSD_ERRCODE_VALID) {
- retlen = snprintf(tmpstr, tmpstrlen,
+ retlen = ksnprintf(tmpstr, tmpstrlen,
" at block no. %d (decimal)",
info = scsi_4btoul(sense->info));
}
}
- retlen = snprintf(tmpstr, tmpstrlen, "\n");
+ retlen = ksnprintf(tmpstr, tmpstrlen, "\n");
if ((tmplen = str_len - cur_len -1) < 0)
goto sst_bailout;
if (SID_ANSI_REV(inq_data) == SCSI_REV_CCS)
bcopy("CCS", rstr, 4);
else
- snprintf(rstr, sizeof (rstr), "%d", SID_ANSI_REV(inq_data));
+ ksnprintf(rstr, sizeof (rstr), "%d", SID_ANSI_REV(inq_data));
printf("<%s %s %s> %s %s SCSI-%s device %s\n",
vendor, product, revision,
SID_IS_REMOVABLE(inq_data) ? "Removable" : "Fixed",
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.31.2.16 2003/10/21 22:26:11 thomas Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_cd.c,v 1.25 2006/09/10 01:26:32 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_cd.c,v 1.26 2006/12/20 18:14:34 dillon Exp $
*/
/*
* Portions of this driver taken from the original FreeBSD cd driver.
periph = (struct cam_periph *)context;
softc = (struct cd_softc *)periph->softc;
- snprintf(tmpstr, sizeof(tmpstr), "CAM CD unit %d", periph->unit_number);
- snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number);
+ ksnprintf(tmpstr, sizeof(tmpstr), "CAM CD unit %d", periph->unit_number);
+ ksnprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number);
sysctl_ctx_init(&softc->sysctl_ctx);
softc->flags |= CD_FLAG_SCTX_INIT;
/*
* Load the user's default, if any.
*/
- snprintf(tmpstr, sizeof(tmpstr), "kern.cam.cd.%d.minimum_cmd_size",
+ ksnprintf(tmpstr, sizeof(tmpstr), "kern.cam.cd.%d.minimum_cmd_size",
periph->unit_number);
TUNABLE_INT_FETCH(tmpstr, &softc->minimum_command_size);
if ((csio->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) {
- snprintf(announce_buf, sizeof(announce_buf),
+ ksnprintf(announce_buf, sizeof(announce_buf),
"cd present [%lu x %lu byte records]",
cdp->disksize, (u_long)cdp->blksize);
*/
if ((have_sense) && (asc != 0x25)
&& (error_code == SSD_CURRENT_ERROR))
- snprintf(announce_buf,
+ ksnprintf(announce_buf,
sizeof(announce_buf),
"Attempt to query device "
"size failed: %s, %s",
CAM_SCSI_STATUS_ERROR)
&& (csio->scsi_status ==
SCSI_STATUS_BUSY)) {
- snprintf(announce_buf,
+ ksnprintf(announce_buf,
sizeof(announce_buf),
"Attempt to query device "
"size failed: SCSI status: BUSY");
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.20.2.2 2000/10/31 08:09:49 dwmalone Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_ch.c,v 1.17 2006/09/10 01:26:32 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_ch.c,v 1.18 2006/12/20 18:14:34 dillon Exp $
*/
/*
* Derived from the NetBSD SCSI changer driver.
softc->sc_picker = softc->sc_firsts[CHET_MT];
#define PLURAL(c) (c) == 1 ? "" : "s"
- snprintf(announce_buf, sizeof(announce_buf),
+ ksnprintf(announce_buf, sizeof(announce_buf),
"%d slot%s, %d drive%s, "
"%d picker%s, %d portal%s",
softc->sc_counts[CHET_ST],
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.42.2.46 2003/10/21 22:18:19 thomas Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_da.c,v 1.32 2006/09/10 01:26:32 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_da.c,v 1.33 2006/12/20 18:14:34 dillon Exp $
*/
#ifdef _KERNEL
periph = (struct cam_periph *)context;
softc = (struct da_softc *)periph->softc;
- snprintf(tmpstr, sizeof(tmpstr), "CAM DA unit %d", periph->unit_number);
- snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number);
+ ksnprintf(tmpstr, sizeof(tmpstr), "CAM DA unit %d", periph->unit_number);
+ ksnprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number);
sysctl_ctx_init(&softc->sysctl_ctx);
softc->flags |= DA_FLAG_SCTX_INIT;
/*
* Load the user's default, if any.
*/
- snprintf(tmpstr, sizeof(tmpstr), "kern.cam.da.%d.minimum_cmd_size",
+ ksnprintf(tmpstr, sizeof(tmpstr), "kern.cam.da.%d.minimum_cmd_size",
periph->unit_number);
TUNABLE_INT_FETCH(tmpstr, &softc->minimum_cmd_size);
dasetgeom(periph, rdcap);
dp = &softc->params;
- snprintf(announce_buf, sizeof(announce_buf),
+ ksnprintf(announce_buf, sizeof(announce_buf),
"%luMB (%u %u byte sectors: %dH %dS/T %dC)",
(unsigned long) (((u_int64_t)dp->secsize *
dp->sectors) / (1024*1024)), dp->sectors,
*/
if ((have_sense) && (asc != 0x25)
&& (error_code == SSD_CURRENT_ERROR))
- snprintf(announce_buf,
+ ksnprintf(announce_buf,
sizeof(announce_buf),
"Attempt to query device "
"size failed: %s, %s",
/*
* $FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.1.2.5 2003/08/09 06:18:30 non Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_low.c,v 1.16 2006/09/05 00:55:32 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_low.c,v 1.17 2006/12/20 18:14:34 dillon Exp $
* $NetBSD: scsi_low.c,v 1.24.10.8 2001/06/26 07:39:44 honda Exp $
*/
struct cam_devq *devq;
int tagged_openings;
- sprintf(slp->sl_xname, "%s%d",
- DEVPORT_DEVNAME(slp->sl_dev), DEVPORT_DEVUNIT(slp->sl_dev));
+ ksprintf(slp->sl_xname, "%s%d",
+ DEVPORT_DEVNAME(slp->sl_dev), DEVPORT_DEVUNIT(slp->sl_dev));
devq = cam_simq_alloc(SCSI_LOW_NCCB);
if (devq == NULL)
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.55 2000/01/14 07:13:57 peter Exp $
- * $DragonFly: src/sys/bus/eisa/eisaconf.c,v 1.9 2006/10/25 20:55:51 dillon Exp $
+ * $DragonFly: src/sys/bus/eisa/eisaconf.c,v 1.10 2006/12/20 18:14:35 dillon Exp $
*/
#include "opt_eisa.h"
idstring = kmalloc(8 + sizeof(" (System Board)") + 1,
M_DEVBUF, M_INTWAIT);
- sprintf(idstring, "%c%c%c%03x%01x (System Board)",
- EISA_MFCTR_CHAR0(id),
- EISA_MFCTR_CHAR1(id),
- EISA_MFCTR_CHAR2(id),
- EISA_PRODUCT_ID(id),
- EISA_REVISION_ID(id));
+ ksprintf(idstring, "%c%c%c%03x%01x (System Board)",
+ EISA_MFCTR_CHAR0(id),
+ EISA_MFCTR_CHAR1(id),
+ EISA_MFCTR_CHAR2(id),
+ EISA_PRODUCT_ID(id),
+ EISA_REVISION_ID(id));
device_set_desc(dev, idstring);
return (0);
int retval = 0;
if (device_get_desc(child)) {
- snprintf(buf, sizeof(buf), "<%s>", device_get_desc(child));
+ ksnprintf(buf, sizeof(buf), "<%s>", device_get_desc(child));
eisa_reg_print(child, buf, NULL, &column);
}
while ((resv = eisa_find_ioaddr(e_dev, rid++))) {
if ((resv->size == 1) ||
(resv->flags & RESVADDR_BITMASK)) {
- snprintf(buf, sizeof(buf), "%s%lx",
+ ksnprintf(buf, sizeof(buf), "%s%lx",
((rid == 1) ? "at 0x" : "0x"),
resv->addr);
} else {
- snprintf(buf, sizeof(buf), "%s%lx-0x%lx",
+ ksnprintf(buf, sizeof(buf), "%s%lx-0x%lx",
((rid == 1) ? "at 0x" : "0x"),
resv->addr,
(resv->addr + (resv->size - 1)));
while ((resv = eisa_find_maddr(e_dev, rid++))) {
if ((resv->size == 1) ||
(resv->flags & RESVADDR_BITMASK)) {
- snprintf(buf, sizeof(buf), "%s%lx",
+ ksnprintf(buf, sizeof(buf), "%s%lx",
((rid == 1) ? "at 0x" : "0x"),
resv->addr);
} else {
- snprintf(buf, sizeof(buf), "%s%lx-0x%lx",
+ ksnprintf(buf, sizeof(buf), "%s%lx-0x%lx",
((rid == 1) ? "at 0x" : "0x"),
resv->addr,
(resv->addr + (resv->size - 1)));
rid = 0;
while ((irq = eisa_find_irq(e_dev, rid++)) != NULL) {
- snprintf(buf, sizeof(buf), "irq %d (%s)", irq->irq_no,
+ ksnprintf(buf, sizeof(buf), "irq %d (%s)", irq->irq_no,
(irq->irq_trigger ? "level" : "edge"));
eisa_reg_print(child, buf,
((rid == 1) ? &separator : NULL), &column);
}
- snprintf(buf, sizeof(buf), "on %s slot %d\n",
+ ksnprintf(buf, sizeof(buf), "on %s slot %d\n",
device_get_nameunit(dev), eisa_get_slot(child));
eisa_reg_print(child, buf, NULL, &column);
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $DragonFly: src/sys/bus/firewire/fwcrom.c,v 1.7 2006/01/22 14:03:51 swildner Exp $
+ * $DragonFly: src/sys/bus/firewire/fwcrom.c,v 1.8 2006/12/20 18:14:36 dillon Exp $
*/
#ifndef __DragonFly__
#include <err.h>
#include <stdlib.h>
#include <string.h>
+#define ksnprintf snprintf /* sigh. used by fwcontrol */
#endif
#ifdef __DragonFly__
}
}
if (s != NULL)
- snprintf(buf, len, "%s", s);
+ ksnprintf(buf, len, "%s", s);
}
char *
switch (reg->key & CSRTYPE_MASK) {
case CSRTYPE_I:
#if 0
- len -= snprintf(buf, len, "%d", reg->val);
+ len -= ksnprintf(buf, len, "%d", reg->val);
buf += strlen(buf);
#else
*buf = '\0';
#endif
break;
case CSRTYPE_C:
- len -= snprintf(buf, len, "offset=0x%04x(%d)",
+ len -= ksnprintf(buf, len, "offset=0x%04x(%d)",
reg->val, reg->val);
buf += strlen(buf);
break;
case CSRTYPE_D:
dir = (struct csrdirectory *) (reg + reg->val);
crc = crom_crc((u_int32_t *)&dir->entry[0], dir->crc_len);
- len -= snprintf(buf, len, "len=%d crc=0x%04x(%s) ",
+ len -= ksnprintf(buf, len, "len=%d crc=0x%04x(%s) ",
dir->crc_len, dir->crc,
(crc == dir->crc) ? "OK" : "NG");
buf += strlen(buf);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/isa/isahint.c,v 1.8.2.1 2001/03/21 11:18:25 nyan Exp $
- * $DragonFly: src/sys/bus/isa/isahint.c,v 1.6 2006/10/25 20:55:51 dillon Exp $
+ * $DragonFly: src/sys/bus/isa/isahint.c,v 1.7 2006/12/20 18:14:37 dillon Exp $
*/
#include <sys/param.h>
/*
* Add all devices configured to be attached to parent.
*/
- sprintf(buf, "isa%d", device_get_unit(parent));
+ ksprintf(buf, "isa%d", device_get_unit(parent));
for (i = resource_query_string(-1, "at", buf);
i != -1;
i = resource_query_string(i, "at", buf)) {
/* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */
/* $FreeBSD: src/sys/dev/pccard/pccard.c,v 1.70 2002/11/14 14:02:32 mux Exp $ */
-/* $DragonFly: src/sys/bus/pccard/pccard.c,v 1.17 2006/10/25 20:55:51 dillon Exp $ */
+/* $DragonFly: src/sys/bus/pccard/pccard.c,v 1.18 2006/12/20 18:14:37 dillon Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
struct pccard_ivar *devi = PCCARD_IVAR(child);
struct pccard_function *func = devi->fcn;
- snprintf(buf, buflen, "function=%d", func->number);
+ ksnprintf(buf, buflen, "function=%d", func->number);
return (0);
}
struct pccard_function *func = devi->fcn;
struct pccard_softc *sc = PCCARD_SOFTC(bus);
- snprintf(buf, buflen, "manufacturer=0x%04x product=0x%04x "
+ ksnprintf(buf, buflen, "manufacturer=0x%04x product=0x%04x "
"cisvendor=\"%s\" cisproduct=\"%s\" function_type=%d",
sc->card.manufacturer, sc->card.product, sc->card.cis1_info[0],
sc->card.cis1_info[1], func->function);
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/pci/pci.c,v 1.141.2.15 2002/04/30 17:48:18 tmm Exp $
- * $DragonFly: src/sys/bus/pci/pci.c,v 1.33 2006/10/25 20:55:51 dillon Exp $
+ * $DragonFly: src/sys/bus/pci/pci.c,v 1.34 2006/12/20 18:14:37 dillon Exp $
*
*/
struct pci_devinfo *dinfo;
dinfo = device_get_ivars(child);
- snprintf(buf, buflen, "slot=%d function=%d", pci_get_slot(child),
+ ksnprintf(buf, buflen, "slot=%d function=%d", pci_get_slot(child),
pci_get_function(child));
return (0);
}
dinfo = device_get_ivars(child);
cfg = &dinfo->cfg;
- snprintf(buf, buflen, "vendor=0x%04x device=0x%04x subvendor=0x%04x "
+ ksnprintf(buf, buflen, "vendor=0x%04x device=0x%04x subvendor=0x%04x "
"subdevice=0x%04x class=0x%02x%02x%02x", cfg->vendor, cfg->device,
cfg->subvendor, cfg->subdevice, cfg->baseclass, cfg->subclass,
cfg->progif);
/**************************************************************************
**
** $FreeBSD: src/sys/pci/pcisupport.c,v 1.154.2.15 2003/04/29 15:55:06 simokawa Exp $
-** $DragonFly: src/sys/bus/pci/pcisupport.c,v 1.18 2006/10/25 20:55:51 dillon Exp $
+** $DragonFly: src/sys/bus/pci/pcisupport.c,v 1.19 2006/12/20 18:14:37 dillon Exp $
**
** Device driver for DEC/INTEL PCI chipsets.
**
case PCIS_BRIDGE_CARDBUS: strcpy(tmpbuf, "PCI to CardBus"); break;
case PCIS_BRIDGE_OTHER: strcpy(tmpbuf, "PCI to Other"); break;
default:
- snprintf(tmpbuf, sizeof(tmpbuf),
+ ksnprintf(tmpbuf, sizeof(tmpbuf),
"PCI to 0x%x", pci_get_subclass(dev));
break;
}
- snprintf(tmpbuf+strlen(tmpbuf), sizeof(tmpbuf)-strlen(tmpbuf),
+ ksnprintf(tmpbuf+strlen(tmpbuf), sizeof(tmpbuf)-strlen(tmpbuf),
" bridge (vendor=%04x device=%04x)",
pci_get_vendor(dev), pci_get_device(dev));
descr = kmalloc (strlen(tmpbuf) +1, M_DEVBUF, M_WAITOK);
len = strlen(vendor) + strlen(chip) + strlen(type) + 4;
MALLOC(buf, char *, len, M_TEMP, M_WAITOK);
- sprintf(buf, "%s %s %s", vendor, chip, type);
+ ksprintf(buf, "%s %s %s", vendor, chip, type);
return buf;
}
len = strlen(vendor) + 7 + 4 + 1 + strlen(type) + 1;
MALLOC(buf, char *, len, M_TEMP, M_WAITOK);
- sprintf(buf, "%s model %04x %s", vendor, id >> 16, type);
+ ksprintf(buf, "%s model %04x %s", vendor, id >> 16, type);
return buf;
}
return type;
/* $NetBSD: ehci.c,v 1.91 2005/02/27 00:27:51 perry Exp $ */
/* $FreeBSD: src/sys/dev/usb/ehci.c,v 1.36.2.3 2006/09/24 13:39:04 iedowse Exp $ */
-/* $DragonFly: src/sys/bus/usb/ehci.c,v 1.26 2006/12/10 02:03:56 sephe Exp $ */
+/* $DragonFly: src/sys/bus/usb/ehci.c,v 1.27 2006/12/20 18:14:37 dillon Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
SYSCTL_INT(_hw_usb_ehci, OID_AUTO, debug, CTLFLAG_RW,
&ehcidebug, 0, "ehci debug level");
#ifndef __NetBSD__
-#define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f))
+#define bitmask_snprintf(q,f,b,l) ksnprintf((b), (l), "%b", (q), (f))
#endif
#else
#define DPRINTF(x)
* POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.18.2.1 2006/01/26 01:43:13 iedowse Exp $
- * $DragonFly: src/sys/bus/usb/ehci_pci.c,v 1.12 2006/12/10 02:03:56 sephe Exp $
+ * $DragonFly: src/sys/bus/usb/ehci_pci.c,v 1.13 2006/12/20 18:14:37 dillon Exp $
*/
/*
device_set_desc(sc->sc_bus.bdev, ehci_pci_match(self));
switch (pci_get_vendor(self)) {
case PCI_EHCI_VENDORID_ACERLABS:
- sprintf(sc->sc_vendor, "AcerLabs");
+ ksprintf(sc->sc_vendor, "AcerLabs");
break;
case PCI_EHCI_VENDORID_AMD:
- sprintf(sc->sc_vendor, "AMD");
+ ksprintf(sc->sc_vendor, "AMD");
break;
case PCI_EHCI_VENDORID_APPLE:
- sprintf(sc->sc_vendor, "Apple");
+ ksprintf(sc->sc_vendor, "Apple");
break;
case PCI_EHCI_VENDORID_ATI:
- sprintf(sc->sc_vendor, "ATI");
+ ksprintf(sc->sc_vendor, "ATI");
break;
case PCI_EHCI_VENDORID_CMDTECH:
- sprintf(sc->sc_vendor, "CMDTECH");
+ ksprintf(sc->sc_vendor, "CMDTECH");
break;
case PCI_EHCI_VENDORID_INTEL:
- sprintf(sc->sc_vendor, "Intel");
+ ksprintf(sc->sc_vendor, "Intel");
break;
case PCI_EHCI_VENDORID_NEC:
- sprintf(sc->sc_vendor, "NEC");
+ ksprintf(sc->sc_vendor, "NEC");
break;
case PCI_EHCI_VENDORID_OPTI:
- sprintf(sc->sc_vendor, "OPTi");
+ ksprintf(sc->sc_vendor, "OPTi");
break;
case PCI_EHCI_VENDORID_SIS:
- sprintf(sc->sc_vendor, "SiS");
+ ksprintf(sc->sc_vendor, "SiS");
break;
case PCI_EHCI_VENDORID_NVIDIA:
case PCI_EHCI_VENDORID_NVIDIA2:
- sprintf(sc->sc_vendor, "nVidia");
+ ksprintf(sc->sc_vendor, "nVidia");
break;
case PCI_EHCI_VENDORID_VIA:
- sprintf(sc->sc_vendor, "VIA");
+ ksprintf(sc->sc_vendor, "VIA");
break;
default:
if (bootverbose)
device_printf(self, "(New EHCI DeviceId=0x%08x)\n",
pci_get_devid(self));
- sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self));
+ ksprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self));
}
err = bus_setup_intr(self, sc->irq_res, 0,
/* $NetBSD: ohci.c,v 1.138 2003/02/08 03:32:50 ichiro Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.154.2.4 2006/06/26 00:31:25 iedowse Exp $ */
-/* $DragonFly: src/sys/bus/usb/ohci.c,v 1.17 2006/12/10 02:03:56 sephe Exp $ */
+/* $DragonFly: src/sys/bus/usb/ohci.c,v 1.18 2006/12/20 18:14:37 dillon Exp $ */
/* Also, already ported:
* $NetBSD: ohci.c,v 1.140 2003/05/13 04:42:00 gson Exp $
SYSCTL_INT(_hw_usb_ohci, OID_AUTO, debug, CTLFLAG_RW,
&ohcidebug, 0, "ohci debug level");
#ifndef __NetBSD__
-#define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f))
+#define bitmask_snprintf(q,f,b,l) ksnprintf((b), (l), "%b", (q), (f))
#endif
#else
#define DPRINTF(x)
* POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/usb/ohci_pci.c,v 1.44.2.1 2006/01/29 01:26:46 iedowse Exp $
- * $DragonFly: src/sys/bus/usb/ohci_pci.c,v 1.6 2006/12/10 02:03:56 sephe Exp $
+ * $DragonFly: src/sys/bus/usb/ohci_pci.c,v 1.7 2006/12/20 18:14:37 dillon Exp $
*/
/*
device_set_desc(sc->sc_bus.bdev, ohci_pci_match(self));
switch (pci_get_vendor(self)) {
case PCI_OHCI_VENDORID_ACERLABS:
- sprintf(sc->sc_vendor, "AcerLabs");
+ ksprintf(sc->sc_vendor, "AcerLabs");
break;
case PCI_OHCI_VENDORID_AMD:
- sprintf(sc->sc_vendor, "AMD");
+ ksprintf(sc->sc_vendor, "AMD");
break;
case PCI_OHCI_VENDORID_APPLE:
- sprintf(sc->sc_vendor, "Apple");
+ ksprintf(sc->sc_vendor, "Apple");
break;
case PCI_OHCI_VENDORID_ATI:
- sprintf(sc->sc_vendor, "ATI");
+ ksprintf(sc->sc_vendor, "ATI");
break;
case PCI_OHCI_VENDORID_CMDTECH:
- sprintf(sc->sc_vendor, "CMDTECH");
+ ksprintf(sc->sc_vendor, "CMDTECH");
break;
case PCI_OHCI_VENDORID_NEC:
- sprintf(sc->sc_vendor, "NEC");
+ ksprintf(sc->sc_vendor, "NEC");
break;
case PCI_OHCI_VENDORID_NVIDIA:
case PCI_OHCI_VENDORID_NVIDIA2:
- sprintf(sc->sc_vendor, "nVidia");
+ ksprintf(sc->sc_vendor, "nVidia");
break;
case PCI_OHCI_VENDORID_OPTI:
- sprintf(sc->sc_vendor, "OPTi");
+ ksprintf(sc->sc_vendor, "OPTi");
break;
case PCI_OHCI_VENDORID_SIS:
- sprintf(sc->sc_vendor, "SiS");
+ ksprintf(sc->sc_vendor, "SiS");
break;
default:
if (bootverbose)
device_printf(self, "(New OHCI DeviceId=0x%08x)\n",
pci_get_devid(self));
- sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self));
+ ksprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self));
}
err = bus_setup_intr(self, sc->irq_res, 0,
/* $NetBSD: uhci.c,v 1.170 2003/02/19 01:35:04 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.162.2.1 2006/03/01 01:59:04 iedowse Exp $ */
-/* $DragonFly: src/sys/bus/usb/uhci.c,v 1.18 2006/12/10 02:03:56 sephe Exp $ */
+/* $DragonFly: src/sys/bus/usb/uhci.c,v 1.19 2006/12/20 18:14:37 dillon Exp $ */
/* Also already incorporated from NetBSD:
* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $
SYSCTL_INT(_hw_usb_uhci, OID_AUTO, loop, CTLFLAG_RW,
&uhcinoloop, 0, "uhci noloop");
#ifndef __NetBSD__
-#define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f))
+#define bitmask_snprintf(q,f,b,l) ksnprintf((b), (l), "%b", (q), (f))
#endif
#else
#define DPRINTF(x)
* POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.57 2005/03/01 07:50:11 imp Exp $
- * $DragonFly: src/sys/bus/usb/uhci_pci.c,v 1.9 2006/12/10 02:03:56 sephe Exp $
+ * $DragonFly: src/sys/bus/usb/uhci_pci.c,v 1.10 2006/12/20 18:14:37 dillon Exp $
*/
/* Universal Host Controller Interface
device_set_desc(sc->sc_bus.bdev, uhci_pci_match(self));
switch (pci_get_vendor(self)) {
case PCI_UHCI_VENDORID_INTEL:
- sprintf(sc->sc_vendor, "Intel");
+ ksprintf(sc->sc_vendor, "Intel");
break;
case PCI_UHCI_VENDORID_VIA:
- sprintf(sc->sc_vendor, "VIA");
+ ksprintf(sc->sc_vendor, "VIA");
break;
default:
if (bootverbose)
device_printf(self, "(New UHCI DeviceId=0x%08x)\n",
pci_get_devid(self));
- sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self));
+ ksprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self));
}
switch (pci_read_config(self, PCI_USBREV, 1) & PCI_USBREV_MASK) {
/* $NetBSD: uhub.c,v 1.68 2004/06/29 06:30:05 mycroft Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.69.2.1 2005/12/18 15:51:31 iedowse Exp $ */
-/* $DragonFly: src/sys/bus/usb/uhub.c,v 1.10 2006/12/10 02:03:56 sephe Exp $ */
+/* $DragonFly: src/sys/bus/usb/uhub.c,v 1.11 2006/12/20 18:14:37 dillon Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
for (i = 0; dev->subdevs[i]; i++) {
if (dev->subdevs[i] == child) {
if (dev->ifacenums == NULL) {
- snprintf(buf, buflen,
+ ksnprintf(buf, buflen,
"port=%i", port);
} else {
- snprintf(buf, buflen,
+ ksnprintf(buf, buflen,
"port=%i interface=%i",
port, dev->ifacenums[i]);
}
/* XXX can sleep */
(void)usbd_get_string(dev, dev->ddesc.iSerialNumber, &serial[0]);
if (dev->ifacenums == NULL) {
- snprintf(buf, buflen, "vendor=0x%04x product=0x%04x "
+ ksnprintf(buf, buflen, "vendor=0x%04x product=0x%04x "
"devclass=0x%02x devsubclass=0x%02x "
"release=0x%04x sernum=\"%s\"",
UGETW(dev->ddesc.idVendor), UGETW(dev->ddesc.idProduct),
UGETW(dev->ddesc.bcdDevice), serial);
} else {
iface = &dev->ifaces[dev->ifacenums[i]];
- snprintf(buf, buflen, "vendor=0x%04x product=0x%04x "
+ ksnprintf(buf, buflen, "vendor=0x%04x product=0x%04x "
"devclass=0x%02x devsubclass=0x%02x "
"release=0x%04x sernum=\"%s\" "
"intclass=0x%02x intsubclass=0x%02x",
/* $NetBSD: usb_subr.c,v 1.99 2002/07/11 21:14:34 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.76.2.3 2006/03/01 01:59:05 iedowse Exp $ */
-/* $DragonFly: src/sys/bus/usb/usb_subr.c,v 1.15 2006/12/10 02:03:56 sephe Exp $ */
+/* $DragonFly: src/sys/bus/usb/usb_subr.c,v 1.16 2006/12/20 18:14:37 dillon Exp $ */
/* Also already have from NetBSD:
* $NetBSD: usb_subr.c,v 1.102 2003/01/01 16:21:50 augustss Exp $
if (err < USBD_ERROR_MAX) {
return usbd_error_strs[err];
} else {
- snprintf(buffer, sizeof buffer, "%d", err);
+ ksnprintf(buffer, sizeof buffer, "%d", err);
return buffer;
}
}
if (vendor != NULL && *vendor)
strcpy(v, vendor);
else
- sprintf(v, "vendor 0x%04x", UGETW(udd->idVendor));
+ ksprintf(v, "vendor 0x%04x", UGETW(udd->idVendor));
if (product != NULL && *product)
strcpy(p, product);
else
- sprintf(p, "product 0x%04x", UGETW(udd->idProduct));
+ ksprintf(p, "product 0x%04x", UGETW(udd->idProduct));
}
int
usbd_printBCD(char *cp, int bcd)
{
- return (sprintf(cp, "%x.%02x", bcd >> 8, bcd & 0xff));
+ return (ksprintf(cp, "%x.%02x", bcd >> 8, bcd & 0xff));
}
void
usb_interface_descriptor_t *id;
usbd_devinfo_vp(dev, vendor, product, 1);
- cp += sprintf(cp, "%s %s", vendor, product);
+ cp += ksprintf(cp, "%s %s", vendor, product);
if (showclass & USBD_SHOW_DEVICE_CLASS)
- cp += sprintf(cp, ", class %d/%d",
- udd->bDeviceClass, udd->bDeviceSubClass);
+ cp += ksprintf(cp, ", class %d/%d",
+ udd->bDeviceClass, udd->bDeviceSubClass);
bcdUSB = UGETW(udd->bcdUSB);
bcdDevice = UGETW(udd->bcdDevice);
- cp += sprintf(cp, ", rev ");
+ cp += ksprintf(cp, ", rev ");
cp += usbd_printBCD(cp, bcdUSB);
*cp++ = '/';
cp += usbd_printBCD(cp, bcdDevice);
- cp += sprintf(cp, ", addr %d", dev->address);
+ cp += ksprintf(cp, ", addr %d", dev->address);
if (showclass & USBD_SHOW_INTERFACE_CLASS)
{
/* fetch the interface handle for the first interface */
(void)usbd_device2interface_handle(dev, 0, &iface);
id = usbd_get_interface_descriptor(iface);
- cp += sprintf(cp, ", iclass %d/%d",
- id->bInterfaceClass, id->bInterfaceSubClass);
+ cp += ksprintf(cp, ", iclass %d/%d",
+ id->bInterfaceClass, id->bInterfaceSubClass);
}
*cp = 0;
}
* @(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed
* @(#)$Id: ip_fil.c,v 2.42.2.60 2002/08/28 12:40:39 darrenr Exp $
* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.25.2.7 2004/07/04 09:24:38 darrenr Exp $
- * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.24 2006/09/30 20:03:44 swildner Exp $
+ * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.25 2006/12/20 18:14:37 dillon Exp $
*/
#ifndef SOLARIS
#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
# include <stdlib.h>
# include <ctype.h>
# include <fcntl.h>
+#define ksprintf sprintf
#endif
#include <sys/errno.h>
#include <sys/types.h>
{
static char workbuf[64];
- sprintf(workbuf, "%s%d", ifp->if_name, ifp->if_unit);
+ ksprintf(workbuf, "%s%d", ifp->if_name, ifp->if_unit);
return workbuf;
}
# endif
# if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
(defined(OpenBSD) && (OpenBSD >= 199603)) || \
(defined(__DragonFly__))
- sprintf(fname, "%s", ifp->if_xname);
+ ksprintf(fname, "%s", ifp->if_xname);
# else
- sprintf(fname, "%s%d", ifp->if_name, ifp->if_unit);
+ ksprintf(fname, "%s%d", ifp->if_name, ifp->if_unit);
# endif
fd = open(fname, O_WRONLY|O_APPEND);
if (fd == -1) {
# else
static char fullifname[LIFNAMSIZ];
- sprintf(fullifname, "%s%d", ifp->if_name, ifp->if_unit);
+ ksprintf(fullifname, "%s%d", ifp->if_name, ifp->if_unit);
return fullifname;
# endif
}
# else
char fullname[LIFNAMSIZ];
- sprintf(fullname, "%s%d", ifp->if_name, ifp->if_unit);
+ ksprintf(fullname, "%s%d", ifp->if_name, ifp->if_unit);
if (!strcmp(ifname, fullname))
# endif
return ifp;
(defined(__DragonFly__))
for (ifa = ifneta; ifa && (ifp = *ifa); ifa++) {
ifp->if_output = write_output;
- sprintf(fname, "/tmp/%s", ifp->if_xname);
+ ksprintf(fname, "/tmp/%s", ifp->if_xname);
fd = open(fname, O_WRONLY|O_CREAT|O_EXCL|O_TRUNC, 0600);
if (fd == -1)
perror("open");
for (ifa = ifneta; ifa && (ifp = *ifa); ifa++) {
ifp->if_output = write_output;
- sprintf(fname, "/tmp/%s%d", ifp->if_name, ifp->if_unit);
+ ksprintf(fname, "/tmp/%s%d", ifp->if_name, ifp->if_unit);
fd = open(fname, O_WRONLY|O_CREAT|O_EXCL|O_TRUNC, 0600);
if (fd == -1)
perror("open");
* Simple FTP transparent proxy for in-kernel use. For use with the NAT
* code.
* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c,v 1.17.2.6 2004/07/04 09:24:39 darrenr Exp $
- * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c,v 1.5 2004/07/28 00:22:37 hmp Exp $
+ * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c,v 1.6 2006/12/20 18:14:37 dillon Exp $
*/
#if SOLARIS && defined(_KERNEL)
extern kmutex_t ipf_rw;
(void) snprintf(newbuf, sizeof(newbuf), "%s %u,%u,%u,%u,%u,%u\r\n",
"PORT", a1, a2, a3, a4, a5, a6);
#else
- (void) sprintf(newbuf, "%s %u,%u,%u,%u,%u,%u\r\n",
+ (void) ksprintf(newbuf, "%s %u,%u,%u,%u,%u,%u\r\n",
"PORT", a1, a2, a3, a4, a5, a6);
#endif
*
* @(#)$Id: ip_proxy.c,v 2.9.2.24 2002/08/28 12:45:51 darrenr Exp $
* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.11.2.5 2003/03/01 03:55:54 darrenr Exp $
- * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.7 2004/02/12 22:35:47 joerg Exp $
+ * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.8 2006/12/20 18:14:37 dillon Exp $
*/
#if (defined(__DragonFly__) || defined(__FreeBSD__)) && defined(KERNEL) && !defined(_KERNEL)
# define _KERNEL
extern KRWLOCK_T ipf_nat, ipf_state;
#endif
+#ifndef _KERNEL
+#define ksprintf sprintf
+#endif
+
static int appr_fixseqack (fr_info_t *, ip_t *, ap_session_t *, int );
/* $FreeBSD: src/sys/crypto/des/des_ecb.c,v 1.1.2.3 2002/03/26 10:12:24 ume Exp $ */
-/* $DragonFly: src/sys/crypto/des/des_ecb.c,v 1.3 2003/07/26 14:12:24 rob Exp $ */
+/* $DragonFly: src/sys/crypto/des/des_ecb.c,v 1.4 2006/12/20 18:14:37 dillon Exp $ */
/* $KAME: des_ecb.c,v 1.6 2001/09/10 04:03:58 itojun Exp $ */
/* crypto/des/ecb_enc.c */
size="int";
else
size="long";
- sprintf(buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,size);
+ ksprintf(buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,size);
init=0;
}
return(buf);
* rights to redistribute these changes.
*
* $FreeBSD: src/sys/ddb/db_sym.c,v 1.32 1999/08/28 00:41:10 peter Exp $
- * $DragonFly: src/sys/ddb/db_sym.c,v 1.5 2005/12/23 21:35:44 swildner Exp $
+ * $DragonFly: src/sys/ddb/db_sym.c,v 1.6 2006/12/20 18:14:37 dillon Exp $
*/
/*
static char tmp[256];
db_symbol_values(sym, &symname, 0);
- snprintf(tmp, sizeof(tmp), "%s:%s", symtabname, symname);
+ ksnprintf(tmp, sizeof(tmp), "%s:%s", symtabname, symname);
return tmp;
}
* 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.24 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi.c,v 1.25 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_acpi.h"
if (ACPI_FAILURE(acpi_Startup()))
return (ENXIO);
- snprintf(acpi_ca_version, sizeof(acpi_ca_version), "%#x", ACPI_CA_VERSION);
+ ksnprintf(acpi_ca_version, sizeof(acpi_ca_version), "%#x", ACPI_CA_VERSION);
/* Attach the actual ACPI device. */
if ((child = BUS_ADD_CHILD(parent, parent, 0, "acpi", 0)) == NULL) {
len += strlen(quirk->value) + 2;
if ((tmp = kmalloc(len, M_TEMP, M_NOWAIT)) == NULL)
goto out;
- sprintf(tmp, "%s %s", env ? env : "", quirk->value);
+ ksprintf(tmp, "%s %s", env ? env : "", quirk->value);
#ifdef notyet
setenv("debug.acpi.disabled", tmp);
#endif /* notyet */
struct acpi_device *dinfo = device_get_ivars(child);
if (dinfo->ad_handle)
- snprintf(buf, buflen, "path=%s", acpi_name(dinfo->ad_handle));
+ ksnprintf(buf, buflen, "path=%s", acpi_name(dinfo->ad_handle));
else
- snprintf(buf, buflen, "magic=unknown");
+ ksnprintf(buf, buflen, "magic=unknown");
return (0);
}
adinfo = (ACPI_DEVICE_INFO *) adbuf.Pointer;
if (error)
- snprintf(buf, buflen, "Unknown");
+ ksnprintf(buf, buflen, "Unknown");
else
- snprintf(buf, buflen, "_HID=%s _UID=%lu",
+ ksnprintf(buf, buflen, "_HID=%s _UID=%lu",
(adinfo->Valid & ACPI_VALID_HID) ?
adinfo->HardwareId.Value : "UNKNOWN",
(adinfo->Valid & ACPI_VALID_UID) ?
buf[0] = '\0';
for (state = ACPI_STATE_S1; state < ACPI_S_STATES_MAX + 1; state++) {
if (ACPI_SUCCESS(AcpiGetSleepTypeData(state, &TypeA, &TypeB))) {
- sprintf(sleep_state, "S%d ", state);
+ ksprintf(sleep_state, "S%d ", state);
strcat(buf, sleep_state);
}
}
status = AcpiNsHandleToPathname(h, &handle_buf);
if (ACPI_FAILURE(status))
return;
- snprintf(notify_buf, sizeof(notify_buf), "notify=0x%02x", notify);
+ ksnprintf(notify_buf, sizeof(notify_buf), "notify=0x%02x", notify);
#if 0
devctl_notify("ACPI", subsystem, handle_buf.Pointer, notify_buf);
#endif
* 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.15 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_cpu.c,v 1.16 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_acpi.h"
cx_count++;
}
if (cx_count > 0)
- snprintf(msg, sizeof(msg), "ACPI CPU (%d Cx states)", cx_count);
+ ksnprintf(msg, sizeof(msg), "ACPI CPU (%d Cx states)", cx_count);
else
strlcpy(msg, "ACPI CPU", sizeof(msg));
device_set_desc_copy(dev, msg);
int val, error, i;
sc = device_get_softc(cpu_devices[0]);
- snprintf(state, sizeof(state), "C%d", cpu_cx_lowest + 1);
+ ksnprintf(state, sizeof(state), "C%d", cpu_cx_lowest + 1);
error = sysctl_handle_string(oidp, state, sizeof(state), req);
if (error != 0 || req->newptr == NULL)
return (error);
* 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.9 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_ec.c,v 1.10 2006/12/20 18:14:38 dillon 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.9 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_ec.c,v 1.10 2006/12/20 18:14:38 dillon Exp $
*
*/
out:
if (ret == 0) {
- snprintf(desc, sizeof(desc), "Embedded Controller: GPE %#x%s%s",
+ ksnprintf(desc, sizeof(desc), "Embedded Controller: GPE %#x%s%s",
params->gpe_bit, (params->glk) ? ", GLK" : "",
DEV_ECDT(dev) ? ", ECDT" : "");
device_set_desc_copy(dev, desc);
goto re_enable;
/* Evaluate _Qxx to respond to the controller. */
- sprintf(qxx, "_Q%02x", Data);
+ ksprintf(qxx, "_Q%02x", Data);
strupr(qxx);
Status = AcpiEvaluateObject(sc->ec_handle, qxx, NULL, NULL);
if (ACPI_FAILURE(Status) && Status != AE_NOT_FOUND) {
* 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.5 2006/09/03 17:43:55 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_pci_link.c,v 1.6 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_acpi.h"
if (entry->busno != busno)
continue;
- snprintf(prthint, sizeof(prthint),
+ ksnprintf(prthint, sizeof(prthint),
"hw.acpi.pci.link.%d.%d.%d.irq", entry->busno,
(int)((entry->prt.Address & 0xffff0000) >> 16),
(int)entry->prt.Pin);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.47 2004/05/30 20:08:23 phk Exp $
- * $DragonFly: src/sys/dev/acpica5/acpi_thermal.c,v 1.5 2005/06/04 14:25:45 corecode Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_thermal.c,v 1.6 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_acpi.h"
&acpi_tz_polling_rate, 0, "monitor polling rate");
}
sysctl_ctx_init(&sc->tz_sysctl_ctx);
- sprintf(oidname, "tz%d", device_get_unit(dev));
+ ksprintf(oidname, "tz%d", device_get_unit(dev));
sc->tz_sysctl_tree = SYSCTL_ADD_NODE(&sc->tz_sysctl_ctx,
SYSCTL_CHILDREN(acpi_tz_sysctl_tree),
OID_AUTO, oidname, CTLFLAG_RD, 0, "");
/* Evaluate thermal zone parameters. */
for (i = 0; i < TZ_NUMLEVELS; i++) {
- sprintf(nbuf, "_AC%d", i);
+ ksprintf(nbuf, "_AC%d", i);
acpi_tz_getparam(sc, nbuf, &sc->tz_zone.ac[i]);
- sprintf(nbuf, "_AL%d", i);
+ ksprintf(nbuf, "_AL%d", i);
sc->tz_zone.al[i].Length = ACPI_ALLOCATE_BUFFER;
sc->tz_zone.al[i].Pointer = NULL;
AcpiEvaluateObject(sc->tz_handle, nbuf, NULL, &sc->tz_zone.al[i]);
* 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.9 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/acpica5/acpi_timer.c,v 1.10 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_acpi.h"
#include <sys/param.h>
acpi_cputimer.count = acpi_timer_get_timecount_safe;
}
- sprintf(desc, "%d-bit timer at 3.579545MHz",
+ ksprintf(desc, "%d-bit timer at 3.579545MHz",
AcpiGbl_FADT->TmrValExt ? 32 : 24);
device_set_desc_copy(dev, desc);
* notice must be reproduced on all copies.
*
* @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.10 1999/08/28 00:41:42 peter Exp $
- * @(#) $DragonFly: src/sys/dev/atm/hea/eni.c,v 1.8 2005/06/16 21:12:27 dillon Exp $
+ * @(#) $DragonFly: src/sys/dev/atm/hea/eni.c,v 1.9 2006/12/20 18:14:38 dillon Exp $
*/
/*
* Make a hw version number from the ID register values.
* Format: {Midway ID}.{Mother board ID}.{Daughter board ID}
*/
- snprintf ( eup->eu_config.ac_hard_vers,
+ ksnprintf ( eup->eu_config.ac_hard_vers,
sizeof ( eup->eu_config.ac_hard_vers ),
"%ld/%ld/%ld",
(val >> ID_SHIFT) & ID_MASK,
* notice must be reproduced on all copies.
*
* @(#) $FreeBSD: src/sys/dev/hea/eni_if.c,v 1.5 1999/08/28 00:41:44 peter Exp $
- * @(#) $DragonFly: src/sys/dev/atm/hea/eni_if.c,v 1.5 2003/08/27 10:35:15 rob Exp $
+ * @(#) $DragonFly: src/sys/dev/atm/hea/eni_if.c,v 1.6 2006/12/20 18:14:38 dillon Exp $
*/
/*
*/
if ( eup == NULL )
return ( ENXIO );
- snprintf ( ifname, sizeof(ifname),
+ ksnprintf ( ifname, sizeof(ifname),
"%s%d", pip->pif_name, pip->pif_unit );
/*
* notice must be reproduced on all copies.
*
* @(#) $FreeBSD: src/sys/dev/hfa/fore_command.c,v 1.6 1999/08/28 00:41:49 peter Exp $
- * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_command.c,v 1.4 2005/02/01 00:51:50 joerg Exp $
+ * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_command.c,v 1.5 2006/12/20 18:14:38 dillon Exp $
*/
/*
sizeof(struct mac_addr));
fup->fu_config.ac_macaddr =
fup->fu_pif.pif_macaddr;
- snprintf(fup->fu_config.ac_hard_vers,
+ ksnprintf(fup->fu_config.ac_hard_vers,
sizeof(fup->fu_config.ac_hard_vers),
"%ld.%ld.%ld",
(fp->pr_hwver >> 16) & 0xff,
* notice must be reproduced on all copies.
*
* @(#) $FreeBSD: src/sys/dev/hfa/fore_if.c,v 1.5 1999/08/28 00:41:49 peter Exp $
- * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_if.c,v 1.3 2003/08/07 21:16:49 dillon Exp $
+ * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_if.c,v 1.4 2006/12/20 18:14:38 dillon Exp $
*/
/*
fup = (Fore_unit *)pip;
if ( pip == NULL )
return ( ENXIO );
- snprintf ( ifname, sizeof(ifname),
+ ksnprintf ( ifname, sizeof(ifname),
"%s%d", pip->pif_name, pip->pif_unit );
/*
* notice must be reproduced on all copies.
*
* @(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.6 1999/08/29 10:28:09 bde Exp $
- * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_init.c,v 1.6 2005/02/01 00:51:50 joerg Exp $
+ * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_init.c,v 1.7 2006/12/20 18:14:38 dillon Exp $
*/
/*
errmsg = "unsupported microcode version";
goto failed;
}
- snprintf(fup->fu_config.ac_firm_vers,
+ ksnprintf(fup->fu_config.ac_firm_vers,
sizeof(fup->fu_config.ac_firm_vers), "%ld.%ld.%ld",
(vers >> 16) & 0xff, (vers >> 8) & 0xff, vers & 0xff);
* 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.9 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/advansys.c,v 1.10 2006/12/20 18:14:38 dillon Exp $
*/
/*
* Ported from:
{
static char name[10];
- snprintf(name, sizeof(name), "adv%d", adv->unit);
+ ksnprintf(name, sizeof(name), "adv%d", adv->unit);
return (name);
}
* 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.13 2006/10/25 20:55:52 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/adwcam.c,v 1.14 2006/12/20 18:14:38 dillon Exp $
*/
/*
* Ported from:
KKASSERT(adw->unit >= 0 && adw->unit < 100);
i = adw->unit / 10;
adw->name = kmalloc(sizeof("adw") + i + 1, M_DEVBUF, M_INTWAIT);
- sprintf(adw->name, "adw%d", adw->unit);
+ ksprintf(adw->name, "adw%d", adw->unit);
return(adw);
}
* 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.14 2006/10/25 20:55:53 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/aha/aha.c,v 1.15 2006/12/20 18:14:38 dillon Exp $
*/
#include <sys/param.h>
switch (aha->boardid) {
case BOARD_1540_16HEAD_BIOS:
- snprintf(aha->model, sizeof(aha->model), "1540 16 head BIOS");
+ ksnprintf(aha->model, sizeof(aha->model), "1540 16 head BIOS");
break;
case BOARD_1540_64HEAD_BIOS:
- snprintf(aha->model, sizeof(aha->model), "1540 64 head BIOS");
+ ksnprintf(aha->model, sizeof(aha->model), "1540 64 head BIOS");
break;
case BOARD_1542:
- snprintf(aha->model, sizeof(aha->model), "1540/1542 64 head BIOS");
+ ksnprintf(aha->model, sizeof(aha->model), "1540/1542 64 head BIOS");
break;
case BOARD_1640:
- snprintf(aha->model, sizeof(aha->model), "1640");
+ ksnprintf(aha->model, sizeof(aha->model), "1640");
break;
case BOARD_1740:
- snprintf(aha->model, sizeof(aha->model), "1740A/1742A/1744");
+ ksnprintf(aha->model, sizeof(aha->model), "1740A/1742A/1744");
break;
case BOARD_1542C:
- snprintf(aha->model, sizeof(aha->model), "1542C");
+ ksnprintf(aha->model, sizeof(aha->model), "1542C");
break;
case BOARD_1542CF:
- snprintf(aha->model, sizeof(aha->model), "1542CF");
+ ksnprintf(aha->model, sizeof(aha->model), "1542CF");
break;
case BOARD_1542CP:
- snprintf(aha->model, sizeof(aha->model), "1542CP");
+ ksnprintf(aha->model, sizeof(aha->model), "1542CP");
break;
default:
- snprintf(aha->model, sizeof(aha->model), "Unknown");
+ ksnprintf(aha->model, sizeof(aha->model), "Unknown");
break;
}
/*
* $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.10 2006/12/05 23:31:54 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx.c,v 1.11 2006/12/20 18:14:38 dillon Exp $
*/
#include "aic79xx_osm.h"
const char *type;
int len;
- len = sprintf(buf, "%s: ", ahd_chip_names[ahd->chip & AHD_CHIPID_MASK]);
+ len = ksprintf(buf, "%s: ",
+ ahd_chip_names[ahd->chip & AHD_CHIPID_MASK]);
buf += len;
speed = "Ultra320 ";
} else {
type = "Single ";
}
- len = sprintf(buf, "%s%sChannel %c, SCSI Id=%d, ",
- speed, type, ahd->channel, ahd->our_id);
+ len = ksprintf(buf, "%s%sChannel %c, SCSI Id=%d, ",
+ speed, type, ahd->channel, ahd->our_id);
buf += len;
- sprintf(buf, "%s, %d SCBs", ahd->bus_description,
- ahd->scb_data.maxhscbs);
+ ksprintf(buf, "%s, %d SCBs", ahd->bus_description,
+ ahd->scb_data.maxhscbs);
}
static const char *channel_strings[] = {
* $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#134 $
*
* $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.41.2.27 2003/06/10 03:26:08 gibbs Exp $
- * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx.c,v 1.9 2006/09/05 03:48:09 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx.c,v 1.10 2006/12/20 18:14:38 dillon Exp $
*/
#include "aic7xxx_osm.h"
{
int len;
- len = sprintf(buf, "%s: ", ahc_chip_names[ahc->chip & AHC_CHIPID_MASK]);
+ len = ksprintf(buf, "%s: ",
+ ahc_chip_names[ahc->chip & AHC_CHIPID_MASK]);
buf += len;
- if ((ahc->features & AHC_TWIN) != 0)
- len = sprintf(buf, "Twin Channel, A SCSI Id=%d, "
- "B SCSI Id=%d, primary %c, ",
- ahc->our_id, ahc->our_id_b,
- (ahc->flags & AHC_PRIMARY_CHANNEL) + 'A');
- else {
+ if ((ahc->features & AHC_TWIN) != 0) {
+ len = ksprintf(buf, "Twin Channel, A SCSI Id=%d, "
+ "B SCSI Id=%d, primary %c, ",
+ ahc->our_id, ahc->our_id_b,
+ (ahc->flags & AHC_PRIMARY_CHANNEL) + 'A');
+ } else {
const char *speed;
const char *type;
} else {
type = "Single";
}
- len = sprintf(buf, "%s%s Channel %c, SCSI Id=%d, ",
- speed, type, ahc->channel, ahc->our_id);
+ len = ksprintf(buf, "%s%s Channel %c, SCSI Id=%d, ",
+ speed, type, ahc->channel, ahc->our_id);
}
buf += len;
if ((ahc->flags & AHC_PAGESCBS) != 0)
- sprintf(buf, "%d/%d SCBs",
- ahc->scb_data->maxhscbs, AHC_MAX_QUEUE);
+ ksprintf(buf, "%d/%d SCBs",
+ ahc->scb_data->maxhscbs, AHC_MAX_QUEUE);
else
- sprintf(buf, "%d SCBs", ahc->scb_data->maxhscbs);
+ ksprintf(buf, "%d SCBs", ahc->scb_data->maxhscbs);
}
int
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.50.2.45 2003/03/12 14:47:12 sos Exp $
- * $DragonFly: src/sys/dev/disk/ata/ata-all.c,v 1.33 2006/12/18 20:41:01 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ata/ata-all.c,v 1.34 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_ata.h"
ata_set_name(struct ata_device *atadev, char *name, int lun)
{
atadev->name = kmalloc(strlen(name) + 4, M_ATA, M_INTWAIT);
- sprintf(atadev->name, "%s%d", name, lun);
+ ksprintf(atadev->name, "%s%d", name, lun);
}
void
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ata/atapi-all.c,v 1.46.2.18 2002/10/31 23:10:33 thomas Exp $
- * $DragonFly: src/sys/dev/disk/ata/atapi-all.c,v 1.18 2006/10/25 20:55:53 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ata/atapi-all.c,v 1.19 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_ata.h"
case 0xff: return ("POLL_DSC");
default: {
static char buffer[20];
- sprintf(buffer, "unknown CMD (0x%02x)", cmd);
+ ksprintf(buffer, "unknown CMD (0x%02x)", cmd);
return buffer;
}
}
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.48.2.20 2002/11/25 05:30:31 njl Exp $
- * $DragonFly: src/sys/dev/disk/ata/atapi-cd.c,v 1.26 2006/10/25 20:55:53 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/ata/atapi-cd.c,v 1.27 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_ata.h"
for (track = 1; track <= ntracks; track ++) {
char name[16];
- sprintf(name, "acd%dt%d", cdp->lun, track);
+ ksprintf(name, "acd%dt%d", cdp->lun, track);
entry = kmalloc(sizeof(struct acd_devlist), M_ACD, M_WAITOK | M_ZERO);
entry->dev = make_dev(&acd_ops, (cdp->lun << 3) | (track << 16),
0, 0, 0644, name, NULL);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.25.2.1 2000/08/02 22:32:26 peter Exp $
- * $DragonFly: src/sys/dev/disk/buslogic/bt.c,v 1.13 2006/10/25 20:55:53 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/buslogic/bt.c,v 1.14 2006/12/20 18:14:38 dillon Exp $
*/
/*
if (esetup_info.bus_type == 'A'
&& bt->firmware_ver[0] == '2') {
- snprintf(bt->model, sizeof(bt->model), "542B");
+ ksnprintf(bt->model, sizeof(bt->model), "542B");
} else if (esetup_info.bus_type == 'E'
&& (strncmp(bt->firmware_ver, "2.1", 3) == 0
|| strncmp(bt->firmware_ver, "2.20", 4) == 0)) {
- snprintf(bt->model, sizeof(bt->model), "742A");
+ ksnprintf(bt->model, sizeof(bt->model), "742A");
} else if (esetup_info.bus_type == 'E'
&& bt->firmware_ver[0] == '0') {
/* AMI FastDisk EISA Series 441 0.x */
- snprintf(bt->model, sizeof(bt->model), "747A");
+ ksnprintf(bt->model, sizeof(bt->model), "747A");
} else {
ha_model_data_t model_data;
int i;
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $FreeBSD: src/sys/isa/fd.c,v 1.176.2.8 2002/05/15 21:56:14 joerg Exp $
- * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.34 2006/10/25 20:55:53 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.35 2006/12/20 18:14:38 dillon Exp $
*
*/
if (out_fdc(fdc, __va_arg(ap, int)) < 0)
{
char msg[50];
- snprintf(msg, sizeof(msg),
+ ksnprintf(msg, sizeof(msg),
"cmd %x failed at out byte %d of %d\n",
cmd, n + 1, n_out);
return fdc_err(fdc, msg);
if (fd_in(fdc, ptr) < 0)
{
char msg[50];
- snprintf(msg, sizeof(msg),
+ ksnprintf(msg, sizeof(msg),
"cmd %02x failed at in byte %d of %d\n",
cmd, n + 1, n_in);
return fdc_err(fdc, msg);
/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.26.2.17 2002/10/11 17:35:11 mjacob Exp $ */
-/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.h,v 1.7 2006/10/25 20:55:53 dillon Exp $ */
+/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.h,v 1.8 2006/12/20 18:14:38 dillon Exp $ */
/*
* Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
* Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob
#define MEMZERO bzero
#define MEMCPY(dst, src, amt) bcopy((src), (dst), (amt))
-#define SNPRINTF snprintf
+#define SNPRINTF ksnprintf
#define USEC_DELAY DELAY
#define USEC_SLEEP(isp, x) \
if (isp->isp_osinfo.intsok) \
/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.25.2.17 2002/10/11 18:51:49 mjacob Exp $ */
-/* $DragonFly: src/sys/dev/disk/isp/ispvar.h,v 1.4 2004/02/13 01:04:15 joerg Exp $ */
+/* $DragonFly: src/sys/dev/disk/isp/ispvar.h,v 1.5 2006/12/20 18:14:38 dillon Exp $ */
/*
* Soft Definitions for for Qlogic ISP SCSI adapters.
*
*
* MEMZERO(dst, src) platform zeroing function
* MEMCPY(dst, src, count) platform copying function
- * SNPRINTF(buf, bufsize, fmt, ...) snprintf
+ * SNPRINTF(buf, bufsize, fmt, ...) ksnprintf
* USEC_DELAY(usecs) microsecond spindelay function
* USEC_SLEEP(isp, usecs) microsecond sleep function
*
/* $FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.2.2.1 2002/08/23 06:59:05 mjacob Exp $ */
-/* $DragonFly: src/sys/dev/disk/mpt/mpt_debug.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */
+/* $DragonFly: src/sys/dev/disk/mpt/mpt_debug.c,v 1.4 2006/12/20 18:14:38 dillon Exp $ */
/*
* Debug routines for LSI '909 FC adapters.
* FreeBSD Version.
return status->Error_String;
status++;
}
- snprintf(buf, sizeof buf, "Unknown (0x%08x)", code);
+ ksnprintf(buf, sizeof buf, "Unknown (0x%08x)", code);
return buf;
}
char *ptr = buf;
char *end = &buf[128];
buf[0] = '\0';
- ptr += snprintf(buf, sizeof buf, "(0x%08x)", code);
+ ptr += ksnprintf(buf, sizeof buf, "(0x%08x)", code);
while (status->Error_Code >= 0) {
if ((status->Error_Code & code) != 0)
- ptr += snprintf(ptr, (size_t)(end-ptr), "%s ",
+ ptr += ksnprintf(ptr, (size_t)(end-ptr), "%s ",
status->Error_String);
status++;
}
return status->Error_String;
status++;
}
- snprintf(buf, sizeof buf, "Unknown (0x%08x)", code);
+ ksnprintf(buf, sizeof buf, "Unknown (0x%08x)", code);
return buf;
}
static char *
return status->Error_String;
status++;
}
- snprintf(buf, sizeof buf, "Unknown (0x%08x)", code);
+ ksnprintf(buf, sizeof buf, "Unknown (0x%08x)", code);
return buf;
}
static char *
char *ptr = buf;
char *end = &buf[128];
buf[0] = '\0';
- ptr += snprintf(buf, sizeof buf, "(0x%08x)", code);
+ ptr += ksnprintf(buf, sizeof buf, "(0x%08x)", code);
while (status->Error_Code >= 0) {
if ((status->Error_Code & code) != 0)
- ptr += snprintf(ptr, (size_t)(end-ptr), "%s ",
+ ptr += ksnprintf(ptr, (size_t)(end-ptr), "%s ",
status->Error_String);
status++;
}
return status->Error_String;
status++;
}
- snprintf(buf, sizeof buf, "Unknown (0x%08x)", code);
+ ksnprintf(buf, sizeof buf, "Unknown (0x%08x)", code);
return buf;
}
static char *
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.273 2006/05/12 05:04:40 jhb Exp $
- * $DragonFly: src/sys/dev/disk/nata/ata-all.c,v 1.4 2006/12/17 19:28:28 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/nata/ata-all.c,v 1.5 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_ata.h"
(atacap->hwres & ATA_CABLE_ID) ? "80":"40");
if (init) {
- sprintf(buffer, "%.40s/%.8s", atacap->model, atacap->revision);
+ ksprintf(buffer, "%.40s/%.8s", atacap->model, atacap->revision);
device_set_desc_copy(atadev->dev, buffer);
if (atadev->param.config & ATA_PROTO_ATAPI) {
if (atapi_dma && ch->dma &&
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.166 2006/07/24 10:44:50 sos Exp $
- * $DragonFly: src/sys/dev/disk/nata/ata-chipset.c,v 1.1 2006/12/04 14:40:37 tgen Exp $
+ * $DragonFly: src/sys/dev/disk/nata/ata-chipset.c,v 1.2 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_ata.h"
if (!(idx = ata_match_chip(dev, ids)))
return ENXIO;
- sprintf(buffer, "Acard %s %s controller",
+ ksprintf(buffer, "Acard %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
if (!(idx = ata_match_chip(dev, ids)))
return ENXIO;
- sprintf(buffer, "AcerLabs %s %s controller",
+ ksprintf(buffer, "AcerLabs %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
if (!(idx = ata_match_chip(dev, ids)))
return ENXIO;
- sprintf(buffer, "AMD %s %s controller",
+ ksprintf(buffer, "AMD %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
if (!(idx = ata_match_chip(dev, ids)))
return ENXIO;
- sprintf(buffer, "ATI %s %s controller",
+ ksprintf(buffer, "ATI %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
if (pci_get_function(dev) == 1)
strcat(buffer, " (channel 2+3)");
}
- sprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma));
+ ksprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
ctlr->chipinit = ata_highpoint_chipinit;
if (!(idx = ata_match_chip(dev, ids)))
return ENXIO;
- sprintf(buffer, "Intel %s %s controller",
+ ksprintf(buffer, "Intel %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
if (!(idx = ata_match_chip(dev, ids)))
return ENXIO;
- sprintf(buffer, "ITE %s %s controller",
+ ksprintf(buffer, "ITE %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
if (!(idx = ata_match_chip(dev, ids)))
return ENXIO;
- sprintf(buffer, "JMicron %s %s controller",
+ ksprintf(buffer, "JMicron %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
if (!(idx = ata_match_chip(dev, ids)))
return ENXIO;
- sprintf(buffer, "Marvell %s %s controller",
+ ksprintf(buffer, "Marvell %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
if (!(idx = ata_match_chip(dev, ids)))
return ENXIO;
- sprintf(buffer, "nVidia %s %s controller",
+ ksprintf(buffer, "nVidia %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
start = end = 0;
}
}
- sprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma));
+ ksprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
ctlr->chipinit = ata_promise_chipinit;
if (!(idx = ata_match_chip(dev, ids)))
return ENXIO;
- sprintf(buffer, "ServerWorks %s %s controller",
+ ksprintf(buffer, "ServerWorks %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
if (!(idx = ata_match_chip(dev, ids)))
return ENXIO;
- sprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma));
+ ksprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
ctlr->chipinit = ata_sii_chipinit;
found = 1;
idx->cfg1 = SIS133NEW;
idx->max_dma = ATA_UDMA6;
- sprintf(buffer, "SiS 962/963 %s controller",
+ ksprintf(buffer, "SiS 962/963 %s controller",
ata_mode2str(idx->max_dma));
}
pci_write_config(dev, 0x57, reg57, 1);
idx->cfg1 = SIS100NEW;
idx->max_dma = ATA_UDMA5;
}
- sprintf(buffer, "SiS 961 %s controller",ata_mode2str(idx->max_dma));
+ ksprintf(buffer, "SiS 961 %s controller",ata_mode2str(idx->max_dma));
}
pci_write_config(dev, 0x4a, reg4a, 1);
}
if (!found)
- sprintf(buffer,"SiS %s %s controller",
+ ksprintf(buffer,"SiS %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
return ENXIO;
}
- sprintf(buffer, "VIA %s %s controller",
+ ksprintf(buffer, "VIA %s %s controller",
idx->text, ata_mode2str(idx->max_dma));
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.117 2006/05/12 05:04:40 jhb Exp $
- * $DragonFly: src/sys/dev/disk/nata/ata-pci.c,v 1.1 2006/12/04 14:40:37 tgen Exp $
+ * $DragonFly: src/sys/dev/disk/nata/ata-pci.c,v 1.2 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_ata.h"
}
kfree(children, M_TEMP);
- sprintf(buffer, "ATA channel %d", ch->unit);
+ ksprintf(buffer, "ATA channel %d", ch->unit);
device_set_desc_copy(dev, buffer);
return ata_probe(dev);
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.65 2006/07/21 19:13:05 imp Exp $
- * $DragonFly: src/sys/dev/disk/nata/ata-queue.c,v 1.2 2006/12/10 23:36:13 tgen Exp $
+ * $DragonFly: src/sys/dev/disk/nata/ata-queue.c,v 1.3 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_ata.h"
case 0xaa: return ("SETFEATURES ENABLE RCACHE");
case 0x55: return ("SETFEATURES DISABLE RCACHE");
}
- sprintf(buffer, "SETFEATURES 0x%02x", request->u.ata.feature);
+ ksprintf(buffer, "SETFEATURES 0x%02x", request->u.ata.feature);
return buffer;
}
}
- sprintf(buffer, "unknown CMD (0x%02x)", request->u.ata.command);
+ ksprintf(buffer, "unknown CMD (0x%02x)", request->u.ata.command);
return buffer;
}
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.120 2006/04/15 10:27:41 maxim Exp $
- * $DragonFly: src/sys/dev/disk/nata/ata-raid.c,v 1.1 2006/12/04 14:40:37 tgen Exp $
+ * $DragonFly: src/sys/dev/disk/nata/ata-raid.c,v 1.2 2006/12/20 18:14:38 dillon Exp $
*/
#include <sys/cdefs.h>
rdp->type == AR_T_RAID5) {
rdp->total_sectors = (rdp->total_sectors/(rdp->interleave*rdp->width))*
(rdp->interleave * rdp->width);
- sprintf(buffer, " (stripe %d KB)",
+ ksprintf(buffer, " (stripe %d KB)",
(rdp->interleave * DEV_BSIZE) / 1024);
}
else
switch (type) {
case ADP_T_RAID0: return "RAID0";
case ADP_T_RAID1: return "RAID1";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
case HPTV2_T_RAID_5: return "RAID5";
case HPTV2_T_JBOD: return "JBOD";
case HPTV2_T_RAID01_RAID1: return "RAID01_RAID1";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
case HPTV3_T_RAID1: return "RAID1";
case HPTV3_T_RAID3: return "RAID3";
case HPTV3_T_RAID5: return "RAID5";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
case INTEL_T_RAID0: return "RAID0";
case INTEL_T_RAID1: return "RAID1";
case INTEL_T_RAID5: return "RAID5";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
case ITE_T_RAID1: return "RAID1";
case ITE_T_RAID01: return "RAID0+1";
case ITE_T_SPAN: return "SPAN";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
case JM_T_RAID01: return "RAID0+1";
case JM_T_JBOD: return "JBOD";
case JM_T_RAID5: return "RAID5";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
case LSIV2_T_RAID0: return "RAID0";
case LSIV2_T_RAID1: return "RAID1";
case LSIV2_T_SPARE: return "SPARE";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
switch (type) {
case LSIV3_T_RAID0: return "RAID0";
case LSIV3_T_RAID1: return "RAID1";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
case NV_T_RAID3: return "RAID3";
case NV_T_RAID5: return "RAID5";
case NV_T_RAID01: return "RAID0+1";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
case PR_T_RAID3: return "RAID3";
case PR_T_RAID5: return "RAID5";
case PR_T_SPAN: return "SPAN";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
case SII_T_RAID1: return "RAID1";
case SII_T_RAID01: return "RAID0+1";
case SII_T_SPARE: return "SPARE";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
case SIS_T_JBOD: return "JBOD";
case SIS_T_RAID0: return "RAID0";
case SIS_T_RAID1: return "RAID1";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
case VIA_T_RAID5: return "RAID5";
case VIA_T_RAID01: return "RAID0+1";
case VIA_T_SPAN: return "SPAN";
- default: sprintf(buffer, "UNKNOWN 0x%02x", type);
+ default: ksprintf(buffer, "UNKNOWN 0x%02x", type);
return buffer;
}
}
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.4 2006/03/31 08:09:05 sos Exp $
- * $DragonFly: src/sys/dev/disk/nata/ata-usb.c,v 1.2 2006/12/06 20:20:51 tgen Exp $
+ * $DragonFly: src/sys/dev/disk/nata/ata-usb.c,v 1.3 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_ata.h"
}
kfree(children, M_TEMP);
- sprintf(buffer, "USB lun %d", ch->unit);
+ ksprintf(buffer, "USB lun %d", ch->unit);
device_set_desc_copy(dev, buffer);
return 0;
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.189 2006/06/28 15:04:10 sos Exp $
- * $DragonFly: src/sys/dev/disk/nata/atapi-cd.c,v 1.1 2006/12/04 14:40:37 tgen Exp $
+ * $DragonFly: src/sys/dev/disk/nata/atapi-cd.c,v 1.2 2006/12/20 18:14:38 dillon Exp $
*/
#include "opt_ata.h"
struct acd_tracknode *tracknode;
char name[16];
- sprintf(name, "acd%dt%d", device_get_unit(dev), track);
+ ksprintf(name, "acd%dt%d", device_get_unit(dev), track);
tracknode = kmalloc(sizeof(struct acd_tracknode), M_ACD, M_WAITOK | M_ZERO);
tracknode->cdev = make_dev(&acd_ops, (device_get_unit(dev) << 3) |
(track << 16), UID_ROOT, GID_OPERATOR, 0644,
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.109 2006/03/30 05:29:57 marcel Exp $
- * $DragonFly: src/sys/dev/disk/nata/atapi-fd.c,v 1.1 2006/12/04 14:40:37 tgen Exp $
+ * $DragonFly: src/sys/dev/disk/nata/atapi-fd.c,v 1.2 2006/12/20 18:14:38 dillon Exp $
*/
#include <sys/param.h>
char sizestring[16];
if (fdp->mediasize > 1048576 * 5)
- sprintf(sizestring, "%lluMB", (unsigned long long)
+ ksprintf(sizestring, "%lluMB", (unsigned long long)
(fdp->mediasize / 1048576));
else if (fdp->mediasize)
- sprintf(sizestring, "%lluKB", (unsigned long long)
+ ksprintf(sizestring, "%lluKB", (unsigned long long)
(fdp->mediasize / 1024));
else
strcpy(sizestring, "(no media)");
/**************************************************************************
**
** $FreeBSD: src/sys/pci/ncr.c,v 1.155.2.3 2001/03/05 13:09:10 obrien Exp $
-** $DragonFly: src/sys/dev/disk/ncr/ncr.c,v 1.15 2006/10/25 20:55:53 dillon Exp $
+** $DragonFly: src/sys/dev/disk/ncr/ncr.c,v 1.16 2006/12/20 18:14:39 dillon Exp $
**
** Device driver for the NCR 53C8XX PCI-SCSI-Controller Family.
**
static char *ncr_name (ncb_p np)
{
static char name[10];
- snprintf(name, sizeof(name), "ncr%d", np->unit);
+ ksnprintf(name, sizeof(name), "ncr%d", np->unit);
return (name);
}
* POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.74 2004/01/08 14:58:09 simokawa Exp $
- * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.20 2006/10/25 20:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.21 2006/12/20 18:14:39 dillon Exp $
*
*/
/* get firmware revision */
reg = crom_search_key(cc, CSRKEY_FIRM_VER);
if (reg != NULL)
- snprintf(sdev->revision, sizeof(sdev->revision),
+ ksnprintf(sdev->revision, sizeof(sdev->revision),
"%06x", reg->val);
/* get product string */
crom_search_key(cc, CSRKEY_MODEL);
*/
/* $FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.6.2.12 2001/12/02 19:01:10 groudier Exp $ */
-/* $DragonFly: src/sys/dev/disk/sym/sym_hipd.c,v 1.18 2006/10/25 20:55:54 dillon Exp $ */
+/* $DragonFly: src/sys/dev/disk/sym/sym_hipd.c,v 1.19 2006/12/20 18:14:39 dillon Exp $ */
#define SYM_DRIVER_NAME "sym-1.6.5-20000902"
/*
* Edit its name.
*/
- snprintf(np->inst_name, sizeof(np->inst_name), "sym%d", np->unit);
+ ksnprintf(np->inst_name, sizeof(np->inst_name), "sym%d", np->unit);
/*
* Initialyze the CCB free and busy queues.
/*
* $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.10.2.1 2003/04/26 07:05:28 anholt Exp $
- * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.21 2006/10/25 20:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.22 2006/12/20 18:14:39 dillon Exp $
*/
#include <sys/param.h>
#include <sys/queue.h>
#endif
#define DRM_SYSCTL_PRINT(fmt, arg...) \
- snprintf(buf, sizeof(buf), fmt, ##arg); \
+ ksnprintf(buf, sizeof(buf), fmt, ##arg); \
error = SYSCTL_OUT(req, buf, strlen(buf)); \
if (error) return error;
#define DRM_SYSCTL_PRINT_RET(ret, fmt, arg...) \
- snprintf(buf, sizeof(buf), fmt, ##arg); \
+ ksnprintf(buf, sizeof(buf), fmt, ##arg); \
error = SYSCTL_OUT(req, buf, strlen(buf)); \
if (error) { ret; return error; }
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.4 2004/10/24 12:41:04 simokawa Exp $
- * $DragonFly: src/sys/dev/misc/dcons/dcons_os.c,v 1.7 2006/10/25 20:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/dcons/dcons_os.c,v 1.8 2006/12/20 18:14:39 dillon Exp $
*/
#include <sys/param.h>
cp->cn_dev = make_dev(&dcons_ops, DCONS_CON,
UID_ROOT, GID_WHEEL, 0600, "dcons");
#elif __FreeBSD_version >= 501109
- sprintf(cp->cn_name, "dcons");
+ ksprintf(cp->cn_name, "dcons");
#else
cp->cn_dev = makedev(CDEV_MAJOR, DCONS_CON);
#endif
#if CONS_NODEV
gdbconsdev.cn_arg = (void *)&sc[DCONS_GDB];
#if __FreeBSD_version >= 501109
- sprintf(gdbconsdev.cn_name, "dgdb");
+ ksprintf(gdbconsdev.cn_name, "dgdb");
#endif
gdb_arg = &gdbconsdev;
#elif defined(__DragonFly__)
* ----------------------------------------------------------------------------
*
* $FreeBSD: src/sys/dev/musycc/musycc.c,v 1.17.2.3 2001/03/13 22:05:36 phk Exp $
- * $DragonFly: src/sys/dev/misc/musycc/musycc.c,v 1.8 2006/10/25 20:55:54 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/musycc/musycc.c,v 1.9 2006/12/20 18:14:39 dillon Exp $
*
*
*
scp = sc->chan[i];
if (scp == NULL)
continue;
- sprintf(s + strlen(s), "c%2d:", i);
- sprintf(s + strlen(s), " ts %08x", scp->ts);
- sprintf(s + strlen(s), " RX %lus/%lus",
+ ksprintf(s + strlen(s), "c%2d:", i);
+ ksprintf(s + strlen(s), " ts %08x", scp->ts);
+ ksprintf(s + strlen(s), " RX %lus/%lus",
time_second - scp->last_recv, time_second - scp->last_rxerr);
- sprintf(s + strlen(s), " TX %lus/%lus/%lus",
+ ksprintf(s + strlen(s), " TX %lus/%lus/%lus",
time_second - scp->last_xmit,
time_second - scp->last_txerr,
time_second - scp->last_txdrop);
- sprintf(s + strlen(s), " TXdrop %lu Pend %lu",
+ ksprintf(s + strlen(s), " TXdrop %lu Pend %lu",
scp->tx_drop,
scp->tx_pending);
- sprintf(s + strlen(s), " CRC %lu Dribble %lu Long %lu Short %lu Abort %lu",
+ ksprintf(s + strlen(s), " CRC %lu Dribble %lu Long %lu Short %lu Abort %lu",
scp->crc_error,
scp->dribble_error,
scp->long_error,
scp->short_error,
scp->abort_error);
- sprintf(s + strlen(s), "\n TX: %lu RX: %lu\n",
+ ksprintf(s + strlen(s), "\n TX: %lu RX: %lu\n",
scp->txn, scp->rxn);
}
}
u_int32_t *p = sc->ds8370;
s += strlen(s);
- sprintf(s, "Framer: "); s += strlen(s);
+ ksprintf(s, "Framer: "); s += strlen(s);
switch (sc->framing) {
- case WHOKNOWS: sprintf(s, "(unconfigured)\n"); break;
- case E1: sprintf(s, "(e1)\n"); break;
- case E1U: sprintf(s, "(e1u)\n"); break;
- case T1: sprintf(s, "(t1)\n"); break;
- case T1U: sprintf(s, "(t1u)\n"); break;
- default: sprintf(s, "(mode %d XXX?)\n", sc->framing); break;
+ case WHOKNOWS: ksprintf(s, "(unconfigured)\n"); break;
+ case E1: ksprintf(s, "(e1)\n"); break;
+ case E1U: ksprintf(s, "(e1u)\n"); break;
+ case T1: ksprintf(s, "(t1)\n"); break;
+ case T1U: ksprintf(s, "(t1u)\n"); break;
+ default: ksprintf(s, "(mode %d XXX?)\n", sc->framing); break;
}
s += strlen(s);
- sprintf(s, " Red alarms:"); s += strlen(s);
- if (p[0x47] & 0x08) { sprintf(s, " ALOS"); s += strlen(s); }
- if (p[0x47] & 0x04) { sprintf(s, " LOS"); s += strlen(s); }
+ ksprintf(s, " Red alarms:"); s += strlen(s);
+ if (p[0x47] & 0x08) { ksprintf(s, " ALOS"); s += strlen(s); }
+ if (p[0x47] & 0x04) { ksprintf(s, " LOS"); s += strlen(s); }
if (sc->framing == E1 || sc->framing == T1) {
- if (p[0x47] & 0x02) { sprintf(s, " LOF"); s += strlen(s); }
+ if (p[0x47] & 0x02) { ksprintf(s, " LOF"); s += strlen(s); }
}
- sprintf(s, "\n Yellow alarms:"); s += strlen(s);
- if (p[0x47] & 0x80) { sprintf(s, " RMYEL"); s += strlen(s); }
- if (p[0x47] & 0x40) { sprintf(s, " RYEL"); s += strlen(s); }
- sprintf(s, "\n Blue alarms:"); s += strlen(s);
- if (p[0x47] & 0x10) { sprintf(s, " AIS"); s += strlen(s); }
- sprintf(s, "\n"); s += strlen(s);
- sprintf(s, "\n Various alarms:"); s += strlen(s);
- if (p[0x48] & 0x10) { sprintf(s, " TSHORT"); s += strlen(s); }
- sprintf(s, "\n Counters:"); s += strlen(s);
+ ksprintf(s, "\n Yellow alarms:"); s += strlen(s);
+ if (p[0x47] & 0x80) { ksprintf(s, " RMYEL"); s += strlen(s); }
+ if (p[0x47] & 0x40) { ksprintf(s, " RYEL"); s += strlen(s); }
+ ksprintf(s, "\n Blue alarms:"); s += strlen(s);
+ if (p[0x47] & 0x10) { ksprintf(s, " AIS"); s += strlen(s); }
+ ksprintf(s, "\n"); s += strlen(s);
+ ksprintf(s, "\n Various alarms:"); s += strlen(s);
+ if (p[0x48] & 0x10) { ksprintf(s, " TSHORT"); s += strlen(s); }
+ ksprintf(s, "\n Counters:"); s += strlen(s);
if (sc->framing == E1) {
- sprintf(s, " FERR=%lu", sc->cnt_ferr); s += strlen(s);
+ ksprintf(s, " FERR=%lu", sc->cnt_ferr); s += strlen(s);
}
- sprintf(s, " CERR=%lu", sc->cnt_cerr); s += strlen(s);
- sprintf(s, " LCV=%lu", sc->cnt_lcv); s += strlen(s);
- sprintf(s, " FEBE=%lu", sc->cnt_febe); s += strlen(s);
- sprintf(s, " BERR=%lu", sc->cnt_berr); s += strlen(s);
- sprintf(s, " FRED=%lu", sc->cnt_fred); s += strlen(s);
- sprintf(s, " COFA=%lu", sc->cnt_cofa); s += strlen(s);
- sprintf(s, " SEF=%lu", sc->cnt_sef); s += strlen(s);
- sprintf(s, "\n"); s += strlen(s);
+ ksprintf(s, " CERR=%lu", sc->cnt_cerr); s += strlen(s);
+ ksprintf(s, " LCV=%lu", sc->cnt_lcv); s += strlen(s);
+ ksprintf(s, " FEBE=%lu", sc->cnt_febe); s += strlen(s);
+ ksprintf(s, " BERR=%lu", sc->cnt_berr); s += strlen(s);
+ ksprintf(s, " FRED=%lu", sc->cnt_fred); s += strlen(s);
+ ksprintf(s, " COFA=%lu", sc->cnt_cofa); s += strlen(s);
+ ksprintf(s, " SEF=%lu", sc->cnt_sef); s += strlen(s);
+ ksprintf(s, "\n"); s += strlen(s);
}
static void
s += strlen(s);
for (i = 0; i < 0x100; i += 16) {
- sprintf(s, "%03x: ", i + offset);
+ ksprintf(s, "%03x: ", i + offset);
s += strlen(s);
for (j = 0; j < 0x10; j ++) {
- sprintf(s, " %02x", p[i + j + offset] & 0xff);
+ ksprintf(s, " %02x", p[i + j + offset] & 0xff);
s += strlen(s);
}
- sprintf(s, "\n");
+ ksprintf(s, "\n");
s += strlen(s);
}
}
if (wframing == sc->framing)
return;
if (sc->nhooks > 0) {
- sprintf(ret, "Cannot change line when %d hooks open\n", sc->nhooks);
+ ksprintf(ret, "Cannot change line when %d hooks open\n", sc->nhooks);
return;
}
sc->framing = wframing;
sch->sc = sc;
sch->state = DOWN;
sch->chan = chan;
- sprintf(sch->hookname, name); /* XXX overflow ? */
+ ksprintf(sch->hookname, name); /* XXX overflow ? */
sc->chan[chan] = sch;
} else if (sc->chan[chan]->state == UP) {
return (EBUSY);
continue;
}
sc->node->private = sc;
- sprintf(sc->nodename, "sync-%d-%d-%d",
+ ksprintf(sc->nodename, "sync-%d-%d-%d",
csc->bus,
csc->slot,
i);
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/modules/syscons/daemon/daemon_saver.c,v 1.18.2.2 2001/05/06 05:44:29 nyan Exp $
- * $DragonFly: src/sys/dev/misc/syscons/daemon/Attic/daemon_saver.c,v 1.6 2006/09/05 00:55:38 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/daemon/Attic/daemon_saver.c,v 1.7 2006/12/20 18:14:39 dillon Exp $
*/
#include <sys/param.h>
messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 +
strlen(osrelease);
message = kmalloc(messagelen + 1, M_SYSCONS, M_WAITOK);
- sprintf(message, "%s - %s %s", hostname, ostype, osrelease);
+ ksprintf(message, "%s - %s %s", hostname, ostype, osrelease);
blanked = 0;
return 0;
}
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/modules/syscons/daemon/daemon_saver.c,v 1.18.2.2 2001/05/06 05:44:29 nyan Exp $
- * $DragonFly: src/sys/dev/misc/syscons/fred/fred_saver.c,v 1.6 2006/09/05 00:55:38 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/fred/fred_saver.c,v 1.7 2006/12/20 18:14:39 dillon Exp $
*/
#include <sys/param.h>
messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 +
strlen(osrelease);
message = kmalloc(messagelen + 1, M_SYSCONS, M_WAITOK);
- sprintf(message, "%s - %s %s", hostname, ostype, osrelease);
+ ksprintf(message, "%s - %s %s", hostname, ostype, osrelease);
blanked = 0;
return 0;
}
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/modules/syscons/snake/snake_saver.c,v 1.26.2.2 2001/05/06 05:44:29 nyan Exp $
- * $DragonFly: src/sys/dev/misc/syscons/snake/snake_saver.c,v 1.7 2006/09/05 00:55:39 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/snake/snake_saver.c,v 1.8 2006/12/20 18:14:39 dillon Exp $
*/
#include <sys/param.h>
{
messagelen = strlen(ostype) + 1 + strlen(osrelease);
message = kmalloc(messagelen + 1, M_SYSCONS, M_WAITOK);
- sprintf(message, "%s %s", ostype, osrelease);
+ ksprintf(message, "%s %s", ostype, osrelease);
messagep = kmalloc(messagelen * sizeof *messagep, M_SYSCONS, M_WAITOK);
return 0;
}
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.39 2006/10/25 20:55:55 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.40 2006/12/20 18:14:39 dillon Exp $
*/
/*
strcpy(an_conf, "dump");
break;
default:
- snprintf(an_conf, 5, "%x", an_dump);
+ ksnprintf(an_conf, 5, "%x", an_dump);
break;
}
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ar/if_ar.c,v 1.66 2005/01/06 01:42:28 imp Exp $
- * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.19 2006/10/25 20:55:55 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.20 2006/12/20 18:14:39 dillon Exp $
*/
/*
if (ngar_done_init == 0) ngar_init(NULL);
if (ng_make_node_common(&typestruct, &sc->node) != 0)
return (1);
- sprintf(sc->nodename, "%s%d", NG_AR_NODE_TYPE, sc->unit);
+ ksprintf(sc->nodename, "%s%d", NG_AR_NODE_TYPE, sc->unit);
if (ng_name_node(sc->node, sc->nodename)) {
NG_NODE_UNREF(sc->node); /* drop it again */
return (1);
break;
}
arg = (resp)->data;
- pos = sprintf(arg, "%ld bytes in, %ld bytes out\n"
+ pos = ksprintf(arg, "%ld bytes in, %ld bytes out\n"
"highest rate seen: %ld B/S in, %ld B/S out\n",
sc->inbytes, sc->outbytes,
sc->inrate, sc->outrate);
- pos += sprintf(arg + pos,
+ pos += ksprintf(arg + pos,
"%ld output errors\n",
sc->oerrors);
- pos += sprintf(arg + pos,
+ pos += ksprintf(arg + pos,
"ierrors = %ld, %ld, %ld, %ld\n",
sc->ierrors[0],
sc->ierrors[1],
/* stolen from the attach routine */
if (ng_make_node_common(&typestruct, &sc->node) != 0)
return (0);
- sprintf(sc->nodename, "%s%d", NG_AR_NODE_TYPE, sc->unit);
+ ksprintf(sc->nodename, "%s%d", NG_AR_NODE_TYPE, sc->unit);
if (ng_name_node(sc->node, sc->nodename)) {
sc->node = NULL;
printf("node naming failed\n");
-# $DragonFly: src/sys/dev/netif/ath/hal/Attic/ah_osdep.c.patch,v 1.1 2006/07/13 09:15:22 sephe Exp $
+# $DragonFly: src/sys/dev/netif/ath/hal/Attic/ah_osdep.c.patch,v 1.2 2006/12/20 18:14:39 dillon Exp $
--- ah_osdep.c 2006-04-22 17:06:43.000000000 +0800
+++ ah_osdep.c 2006-04-22 22:31:56.000000000 +0800
@@ -110,7 +110,7 @@ ath_hal_free(void* p)
- return ether_sprintf(mac);
+ static char etherbuf[18];
+
-+ snprintf(etherbuf, sizeof(etherbuf), "%6D", mac, ":");
++ ksnprintf(etherbuf, sizeof(etherbuf), "%6D", mac, ":");
+ return etherbuf;
}
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.29 2003/12/01 21:06:59 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.58 2006/11/26 07:30:06 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.59 2006/12/20 18:14:39 dillon Exp $
*
*/
device_set_desc(dev, sc->bge_vpd_prodname);
#endif
descbuf = kmalloc(BGE_DEVDESC_MAX, M_TEMP, M_WAITOK);
- snprintf(descbuf, BGE_DEVDESC_MAX, "%s, ASIC rev. %#04x", t->bge_name,
+ ksnprintf(descbuf, BGE_DEVDESC_MAX, "%s, ASIC rev. %#04x", t->bge_name,
pci_read_config(dev, BGE_PCI_MISC_CTL, 4) >> 16);
device_set_desc_copy(dev, descbuf);
if (pci_get_subvendor(dev) == PCI_VENDOR_DELL)
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $DragonFly: src/sys/dev/netif/em/if_em.c,v 1.51 2006/12/09 01:44:23 swildner Exp $
+ * $DragonFly: src/sys/dev/netif/em/if_em.c,v 1.52 2006/12/20 18:14:39 dillon Exp $
* $FreeBSD$
*/
/*
((pci_subdevice_id == ent->subdevice_id) ||
(ent->subdevice_id == PCI_ANY_ID))) {
- snprintf(adapter_name, sizeof(adapter_name),
+ ksnprintf(adapter_name, sizeof(adapter_name),
"%s, Version - %s", em_strings[ent->index],
em_driver_version);
device_set_desc_copy(dev, adapter_name);
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/pci/if_en_pci.c,v 1.12 1999/08/21 22:10:49 msmith Exp $
- * $DragonFly: src/sys/dev/netif/en_pci/if_en_pci.c,v 1.13 2006/09/05 00:55:40 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/en_pci/if_en_pci.c,v 1.14 2006/12/20 18:14:39 dillon Exp $
*/
/*
en_cd.cd_devs[unit] = sc; /* fake a cfdriver structure */
en_cd.cd_ndevs = NEN;
if_initname(&(sc->enif), "en", unit);
- snprintf(sc->sc_dev.dv_xname, sizeof(sc->sc_dev.dv_xname), sc->enif.if_xname);
+ ksnprintf(sc->sc_dev.dv_xname, sizeof(sc->sc_dev.dv_xname), sc->enif.if_xname);
scp->en_confid = config_id;
/*
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.27 2004/01/08 14:58:09 simokawa Exp $
- * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.27 2006/10/25 20:55:57 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.28 2006/12/20 18:14:39 dillon Exp $
*/
#include "opt_inet.h"
ifs = (struct ifstat *)data;
len = strlen(ifs->ascii);
if (len < sizeof(ifs->ascii))
- snprintf(ifs->ascii + len,
+ ksnprintf(ifs->ascii + len,
sizeof(ifs->ascii) - len,
"\tch %d dma %d\n",
fwe->stream_ch, fwe->dma_ch);
* this gadget.
*
* $FreeBSD: src/sys/pci/if_mn.c,v 1.11.2.3 2001/01/23 12:47:09 phk Exp $
- * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.14 2006/10/25 20:55:57 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.15 2006/12/20 18:14:39 dillon Exp $
*/
/*
if (wframing == sc->framing)
return;
if (sc->nhooks > 0) {
- sprintf(ret, "Cannot change line when %d hooks open\n", sc->nhooks);
+ ksprintf(ret, "Cannot change line when %d hooks open\n", sc->nhooks);
return;
}
sc->framing = wframing;
}
pos = 0;
- pos += sprintf(pos + r,"Framer status %b;\n", sc->framer_state, "\20"
+ pos += ksprintf(pos + r,"Framer status %b;\n", sc->framer_state, "\20"
"\40LOS\37AIS\36LFA\35RRA"
"\34AUXP\33NMF\32LMFA\31frs0.0"
"\30frs1.7\27TS16RA\26TS16LOS\25TS16AIS"
"\14RY1\13RY2\12RY3\11RY4"
"\10SI1\7SI2\6rsp.5\5rsp.4"
"\4rsp.3\3RSIF\2RS13\1RS15");
- pos += sprintf(pos + r," Framing errors: %lu", sc->cnt_fec);
- pos += sprintf(pos + r," Code Violations: %lu\n", sc->cnt_cvc);
+ pos += ksprintf(pos + r," Framing errors: %lu", sc->cnt_fec);
+ pos += ksprintf(pos + r," Code Violations: %lu\n", sc->cnt_cvc);
- pos += sprintf(pos + r," Falc State %b;\n", sc->falc_state, "\20"
+ pos += ksprintf(pos + r," Falc State %b;\n", sc->falc_state, "\20"
"\40LOS\37AIS\36LFA\35RRA"
"\34AUXP\33NMF\32LMFA\31frs0.0"
"\30frs1.7\27TS16RA\26TS16LOS\25TS16AIS"
"\14RY1\13RY2\12RY3\11RY4"
"\10SI1\7SI2\6rsp.5\5rsp.4"
"\4rsp.3\3RSIF\2RS13\1RS15");
- pos += sprintf(pos + r, " Falc IRQ %b\n", sc->falc_irq, "\20"
+ pos += ksprintf(pos + r, " Falc IRQ %b\n", sc->falc_irq, "\20"
"\40RME\37RFS\36T8MS\35RMB\34CASC\33CRC4\32SA6SC\31RPF"
"\30b27\27RDO\26ALLS\25XDU\24XMB\23b22\22XLSC\21XPR"
"\20FAR\17LFA\16MFAR\15T400MS\14AIS\13LOS\12RAR\11RA"
continue;
sch = sc->ch[i];
- pos += sprintf(r + pos, " Chan %d <%s> ",
+ pos += ksprintf(r + pos, " Chan %d <%s> ",
i, sch->hook->name);
- pos += sprintf(r + pos, " Last Rx: ");
+ pos += ksprintf(r + pos, " Last Rx: ");
if (sch->last_recv)
- pos += sprintf(r + pos, "%lu s", time_second - sch->last_recv);
+ pos += ksprintf(r + pos, "%lu s", time_second - sch->last_recv);
else
- pos += sprintf(r + pos, "never");
+ pos += ksprintf(r + pos, "never");
- pos += sprintf(r + pos, ", last RxErr: ");
+ pos += ksprintf(r + pos, ", last RxErr: ");
if (sch->last_rxerr)
- pos += sprintf(r + pos, "%lu s", time_second - sch->last_rxerr);
+ pos += ksprintf(r + pos, "%lu s", time_second - sch->last_rxerr);
else
- pos += sprintf(r + pos, "never");
+ pos += ksprintf(r + pos, "never");
- pos += sprintf(r + pos, ", last Tx: ");
+ pos += ksprintf(r + pos, ", last Tx: ");
if (sch->last_xmit)
- pos += sprintf(r + pos, "%lu s\n", time_second - sch->last_xmit);
+ pos += ksprintf(r + pos, "%lu s\n", time_second - sch->last_xmit);
else
- pos += sprintf(r + pos, "never\n");
+ pos += ksprintf(r + pos, "never\n");
- pos += sprintf(r + pos, " RX error(s) %lu", sch->rx_error);
- pos += sprintf(r + pos, " Short: %lu", sch->short_error);
- pos += sprintf(r + pos, " CRC: %lu", sch->crc_error);
- pos += sprintf(r + pos, " Mod8: %lu", sch->dribble_error);
- pos += sprintf(r + pos, " Long: %lu", sch->long_error);
- pos += sprintf(r + pos, " Abort: %lu", sch->abort_error);
- pos += sprintf(r + pos, " Overflow: %lu\n", sch->overflow_error);
+ pos += ksprintf(r + pos, " RX error(s) %lu", sch->rx_error);
+ pos += ksprintf(r + pos, " Short: %lu", sch->short_error);
+ pos += ksprintf(r + pos, " CRC: %lu", sch->crc_error);
+ pos += ksprintf(r + pos, " Mod8: %lu", sch->dribble_error);
+ pos += ksprintf(r + pos, " Long: %lu", sch->long_error);
+ pos += ksprintf(r + pos, " Abort: %lu", sch->abort_error);
+ pos += ksprintf(r + pos, " Overflow: %lu\n", sch->overflow_error);
- pos += sprintf(r + pos, " Last error: %b Prev error: %b\n",
+ pos += ksprintf(r + pos, " Last error: %b Prev error: %b\n",
sch->last_error, "\20\7SHORT\5CRC\4MOD8\3LONG\2ABORT\1OVERRUN",
sch->prev_error, "\20\7SHORT\5CRC\4MOD8\3LONG\2ABORT\1OVERRUN");
- pos += sprintf(r + pos, " Xmit bytes pending %ld\n",
+ pos += ksprintf(r + pos, " Xmit bytes pending %ld\n",
sch->tx_pending);
}
(*resp)->header.arglen = pos + 1;
for (j = 0; j < 32; j++) {
if (!(ts & (1 << j)))
continue;
- sprintf(p, "%s%d", s, j);
+ ksprintf(p, "%s%d", s, j);
p += strlen(p);
s = ",";
if (!(ts & (1 << (j+1))))
for (; j < 32; j++)
if (!(ts & (1 << (j+1))))
break;
- sprintf(p, "-%d", j);
+ ksprintf(p, "-%d", j);
p += strlen(p);
s = ",";
}
sch->sc = sc;
sch->state = DOWN;
sch->chan = chan;
- sprintf(sch->name, "%s%d", sc->name, chan);
+ ksprintf(sch->name, "%s%d", sc->name, chan);
return;
}
sc->dev = self;
sc->unit = device_get_unit(self);
sc->framing = E1;
- sprintf(sc->name, "mn%d", sc->unit);
+ ksprintf(sc->name, "mn%d", sc->unit);
rid = PCIR_MAPS;
res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE);
return (0);
}
sc->node->private = sc;
- sprintf(sc->nodename, "%s%d", NG_MN_NODE_TYPE, sc->unit);
+ ksprintf(sc->nodename, "%s%d", NG_MN_NODE_TYPE, sc->unit);
if (ng_name_node(sc->node, sc->nodename)) {
ng_rmnode(sc->node);
ng_unref(sc->node);
* SUCH DAMAGE.
*
* $NetBSD: rtw.c,v 1.72 2006/03/28 00:48:10 dyoung Exp $
- * $DragonFly: src/sys/dev/netif/rtw/rtw.c,v 1.3 2006/10/25 20:55:58 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/rtw/rtw.c,v 1.4 2006/12/20 18:14:39 dillon Exp $
*/
/*
rfname = paname = "reserved";
break;
default:
- snprintf(scratch, sizeof(scratch), "unknown 0x%02x",
+ ksnprintf(scratch, sizeof(scratch), "unknown 0x%02x",
sc->sc_rfchipid);
rfname = paname = scratch;
}
*
* $OpenBSD: if_sk.c,v 1.129 2006/10/16 12:30:08 tom Exp $
* $FreeBSD: /c/ncvs/src/sys/pci/if_sk.c,v 1.20 2000/04/22 02:16:37 wpaul Exp $
- * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.49 2006/11/14 12:52:31 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.50 2006/12/20 18:14:39 dillon Exp $
*/
/*
return ENXIO;
}
- snprintf(devname, sizeof(devname), "%s%s (0x%x)",
+ ksnprintf(devname, sizeof(devname), "%s%s (0x%x)",
name, revstr, sc->sk_rev);
device_set_desc_copy(dev, devname);
return 0;
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sr/if_sr.c,v 1.48.2.1 2002/06/17 15:10:58 jhay Exp $
- * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.19 2006/10/25 20:55:59 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.20 2006/12/20 18:14:39 dillon Exp $
*/
/*
callout_init(&sc->sr_timer);
sc->xmitq.ifq_maxlen = IFQ_MAXLEN;
sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
- sprintf(sc->nodename, "%s%d", NG_SR_NODE_TYPE, sc->unit);
+ ksprintf(sc->nodename, "%s%d", NG_SR_NODE_TYPE, sc->unit);
if (ng_name_node(sc->node, sc->nodename)) {
ng_rmnode(sc->node);
ng_unref(sc->node);
/*
* Put in the throughput information.
*/
- pos = sprintf(arg, "%ld bytes in, %ld bytes out\n"
+ pos = ksprintf(arg, "%ld bytes in, %ld bytes out\n"
"highest rate seen: %ld B/S in, %ld B/S out\n",
sc->inbytes, sc->outbytes,
sc->inrate, sc->outrate);
- pos += sprintf(arg + pos,
+ pos += ksprintf(arg + pos,
"%ld output errors\n",
sc->oerrors);
- pos += sprintf(arg + pos,
+ pos += ksprintf(arg + pos,
"ierrors = %ld, %ld, %ld, %ld, %ld, %ld\n",
sc->ierrors[0],
sc->ierrors[1],
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.28 2002/11/27 17:30:41 imp Exp $
- * $DragonFly: src/sys/dev/pccard/cardbus/cardbus.c,v 1.8 2006/10/25 20:56:00 dillon Exp $
+ * $DragonFly: src/sys/dev/pccard/cardbus/cardbus.c,v 1.9 2006/12/20 18:14:40 dillon Exp $
*/
/*
dinfo = device_get_ivars(child);
cfg = &dinfo->pci.cfg;
- snprintf(buf, buflen, "slot=%d function=%d", pci_get_slot(child),
+ ksnprintf(buf, buflen, "slot=%d function=%d", pci_get_slot(child),
pci_get_function(child));
return (0);
}
dinfo = device_get_ivars(child);
cfg = &dinfo->pci.cfg;
- snprintf(buf, buflen, "vendor=0x%04x device=0x%04x subvendor=0x%04x "
+ ksnprintf(buf, buflen, "vendor=0x%04x device=0x%04x subvendor=0x%04x "
"subdevice=0x%04x", cfg->vendor, cfg->device, cfg->subvendor,
cfg->subdevice);
return (0);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.2.2.6 2003/02/18 22:27:41 ps Exp $
- * $DragonFly: src/sys/dev/raid/ciss/ciss.c,v 1.20 2006/10/25 20:56:01 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/ciss/ciss.c,v 1.21 2006/12/20 18:14:40 dillon Exp $
*/
/*
struct cam_periph *periph;
if ((periph = ciss_find_periph(sc, target)) != NULL) {
- sprintf(sc->ciss_logical[target].cl_name, "%s%d", periph->periph_name, periph->unit_number);
+ ksprintf(sc->ciss_logical[target].cl_name, "%s%d", periph->periph_name, periph->unit_number);
return(0);
}
sc->ciss_logical[target].cl_name[0] = 0;
*/
#ident "$FreeBSD: src/sys/dev/dpt/dpt_control.c,v 1.16 1999/09/25 18:23:48 phk Exp $"
-#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_control.c,v 1.11 2006/10/23 21:50:32 dillon Exp $"
+#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_control.c,v 1.12 2006/12/20 18:14:40 dillon Exp $"
#include "opt_dpt.h"
command = dpt_rw_command[dpt->unit];
if (strcmp(command, DPT_RW_CMD_DUMP_SOFTC) == 0) {
- x = sprintf(wbp, "dpt%d:%s:%s:%s:%s:%x\n",
+ x = ksprintf(wbp, "dpt%d:%s:%s:%s:%s:%x\n",
dpt->unit,
dpt->board_data.vendor,
dpt->board_data.modelNum,
wbp += x;
} else if (strcmp(command, DPT_RW_CMD_DUMP_SYSINFO) == 0) {
- x = sprintf(wbp, "dpt%d:%d:%d:%d:%d:%d:%d:%d:%d:%s:"
+ x = ksprintf(wbp, "dpt%d:%d:%d:%d:%d:%d:%d:%d:%d:%s:"
"%d:%d:%d:%d:%d:%d:%d:%d\n",
dpt->unit,
dpt_sysinfo.drive0CMOS,
for (ndx = 0; ndx < 16; ndx++) {
if (dpt_sysinfo.drives[ndx].cylinders != 0) {
- x = sprintf(wbp, "dpt%d:d%dc%dh%ds%d\n",
+ x = ksprintf(wbp, "dpt%d:d%dc%dh%ds%d\n",
dpt->unit,
ndx,
dpt_sysinfo.drives[ndx].cylinders,
}
}
} else if (strcmp(command, DPT_RW_CMD_DUMP_METRICS) == 0) {
- x = sprintf(wbp,
+ x = ksprintf(wbp,
"dpt%d: No metrics available.\n"
"Run the dpt_dm command, or use the\n"
"DPT_IOCTL_INTERNAL_METRICS ioctl system call\n",
dpt_reset_performance(dpt);
#endif /* DPT_MEASURE_PERFORMANCE */
- x = sprintf(wbp, "dpt%d: Metrics have been cleared\n",
+ x = ksprintf(wbp, "dpt%d: Metrics have been cleared\n",
dpt->unit);
work_size += x;
wbp += x;
} else if (strcmp(command, DPT_RW_CMD_SHOW_LED) == 0) {
- x = sprintf(wbp, "dpt%d:%s\n",
+ x = ksprintf(wbp, "dpt%d:%s\n",
dpt->unit, i2bin(dpt_blinking_led(dpt), 8));
work_size += x;
wbp += x;
/* $FreeBSD: src/sys/dev/iir/iir.c,v 1.2.2.3 2002/05/05 08:18:12 asmodai Exp $ */
-/* $DragonFly: src/sys/dev/raid/iir/iir.c,v 1.14 2006/12/18 20:41:01 dillon Exp $ */
+/* $DragonFly: src/sys/dev/raid/iir/iir.c,v 1.15 2006/12/20 18:14:40 dillon Exp $ */
/*
* Copyright (c) 2000-01 Intel Corporation
* All Rights Reserved
inq->additional_length = 32;
inq->flags = SID_CmdQue | SID_Sync;
strcpy(inq->vendor, "IIR ");
- sprintf(inq->product, "Host Drive #%02d", t);
+ ksprintf(inq->product, "Host Drive #%02d", t);
strcpy(inq->revision, " ");
break;
}
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ips/ips.c,v 1.12 2004/05/30 04:01:29 scottl Exp $
- * $DragonFly: src/sys/dev/raid/ips/ips.c,v 1.17 2006/09/10 01:26:35 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/ips/ips.c,v 1.18 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/raid/ips/ips.h>
return("CRS");
break;
}
- sprintf(statebuf, "UNKNOWN(0x%02x)", state);
+ ksprintf(statebuf, "UNKNOWN(0x%02x)", state);
return (statebuf);
}
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/mlx/mlx.c,v 1.14.2.5 2001/09/11 09:49:53 kris Exp $
- * $DragonFly: src/sys/dev/raid/mlx/mlx.c,v 1.22 2006/10/25 20:56:01 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/mlx/mlx.c,v 1.23 2006/12/20 18:14:40 dillon Exp $
*/
/*
(mc->mc_status == mlx_messages[i].status))
return(mlx_status_messages[mlx_messages[i].msg]);
- sprintf(unkmsg, "unknown response 0x%x for command 0x%x", (int)mc->mc_status, (int)mc->mc_mailbox[0]);
+ ksprintf(unkmsg, "unknown response 0x%x for command 0x%x", (int)mc->mc_status, (int)mc->mc_mailbox[0]);
return(unkmsg);
}
}
}
if (model == NULL) {
- sprintf(buf, " model 0x%x", sc->mlx_enq2->me_hardware_id & 0xff);
+ ksprintf(buf, " model 0x%x", sc->mlx_enq2->me_hardware_id & 0xff);
model = buf;
}
device_printf(sc->mlx_dev, "DAC%s, %d channel%s, firmware %d.%02d-%c-%02d, %dMB RAM\n",
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/mly/mly_cam.c,v 1.1.2.3 2001/04/21 04:09:06 msmith Exp $
- * $DragonFly: src/sys/dev/raid/mly/Attic/mly_cam.c,v 1.6 2006/10/25 20:56:01 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/mly/Attic/mly_cam.c,v 1.7 2006/12/20 18:14:40 dillon Exp $
*/
/*
* CAM interface for FreeBSD
struct cam_periph *periph;
if ((periph = mly_find_periph(sc, bus, target)) != NULL) {
- sprintf(sc->mly_btl[bus][target].mb_name, "%s%d", periph->periph_name, periph->unit_number);
+ ksprintf(sc->mly_btl[bus][target].mb_name, "%s%d", periph->periph_name, periph->unit_number);
return(0);
}
sc->mly_btl[bus][target].mb_name[0] = 0;
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/pst/pst-raid.c,v 1.2.2.1 2002/08/18 12:32:36 sos Exp $
- * $DragonFly: src/sys/dev/raid/pst/pst-raid.c,v 1.20 2006/10/25 20:56:01 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/pst/pst-raid.c,v 1.21 2006/12/20 18:14:40 dillon Exp $
*/
#include <sys/param.h>
#endif
bpack(ident->vendor, ident->vendor, 16);
bpack(ident->product, ident->product, 16);
- sprintf(name, "%s %s", ident->vendor, ident->product);
+ ksprintf(name, "%s %s", ident->vendor, ident->product);
contigfree(reply, PAGE_SIZE, M_PSTRAID);
bioq_init(&psc->bio_queue);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/twe/twe.c,v 1.1.2.10 2004/06/11 18:57:31 vkashyap Exp $
- * $DragonFly: src/sys/dev/raid/twe/twe.c,v 1.16 2006/09/05 00:55:42 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/twe/twe.c,v 1.17 2006/12/20 18:14:40 dillon Exp $
*/
/*
case 'c':
if ((child = sc->twe_drive[TWE_AEN_UNIT(aen)].td_disk) != NULL) {
- sprintf(buf, "twed%d: %s", device_get_unit(child), msg);
+ ksprintf(buf, "twed%d: %s", device_get_unit(child), msg);
} else {
- sprintf(buf, "twe%d: %s for unknown unit %d", device_get_unit(sc->twe_dev),
+ ksprintf(buf, "twe%d: %s for unknown unit %d", device_get_unit(sc->twe_dev),
msg, TWE_AEN_UNIT(aen));
}
return(buf);
case 'p':
- sprintf(buf, "twe%d: port %d: %s", device_get_unit(sc->twe_dev), TWE_AEN_UNIT(aen),
+ ksprintf(buf, "twe%d: port %d: %s", device_get_unit(sc->twe_dev), TWE_AEN_UNIT(aen),
msg);
return(buf);
default:
break;
}
- sprintf(buf, "unknown AEN 0x%x", aen);
+ ksprintf(buf, "unknown AEN 0x%x", aen);
return(buf);
}
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/twe/twe_freebsd.c,v 1.2.2.9 2004/06/11 18:57:31 vkashyap Exp $
- * $DragonFly: src/sys/dev/raid/twe/twe_freebsd.c,v 1.23 2006/09/10 01:26:36 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/twe/twe_freebsd.c,v 1.24 2006/12/20 18:14:40 dillon Exp $
*/
/*
* XXX It would make sense to test the online/initialising bits, but they seem to be
* always set...
*/
- sprintf(buf, "Unit %d, %s, %s",
+ ksprintf(buf, "Unit %d, %s, %s",
dr->td_twe_unit,
twe_describe_code(twe_table_unittype, dr->td_type),
twe_describe_code(twe_table_unitstate, dr->td_state & TWE_PARAM_UNITSTATUS_MASK));
*
* $Id: vinumconfig.c,v 1.30 2000/05/01 09:45:50 grog Exp grog $
* $FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.32.2.6 2002/02/03 00:43:35 grog Exp $
- * $DragonFly: src/sys/dev/raid/vinum/vinumconfig.c,v 1.8 2006/12/18 20:41:01 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/vinum/vinumconfig.c,v 1.9 2006/12/20 18:14:40 dillon Exp $
*/
#define STATIC static
strcpy(sd->name, PLEX[sd->plexno].name); /* take it from there */
else /* no way */
throw_rude_remark(EINVAL, "Unnamed sd is not associated with a plex");
- sprintf(sdsuffix, ".s%d", sdindex); /* form the suffix */
+ ksprintf(sdsuffix, ".s%d", sdindex); /* form the suffix */
strcat(sd->name, sdsuffix); /* and add it to the name */
}
/* do we have complete info for this subdisk? */
VOL[plex->volno].name);
else /* no way */
throw_rude_remark(EINVAL, "Unnamed plex is not associated with a volume");
- sprintf(plexsuffix, ".p%d", pindex); /* form the suffix */
+ ksprintf(plexsuffix, ".p%d", pindex); /* form the suffix */
strcat(plex->name, plexsuffix); /* and add it to the name */
}
if (isstriped(plex)) {
*
* $Id: vinumio.c,v 1.30 2000/05/10 23:23:30 grog Exp grog $
* $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.52.2.6 2002/05/02 08:43:44 grog Exp $
- * $DragonFly: src/sys/dev/raid/vinum/vinumio.c,v 1.18 2006/12/13 21:58:49 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/vinum/vinumio.c,v 1.19 2006/12/20 18:14:40 dillon Exp $
*/
#include "vinumhdr.h"
vol = &vinum_conf.volume[i];
if ((vol->state > volume_uninit)
&& (vol->name[0] != '\0')) { /* paranoia */
- snprintf(s,
+ ksnprintf(s,
configend - s,
"volume %s state %s",
vol->name,
while (*s)
s++; /* find the end */
if (vol->preferred_plex >= 0) /* preferences, */
- snprintf(s,
+ ksnprintf(s,
configend - s,
" readpol prefer %s",
vinum_conf.plex[vol->preferred_plex].name);
plex = &vinum_conf.plex[i];
if ((plex->state > plex_referenced)
&& (plex->name[0] != '\0')) { /* paranoia */
- snprintf(s,
+ ksnprintf(s,
configend - s,
"plex name %s state %s org %s ",
plex->name,
while (*s)
s++; /* find the end */
if (isstriped(plex)) {
- snprintf(s,
+ ksnprintf(s,
configend - s,
"%ds ",
(int) plex->stripesize);
s++; /* find the end */
}
if (plex->volno >= 0) /* we have a volume */
- snprintf(s,
+ ksnprintf(s,
configend - s,
"vol %s ",
vinum_conf.volume[plex->volno].name);
while (*s)
s++; /* find the end */
for (j = 0; j < plex->subdisks; j++) {
- snprintf(s,
+ ksnprintf(s,
configend - s,
" sd %s",
vinum_conf.sd[plex->sdnos[j]].name);
*/
if (drivename[0] == '\0')
drivename = "*invalid*";
- snprintf(s,
+ ksnprintf(s,
configend - s,
"sd name %s drive %s plex %s len %llus driveoffset %llus state %s",
sd->name,
while (*s)
s++; /* find the end */
if (sd->plexno >= 0)
- snprintf(s,
+ ksnprintf(s,
configend - s,
" plexoffset %llds",
(long long) sd->plexoffset);
else
- snprintf(s, configend - s, " detached");
+ ksnprintf(s, configend - s, " detached");
while (*s)
s++; /* find the end */
if (sd->flags & VF_RETRYERRORS) {
- snprintf(s, configend - s, " retryerrors");
+ ksnprintf(s, configend - s, " retryerrors");
while (*s)
s++; /* find the end */
}
- snprintf(s, configend - s, " \n");
+ ksnprintf(s, configend - s, " \n");
while (*s)
s++; /* find the end */
}
continue;
if (part == 'c')
continue;
- snprintf(partname, DRIVENAMELEN,
+ ksnprintf(partname, DRIVENAMELEN,
"%ss%d%c", devicename[driveno], slice, part);
drive = check_drive(partname); /* try to open it */
if ((drive->lasterror != 0) /* didn't work, */
if (part == 'c')
continue;
if (has_part) {
- snprintf(partname, DRIVENAMELEN,
+ ksnprintf(partname, DRIVENAMELEN,
"%s", devicename[driveno]);
} else {
- snprintf(partname, DRIVENAMELEN,
+ ksnprintf(partname, DRIVENAMELEN,
"%s%c", devicename[driveno], part);
}
drive = check_drive(partname); /* try to open it */
*
* $Id: vinumrevive.c,v 1.14 2000/12/21 01:55:11 grog Exp grog $
* $FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.22.2.5 2001/03/13 02:59:43 grog Exp $
- * $DragonFly: src/sys/dev/raid/vinum/vinumrevive.c,v 1.13 2006/09/10 01:26:36 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/vinum/vinumrevive.c,v 1.14 2006/12/20 18:14:40 dillon Exp $
*/
#include "vinumhdr.h"
&& (errorloc != -1)) {
if (op == checkparity)
reply->error = EIO;
- sprintf(reply->msg,
+ ksprintf(reply->msg,
"Parity incorrect at offset 0x%llx\n",
errorloc);
}
*
* $Id: vinumstate.c,v 2.18 2000/05/10 07:30:50 grog Exp grog $
* $FreeBSD: src/sys/dev/vinum/vinumstate.c,v 1.28.2.2 2000/06/08 02:00:23 grog Exp $
- * $DragonFly: src/sys/dev/raid/vinum/vinumstate.c,v 1.6 2006/04/30 17:22:17 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/vinum/vinumstate.c,v 1.7 2006/12/20 18:14:40 dillon Exp $
*/
#include "vinumhdr.h"
sd = &SD[msg->index];
if ((msg->index >= vinum_conf.subdisks_allocated)
|| (sd->state <= sd_referenced)) {
- sprintf(ioctl_reply->msg, "Invalid subdisk %d", msg->index);
+ ksprintf(ioctl_reply->msg, "Invalid subdisk %d", msg->index);
ioctl_reply->error = EFAULT;
return;
}
plex = &PLEX[msg->index];
if ((msg->index >= vinum_conf.plexes_allocated)
|| (plex->state <= plex_unallocated)) {
- sprintf(ioctl_reply->msg, "Invalid plex %d", msg->index);
+ ksprintf(ioctl_reply->msg, "Invalid plex %d", msg->index);
ioctl_reply->error = EFAULT;
return;
}
sd = &SD[msg->index];
if ((msg->index >= vinum_conf.subdisks_allocated)
|| (sd->state <= sd_referenced)) {
- sprintf(ioctl_reply->msg, "Invalid subdisk %d", msg->index);
+ ksprintf(ioctl_reply->msg, "Invalid subdisk %d", msg->index);
ioctl_reply->error = EFAULT;
return;
}
*
* $Id: vinumutil.c,v 1.14 1999/12/30 07:04:02 grog Exp grog $
* $FreeBSD: src/sys/dev/vinum/vinumutil.c,v 1.15 2000/02/29 06:16:44 grog Exp $
- * $DragonFly: src/sys/dev/raid/vinum/vinumutil.c,v 1.5 2006/09/10 01:26:36 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/vinum/vinumutil.c,v 1.6 2006/12/20 18:14:40 dillon Exp $
*/
/* This file contains utility routines used both in kernel and user context */
#include "vinumhdr.h"
#include "statetexts.h"
+#ifdef _KERNEL
+#define sprintf ksprintf
+#endif
+
static char numeric_state[32]; /* temporary buffer for ASCII conversions */
#define STATECOUNT(x) (sizeof (x##statetext) / sizeof (char *))
/* Return drive state as a string */
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.7.2.9 2002/12/24 21:17:41 semenu Exp $
- * $DragonFly: src/sys/dev/sound/isa/ad1816.c,v 1.4 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/isa/ad1816.c,v 1.5 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include "mixer_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/ad1816.c,v 1.4 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/ad1816.c,v 1.5 2006/12/20 18:14:40 dillon Exp $");
struct ad1816_info;
goto no;
}
if (ad1816->drq2)
- snprintf(status2, SND_STATUSLEN, ":%ld", rman_get_start(ad1816->drq2));
+ ksnprintf(status2, SND_STATUSLEN, ":%ld", rman_get_start(ad1816->drq2));
else
status2[0] = '\0';
- snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u",
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u",
rman_get_start(ad1816->io_base),
rman_get_start(ad1816->irq),
rman_get_start(ad1816->drq1),
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.3.2.8 2002/12/24 21:17:41 semenu Exp $
- * $DragonFly: src/sys/dev/sound/isa/ess.c,v 1.4 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/isa/ess.c,v 1.5 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include "mixer_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/ess.c,v 1.4 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/ess.c,v 1.5 2006/12/20 18:14:40 dillon Exp $");
#define ESS_BUFFSIZE (4096)
#define ABS(x) (((x) < 0)? -(x) : (x))
sc->duplex = 0;
sc->newspeed = 0;
ver = (ess_getmixer(sc, 0x40) << 8) | ess_rd(sc, SB_MIX_DATA);
- snprintf(buf, sizeof buf, "ESS %x DSP", ver);
+ ksnprintf(buf, sizeof buf, "ESS %x DSP", ver);
device_set_desc_copy(dev, buf);
if (bootverbose)
device_printf(dev, "ESS%x detected", ver);
}
if (sc->drq2)
- snprintf(buf, SND_STATUSLEN, ":%ld", rman_get_start(sc->drq2));
+ ksnprintf(buf, SND_STATUSLEN, ":%ld", rman_get_start(sc->drq2));
else
buf[0] = '\0';
- snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u",
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u",
rman_get_start(sc->io_base), rman_get_start(sc->irq),
rman_get_start(sc->drq1), buf, sc->bufsize);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.48.2.11 2002/12/24 21:17:41 semenu Exp $
- * $DragonFly: src/sys/dev/sound/isa/mss.c,v 1.7 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/isa/mss.c,v 1.8 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/mss.c,v 1.7 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/mss.c,v 1.8 2006/12/20 18:14:40 dillon Exp $");
/* board-specific include files */
#include <dev/sound/isa/mss.h>
}
if (pdma != rdma)
- snprintf(status2, SND_STATUSLEN, ":%d", rdma);
+ ksnprintf(status2, SND_STATUSLEN, ":%d", rdma);
else
status2[0] = '\0';
- snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %d%s bufsz %u",
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %d%s bufsz %u",
rman_get_start(mss->io_base), rman_get_start(mss->irq), pdma, status2, mss->bufsize);
if (pcm_register(dev, mss, 1, 1)) goto no;
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.64.2.7 2002/12/24 21:17:42 semenu Exp $
- * $DragonFly: src/sys/dev/sound/isa/sb16.c,v 1.5 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/isa/sb16.c,v 1.6 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include "mixer_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/sb16.c,v 1.5 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/sb16.c,v 1.6 2006/12/20 18:14:40 dillon Exp $");
#define SB16_BUFFSIZE 4096
#define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16)
f = (ver & 0xffff0000) >> 16;
ver &= 0x0000ffff;
if (f & BD_F_SB16) {
- snprintf(buf, sizeof buf, "SB16 DSP %d.%02d%s", (int) ver >> 8, (int) ver & 0xff,
+ ksnprintf(buf, sizeof buf, "SB16 DSP %d.%02d%s", (int) ver >> 8, (int) ver & 0xff,
(f & BD_F_SB16X)? " (ViBRA16X)" : "");
device_set_desc_copy(dev, buf);
return 0;
}
if (!(pcm_getflags(dev) & SD_F_SIMPLEX))
- snprintf(status2, SND_STATUSLEN, ":%ld", rman_get_start(sb->drq2));
+ ksnprintf(status2, SND_STATUSLEN, ":%ld", rman_get_start(sb->drq2));
else
status2[0] = '\0';
- snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %ud",
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %ud",
rman_get_start(sb->io_base), rman_get_start(sb->irq),
rman_get_start(sb->drq1), status2, sb->bufsize);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.62.2.5 2002/12/24 21:17:42 semenu Exp $
- * $DragonFly: src/sys/dev/sound/isa/sb8.c,v 1.4 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/isa/sb8.c,v 1.5 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include "mixer_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/sb8.c,v 1.4 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/sb8.c,v 1.5 2006/12/20 18:14:40 dillon Exp $");
#define SB_DEFAULT_BUFSZ 4096
if ((f & BD_F_ESS) || (ver >= 0x400))
return (ENXIO);
- snprintf(buf, sizeof buf, "SB DSP %d.%02d", (int) ver >> 8, (int) ver & 0xff);
+ ksnprintf(buf, sizeof buf, "SB DSP %d.%02d", (int) ver >> 8, (int) ver & 0xff);
device_set_desc_copy(dev, buf);
goto no;
}
- snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld bufsz %u",
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld bufsz %u",
rman_get_start(sb->io_base), rman_get_start(sb->irq), rman_get_start(sb->drq), sb->bufsize);
if (pcm_register(dev, sb, 1, 1))
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.2.2.5 2002/04/22 15:49:31 cg Exp $
- * $DragonFly: src/sys/dev/sound/pci/als4000.c,v 1.7 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/als4000.c,v 1.8 2006/12/20 18:14:40 dillon Exp $
*/
/*
#include "mixer_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/als4000.c,v 1.7 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/als4000.c,v 1.8 2006/12/20 18:14:40 dillon Exp $");
/* Debugging macro's */
#undef DEB
pcm_addchan(dev, PCMDIR_PLAY, &alspchan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &alsrchan_class, sc);
- snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
rman_get_start(sc->reg), rman_get_start(sc->irq));
pcm_setstatus(dev, status);
return 0;
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.8.2.7 2002/04/22 15:49:31 cg Exp $
- * $DragonFly: src/sys/dev/sound/pci/aureal.c,v 1.7 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/aureal.c,v 1.8 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include <bus/pci/pcireg.h>
#include <bus/pci/pcivar.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/aureal.c,v 1.7 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/aureal.c,v 1.8 2006/12/20 18:14:40 dillon Exp $");
/* PCI IDs of supported chips */
#define AU8820_PCI_ID 0x000112eb
goto bad;
}
- snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
(type[0] == SYS_RES_IOPORT)? "io" : "memory",
rman_get_start(reg[0]), rman_get_start(irq));
* those that don't.
*
* $FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.1.2.8 2002/08/27 00:17:34 orion Exp $
- * $DragonFly: src/sys/dev/sound/pci/cmi.c,v 1.6 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/cmi.c,v 1.7 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include "mixer_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/cmi.c,v 1.6 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/cmi.c,v 1.7 2006/12/20 18:14:40 dillon Exp $");
/* Supported chip ID's */
#define CMI8338A_PCI_ID 0x010013f6
pcm_addchan(dev, PCMDIR_PLAY, &cmichan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &cmichan_class, sc);
- snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
rman_get_start(sc->reg), rman_get_start(sc->irq));
pcm_setstatus(dev, status);
* contributed towards power management.
*
* $FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.2.2.8 2002/08/27 00:25:55 orion Exp $
- * $DragonFly: src/sys/dev/sound/pci/cs4281.c,v 1.7 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/cs4281.c,v 1.8 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pci/cs4281.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/cs4281.c,v 1.7 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/cs4281.c,v 1.8 2006/12/20 18:14:40 dillon Exp $");
#define CS4281_DEFAULT_BUFSZ 16384
pcm_addchan(dev, PCMDIR_PLAY, &cs4281chan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &cs4281chan_class, sc);
- snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
(sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
rman_get_start(sc->reg), rman_get_start(sc->irq));
pcm_setstatus(dev, status);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.8.2.7 2002/04/22 15:49:32 cg Exp $
- * $DragonFly: src/sys/dev/sound/pci/csapcm.c,v 1.5 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/csapcm.c,v 1.6 2006/12/20 18:14:40 dillon Exp $
*/
#include <sys/soundcard.h>
#include <bus/pci/pcireg.h>
#include <bus/pci/pcivar.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/csapcm.c,v 1.5 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/csapcm.c,v 1.6 2006/12/20 18:14:40 dillon Exp $");
/* Buffer size on dma transfer. Fixed for CS416x. */
#define CS461x_BUFFSIZE (4 * 1024)
return (ENXIO);
}
- snprintf(status, SND_STATUSLEN, "at irq %ld", rman_get_start(resp->irq));
+ ksnprintf(status, SND_STATUSLEN, "at irq %ld", rman_get_start(resp->irq));
/* Enable interrupt. */
if (snd_setup_intr(dev, resp->irq, INTR_MPSAFE, csa_intr, csa, &csa->ih, NULL)) {
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.8.2.9 2003/04/28 03:59:03 simokawa Exp $
- * $DragonFly: src/sys/dev/sound/pci/ds1.c,v 1.5 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/ds1.c,v 1.6 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pci/ds1.h>
#include <dev/sound/pci/ds1-fw.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/ds1.c,v 1.5 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/ds1.c,v 1.6 2006/12/20 18:14:40 dillon Exp $");
/* -------------------------------------------------------------------- */
goto bad;
}
- snprintf(status, SND_STATUSLEN, "at memory 0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at memory 0x%lx irq %ld",
rman_get_start(sc->reg), rman_get_start(sc->irq));
if (pcm_register(dev, sc, DS1_CHANS, 2))
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.6.2.9 2002/04/22 15:49:32 cg Exp $
- * $DragonFly: src/sys/dev/sound/pci/emu10k1.c,v 1.9 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/emu10k1.c,v 1.10 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include <bus/pci/pcivar.h>
#include <sys/queue.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/emu10k1.c,v 1.9 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/emu10k1.c,v 1.10 2006/12/20 18:14:40 dillon Exp $");
/* -------------------------------------------------------------------- */
goto bad;
}
- snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld", rman_get_start(sc->reg), rman_get_start(sc->irq));
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld", rman_get_start(sc->reg), rman_get_start(sc->irq));
if (pcm_register(dev, sc, sc->nchans, gotmic? 3 : 2)) goto bad;
for (i = 0; i < sc->nchans; i++)
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.13.2.10 2002/05/07 17:02:25 greid Exp $
- * $DragonFly: src/sys/dev/sound/pci/es137x.c,v 1.6 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/es137x.c,v 1.7 2006/12/20 18:14:40 dillon Exp $
*/
/*
#include "mixer_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/es137x.c,v 1.6 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/es137x.c,v 1.7 2006/12/20 18:14:40 dillon Exp $");
static int debug = 0;
SYSCTL_INT(_debug, OID_AUTO, es_debug, CTLFLAG_RW, &debug, 0, "");
goto bad;
}
- snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
(es->regtype == SYS_RES_IOPORT)? "io" : "memory",
rman_get_start(es->reg), rman_get_start(es->irq));
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.3.2.8 2002/12/24 21:17:42 semenu Exp $
- * $DragonFly: src/sys/dev/sound/pci/fm801.c,v 1.7 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/fm801.c,v 1.8 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include <bus/pci/pcireg.h>
#include <bus/pci/pcivar.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/fm801.c,v 1.7 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/fm801.c,v 1.8 2006/12/20 18:14:40 dillon Exp $");
#define PCI_VENDOR_FORTEMEDIA 0x1319
#define PCI_DEVICE_FORTEMEDIA1 0x08011319
goto oops;
}
- snprintf(status, 64, "at %s 0x%lx irq %ld",
+ ksnprintf(status, 64, "at %s 0x%lx irq %ld",
(fm801->regtype == SYS_RES_IOPORT)? "io" : "memory",
rman_get_start(fm801->reg), rman_get_start(fm801->irq));
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.3.2.12 2003/01/20 03:59:42 orion Exp $
- * $DragonFly: src/sys/dev/sound/pci/ich.c,v 1.10 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/ich.c,v 1.11 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include <bus/pci/pcireg.h>
#include <bus/pci/pcivar.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/ich.c,v 1.10 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/ich.c,v 1.11 2006/12/20 18:14:40 dillon Exp $");
/* -------------------------------------------------------------------- */
if (sc->hasmic)
pcm_addchan(dev, PCMDIR_REC, &ichchan_class, sc); /* record mic */
- snprintf(status, SND_STATUSLEN, "at io 0x%lx, 0x%lx irq %ld bufsz %u",
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx, 0x%lx irq %ld bufsz %u",
rman_get_start(sc->nambar), rman_get_start(sc->nabmbar), rman_get_start(sc->irq), sc->bufsz);
pcm_setstatus(dev, status);
*
* $Id: maestro.c,v 1.12 2000/09/06 03:32:34 taku Exp $
* $FreeBSD: src/sys/dev/sound/pci/maestro.c,v 1.2.2.5 2002/04/22 15:49:32 cg Exp $
- * $DragonFly: src/sys/dev/sound/pci/maestro.c,v 1.6 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/maestro.c,v 1.7 2006/12/20 18:14:40 dillon Exp $
*/
/*
#include <dev/sound/pci/maestro_reg.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/maestro.c,v 1.6 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/maestro.c,v 1.7 2006/12/20 18:14:40 dillon Exp $");
#define inline __inline
ess->irqid = irqid;
ess->ih = ih;
- snprintf(status, SND_STATUSLEN, "at I/O port 0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at I/O port 0x%lx irq %ld",
rman_get_start(reg), rman_get_start(irq));
if (pcm_register(dev, ess, AGG_MAXPLAYCH, 1))
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.2.2.11 2002/09/16 19:52:33 scottl Exp $
- * $DragonFly: src/sys/dev/sound/pci/maestro3.c,v 1.7 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/maestro3.c,v 1.8 2006/12/20 18:14:40 dillon Exp $
*/
/*
#include "gnu/maestro3_reg.h"
#include "gnu/maestro3_dsp.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/maestro3.c,v 1.7 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/maestro3.c,v 1.8 2006/12/20 18:14:40 dillon Exp $");
/* -------------------------------------------------------------------- */
goto bad;
}
}
- snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
(sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
rman_get_start(sc->reg), rman_get_start(sc->irq));
if (pcm_setstatus(dev, status)) {
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/neomagic.c,v 1.7.2.11 2002/04/22 15:49:32 cg Exp $
- * $DragonFly: src/sys/dev/sound/pci/neomagic.c,v 1.5 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/neomagic.c,v 1.6 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include <bus/pci/pcireg.h>
#include <bus/pci/pcivar.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/neomagic.c,v 1.5 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/neomagic.c,v 1.6 2006/12/20 18:14:40 dillon Exp $");
/* -------------------------------------------------------------------- */
goto bad;
}
- snprintf(status, SND_STATUSLEN, "at memory 0x%lx, 0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at memory 0x%lx, 0x%lx irq %ld",
rman_get_start(sc->buf), rman_get_start(sc->reg),
rman_get_start(sc->irq));
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/solo.c,v 1.9.2.8 2002/04/22 15:49:32 cg Exp $
- * $DragonFly: src/sys/dev/sound/pci/solo.c,v 1.6 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/solo.c,v 1.7 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include "mixer_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/solo.c,v 1.6 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/solo.c,v 1.7 2006/12/20 18:14:40 dillon Exp $");
#define SOLO_DEFAULT_BUFSZ 16384
#define ABS(x) (((x) < 0)? -(x) : (x))
goto no;
}
- snprintf(status, SND_STATUSLEN, "at io 0x%lx,0x%lx,0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx,0x%lx,0x%lx irq %ld",
rman_get_start(sc->io), rman_get_start(sc->sb), rman_get_start(sc->vc),
rman_get_start(sc->irq));
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.9.2.11 2002/10/22 08:27:13 cognet Exp $
- * $DragonFly: src/sys/dev/sound/pci/t4dwave.c,v 1.6 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/t4dwave.c,v 1.7 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include <bus/pci/pcireg.h>
#include <bus/pci/pcivar.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/t4dwave.c,v 1.6 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/t4dwave.c,v 1.7 2006/12/20 18:14:40 dillon Exp $");
/* -------------------------------------------------------------------- */
#define TDX_PCI_ID 0x20001023
goto bad;
}
- snprintf(status, 64, "at io 0x%lx irq %ld",
+ ksnprintf(status, 64, "at io 0x%lx irq %ld",
rman_get_start(tr->reg), rman_get_start(tr->irq));
if (pcm_register(dev, tr, TR_MAXPLAYCH, 1)) goto bad;
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/via8233.c,v 1.2.2.2 2003/02/06 17:35:56 orion Exp $
- * $DragonFly: src/sys/dev/sound/pci/via8233.c,v 1.5 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/via8233.c,v 1.6 2006/12/20 18:14:40 dillon Exp $
*/
/* Some Credits:
#include <dev/sound/pci/via8233.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/via8233.c,v 1.5 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/via8233.c,v 1.6 2006/12/20 18:14:40 dillon Exp $");
#define VIA8233_PCI_ID 0x30591106
ac97_setextmode(via->codec, ext);
}
- snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
rman_get_start(via->reg), rman_get_start(via->irq));
/* Register */
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/via82c686.c,v 1.4.2.10 2003/05/11 01:45:53 orion Exp $
- * $DragonFly: src/sys/dev/sound/pci/via82c686.c,v 1.5 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/via82c686.c,v 1.6 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pci/via82c686.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/via82c686.c,v 1.5 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/via82c686.c,v 1.6 2006/12/20 18:14:40 dillon Exp $");
#define VIA_PCI_ID 0x30581106
#define NSEGS 4 /* Number of segments in SGD table */
if (bus_dmamap_load(via->sgd_dmat, via->sgd_dmamap, via->sgd_table, NSEGS * sizeof(struct via_dma_op), dma_cb, 0, 0))
goto bad;
- snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld", rman_get_start(via->reg), rman_get_start(via->irq));
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld", rman_get_start(via->reg), rman_get_start(via->irq));
/* Register */
if (pcm_register(dev, via, 1, 1)) goto bad;
* muting.
*
* $FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.4.2.6 2002/04/22 15:49:33 cg Exp $
- * $DragonFly: src/sys/dev/sound/pci/vibes.c,v 1.7 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pci/vibes.c,v 1.8 2006/12/20 18:14:40 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include "mixer_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/vibes.c,v 1.7 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/vibes.c,v 1.8 2006/12/20 18:14:40 dillon Exp $");
/* ------------------------------------------------------------------------- */
/* Constants */
pcm_addchan(dev, PCMDIR_PLAY, &svpchan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &svrchan_class, sc);
- snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
+ ksnprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
rman_get_start(sc->enh_reg), rman_get_start(sc->irq));
pcm_setstatus(dev, status);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.49 2003/11/11 22:15:17 kuriyama Exp $
- * $DragonFly: src/sys/dev/sound/pcm/ac97.c,v 1.20 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pcm/ac97.c,v 1.21 2006/12/20 18:14:41 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include "mixer_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/ac97.c,v 1.20 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/ac97.c,v 1.21 2006/12/20 18:14:41 dillon Exp $");
MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec");
ac97_hw_desc(u_int32_t id, const char* vname, const char* cname, char* buf)
{
if (cname == NULL) {
- sprintf(buf, "Unknown AC97 Codec (id = 0x%08x)", id);
+ ksprintf(buf, "Unknown AC97 Codec (id = 0x%08x)", id);
return buf;
}
if (vname == NULL) vname = "Unknown";
if (bootverbose) {
- sprintf(buf, "%s %s AC97 Codec (id = 0x%08x)", vname, cname, id);
+ ksprintf(buf, "%s %s AC97 Codec (id = 0x%08x)", vname, cname, id);
} else {
- sprintf(buf, "%s %s AC97 Codec", vname, cname);
+ ksprintf(buf, "%s %s AC97 Codec", vname, cname);
}
return buf;
}
if (codec == NULL)
return NULL;
- snprintf(codec->name, AC97_NAMELEN, "%s:ac97", device_get_nameunit(dev));
+ ksnprintf(codec->name, AC97_NAMELEN, "%s:ac97", device_get_nameunit(dev));
codec->lock = snd_mtxcreate(codec->name, "ac97 codec");
codec->methods = kobj_create(cls, M_AC97, 0);
if (codec->methods == NULL) {
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pcm/buffer.c,v 1.1.2.4 2002/04/22 15:49:35 cg Exp $
- * $DragonFly: src/sys/dev/sound/pcm/buffer.c,v 1.5 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pcm/buffer.c,v 1.6 2006/12/20 18:14:41 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include "feeder_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/buffer.c,v 1.5 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/buffer.c,v 1.6 2006/12/20 18:14:41 dillon Exp $");
#define SNDBUF_NAMELEN 48
struct snd_dbuf {
struct snd_dbuf *b;
b = kmalloc(sizeof(*b), M_DEVBUF, M_WAITOK | M_ZERO);
- snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", drv, desc);
+ ksnprintf(b->name, SNDBUF_NAMELEN, "%s:%s", drv, desc);
b->dev = dev;
return b;
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pcm/fake.c,v 1.4.2.5 2002/04/22 15:49:36 cg Exp $
- * $DragonFly: src/sys/dev/sound/pcm/fake.c,v 1.3 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pcm/fake.c,v 1.4 2006/12/20 18:14:41 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/fake.c,v 1.3 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/fake.c,v 1.4 2006/12/20 18:14:41 dillon Exp $");
static u_int32_t fk_fmt[] = {
AFMT_U8,
c = kmalloc(sizeof(*c), M_DEVBUF, M_WAITOK);
c->methods = kobj_create(&fkchan_class, M_DEVBUF, M_WAITOK);
c->parentsnddev = d;
- snprintf(c->name, CHN_NAMELEN, "%s:fake", device_get_nameunit(dev));
+ ksnprintf(c->name, CHN_NAMELEN, "%s:fake", device_get_nameunit(dev));
return c;
}
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.4.2.8 2002/04/22 15:49:36 cg Exp $
- * $DragonFly: src/sys/dev/sound/pcm/mixer.c,v 1.12 2006/09/10 01:26:37 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pcm/mixer.c,v 1.13 2006/12/20 18:14:41 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include "mixer_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/mixer.c,v 1.12 2006/09/10 01:26:37 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/mixer.c,v 1.13 2006/12/20 18:14:41 dillon Exp $");
MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
int i, unit;
m = (struct snd_mixer *)kobj_create(cls, M_MIXER, M_WAITOK | M_ZERO);
- snprintf(m->name, MIXER_NAMELEN, "%s:mixer", device_get_nameunit(dev));
+ ksnprintf(m->name, MIXER_NAMELEN, "%s:mixer", device_get_nameunit(dev));
m->lock = snd_mtxcreate(m->name, "pcm mixer");
m->type = cls->name;
m->devinfo = devinfo;
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.17.2.14 2002/11/07 23:17:18 cognet Exp $
- * $DragonFly: src/sys/dev/sound/pcm/sound.c,v 1.6 2006/09/05 00:55:43 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pcm/sound.c,v 1.7 2006/12/20 18:14:41 dillon Exp $
*/
#include <dev/sound/pcm/sound.h>
#include "feeder_if.h"
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/sound.c,v 1.6 2006/09/05 00:55:43 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/sound.c,v 1.7 2006/12/20 18:14:41 dillon Exp $");
struct snddev_channel {
SLIST_ENTRY(snddev_channel) link;
ch->parentsnddev = d;
ch->parentchannel = parent;
ch->dev = d->dev;
- snprintf(ch->name, 32, "%s:%s:%d", device_get_nameunit(d->dev), dirs, ch->num);
+ ksnprintf(ch->name, 32, "%s:%s:%d", device_get_nameunit(d->dev), dirs, ch->num);
err = chn_init(ch, devinfo, dir);
if (err) {
/* $NetBSD: uaudio.c,v 1.41 2001/01/23 14:04:13 augustss Exp $ */
/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.6.2.2 2002/11/06 21:18:17 joe Exp $: */
-/* $DragonFly: src/sys/dev/sound/usb/uaudio.c,v 1.8 2006/09/05 00:55:43 dillon Exp $: */
+/* $DragonFly: src/sys/dev/sound/usb/uaudio.c,v 1.9 2006/12/20 18:14:41 dillon Exp $: */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
uaudio_id_name(struct uaudio_softc *sc, usb_descriptor_t **dps, int id)
{
static char buf[32];
- sprintf(buf, "i%d", id);
+ ksprintf(buf, "i%d", id);
return (buf);
}
#endif
MAKE(p+c+1, o+1);
}
#if !defined(__DragonFly__)
- sprintf(mix.ctlname, "mix%d-%s", d->bUnitId,
+ ksprintf(mix.ctlname, "mix%d-%s", d->bUnitId,
uaudio_id_name(sc, dps, d->baSourceId[i]));
#endif
mix.nchan = chs;
#if defined(__DragonFly__)
mix.ctl = SOUND_MIXER_NRDEVICES;
#else
- sprintf(mix.ctlname, "fea%d-%s-%s", unit,
+ ksprintf(mix.ctlname, "fea%d-%s-%s", unit,
uaudio_id_name(sc, dps, srcId),
AudioNmute);
mix.ctlunit = "";
/* mix.ctl = SOUND_MIXER_VOLUME; */
mix.ctl = SOUND_MIXER_PCM;
#else
- sprintf(mix.ctlname, "fea%d-%s-%s", unit,
+ ksprintf(mix.ctlname, "fea%d-%s-%s", unit,
uaudio_id_name(sc, dps, srcId),
AudioNmaster);
mix.ctlunit = AudioNvolume;
#if defined(__DragonFly__)
mix.ctl = SOUND_MIXER_BASS;
#else
- sprintf(mix.ctlname, "fea%d-%s-%s", unit,
+ ksprintf(mix.ctlname, "fea%d-%s-%s", unit,
uaudio_id_name(sc, dps, srcId),
AudioNbass);
mix.ctlunit = AudioNbass;
#if defined(__DragonFly__)
mix.ctl = SOUND_MIXER_NRDEVICES; /* XXXXX */
#else
- sprintf(mix.ctlname, "fea%d-%s-%s", unit,
+ ksprintf(mix.ctlname, "fea%d-%s-%s", unit,
uaudio_id_name(sc, dps, srcId),
AudioNmid);
mix.ctlunit = AudioNmid;
#if defined(__DragonFly__)
mix.ctl = SOUND_MIXER_TREBLE;
#else
- sprintf(mix.ctlname, "fea%d-%s-%s", unit,
+ ksprintf(mix.ctlname, "fea%d-%s-%s", unit,
uaudio_id_name(sc, dps, srcId),
AudioNtreble);
mix.ctlunit = AudioNtreble;
#if defined(__DragonFly__)
mix.ctl = SOUND_MIXER_NRDEVICES; /* XXXXX */
#else
- sprintf(mix.ctlname, "fea%d-%s-%s", unit,
+ ksprintf(mix.ctlname, "fea%d-%s-%s", unit,
uaudio_id_name(sc, dps, srcId),
AudioNagc);
mix.ctlunit = "";
#if defined(__DragonFly__)
mix.ctl = SOUND_MIXER_NRDEVICES; /* XXXXX */
#else
- sprintf(mix.ctlname, "fea%d-%s-%s", unit,
+ ksprintf(mix.ctlname, "fea%d-%s-%s", unit,
uaudio_id_name(sc, dps, srcId),
AudioNdelay);
mix.ctlunit = "4 ms";
#if defined(__DragonFly__)
mix.ctl = SOUND_MIXER_NRDEVICES; /* XXXXX */
#else
- sprintf(mix.ctlname, "fea%d-%s-%s", unit,
+ ksprintf(mix.ctlname, "fea%d-%s-%s", unit,
uaudio_id_name(sc, dps, srcId),
AudioNbassboost);
mix.ctlunit = "";
#if defined(__DragonFly__)
mix.ctl = SOUND_MIXER_LOUD; /* Is this correct ? */
#else
- sprintf(mix.ctlname, "fea%d-%s-%s", unit,
+ ksprintf(mix.ctlname, "fea%d-%s-%s", unit,
uaudio_id_name(sc, dps, srcId),
AudioNloudness);
mix.ctlunit = "";
mix.type = MIX_ON_OFF; /* XXX */
#if !defined(__DragonFly__)
mix.ctlunit = "";
- sprintf(mix.ctlname, "pro%d-mode", d->bUnitId);
+ ksprintf(mix.ctlname, "pro%d-mode", d->bUnitId);
#endif
for (i = 0; i < ud->bNrModes; i++) {
mix.type = MIX_ON_OFF;
#if !defined(__DragonFly__)
mix.ctlunit = "";
- sprintf(mix.ctlname, "pro%d.%d-enable", d->bUnitId, ptype);
+ ksprintf(mix.ctlname, "pro%d.%d-enable", d->bUnitId, ptype);
#endif
uaudio_mixer_add_ctl(sc, &mix);
}
mix.type = MIX_ON_OFF;
#if !defined(__DragonFly__)
mix.ctlunit = "";
- sprintf(mix.ctlname, "ext%d-enable", d->bUnitId);
+ ksprintf(mix.ctlname, "ext%d-enable", d->bUnitId);
#endif
uaudio_mixer_add_ctl(sc, &mix);
}
/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.1.2.1 2002/08/24 08:03:07 nsayer Exp $ */
-/* $DragonFly: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.4 2006/09/30 21:10:19 swildner Exp $ */
+/* $DragonFly: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.5 2006/12/20 18:14:41 dillon Exp $ */
/*
* Copyright (c) 2000-2002 Hiroyuki Aizu <aizu@navi.org>
return(ENXIO);
}
- snprintf(status, SND_STATUSLEN, "at addr ?");
+ ksnprintf(status, SND_STATUSLEN, "at addr ?");
if (pcm_register(dev, ua, 1, 0)) {
return(ENXIO);
* POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/usb/udbp.c,v 1.24 2003/08/24 17:55:55 obrien Exp $
- * $DragonFly: src/sys/dev/usbmisc/udbp/Attic/udbp.c,v 1.8 2006/10/25 20:56:02 dillon Exp $
+ * $DragonFly: src/sys/dev/usbmisc/udbp/Attic/udbp.c,v 1.9 2006/12/20 18:14:41 dillon Exp $
*/
/* Driver for arbitrary double bulk pipe devices.
if ((err = ng_make_node_common(&ng_udbp_typestruct, &sc->node)) == 0) {
char nodename[128];
- sprintf(nodename, "%s", USBDEVNAME(sc->sc_dev));
+ ksprintf(nodename, "%s", USBDEVNAME(sc->sc_dev));
if ((err = ng_name_node(sc->node, nodename))) {
NG_NODE_UNREF(sc->node);
sc->node = NULL;
if ((err = ng_make_node_common(&ng_udbp_typestruct, &sc->node)) == 0) {
char nodename[128];
- sprintf(nodename, "%s", USBDEVNAME(sc->sc_dev));
+ ksprintf(nodename, "%s", USBDEVNAME(sc->sc_dev));
if ((err = ng_name_node(sc->node, nodename))) {
NG_NODE_UNREF(sc->node); /* out damned spot! */
sc->flags &= ~NETGRAPH_INITIALISED;
*
* $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
* $FreeBSD: src/sys/dev/usb/umass.c,v 1.96 2003/12/19 12:19:11 sanpei Exp $
- * $DragonFly: src/sys/dev/usbmisc/umass/umass.c,v 1.18 2006/09/05 00:55:44 dillon Exp $
+ * $DragonFly: src/sys/dev/usbmisc/umass/umass.c,v 1.19 2006/12/20 18:14:41 dillon Exp $
*/
/*
s1[0] = '\0';
s3[0] = '\0';
- sprintf(s2, " buffer=%p, buflen=%d", buffer, buflen);
+ ksprintf(s2, " buffer=%p, buflen=%d", buffer, buflen);
for (i = 0; i < buflen && i < printlen; i++) {
j = i % 16;
if (j == 0 && i != 0) {
USBDEVNAME(sc->sc_dev), s1, s2));
s2[0] = '\0';
}
- sprintf(&s1[j*2], "%02x", buffer[i] & 0xff);
+ ksprintf(&s1[j*2], "%02x", buffer[i] & 0xff);
}
if (buflen > printlen)
- sprintf(s3, " ...");
+ ksprintf(s3, " ...");
DPRINTF(UDMASS_GEN, ("%s: 0x %s%s%s\n",
USBDEVNAME(sc->sc_dev), s1, s2, s3));
}
* POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.13 2003/12/08 07:59:18 obrien Exp $
- * $DragonFly: src/sys/dev/video/bktr/bktr_audio.c,v 1.7 2006/10/25 20:56:02 dillon Exp $
+ * $DragonFly: src/sys/dev/video/bktr/bktr_audio.c,v 1.8 2006/12/20 18:14:41 dillon Exp $
*/
/*
rev1 = msp_dpl_read(bktr, bktr->msp_addr, 0x12, 0x001e);
rev2 = msp_dpl_read(bktr, bktr->msp_addr, 0x12, 0x001f);
- sprintf(bktr->msp_version_string, "34%02d%c-%c%d",
+ ksprintf(bktr->msp_version_string, "34%02d%c-%c%d",
(rev2>>8)&0xff, (rev1&0xff)+'@', ((rev1>>8)&0xff)+'@', rev2&0x1f);
}
rev1 = msp_dpl_read(bktr, bktr->dpl_addr, 0x12, 0x001e);
rev2 = msp_dpl_read(bktr, bktr->dpl_addr, 0x12, 0x001f);
- sprintf(bktr->dpl_version_string, "34%02d%c-%c%d",
+ ksprintf(bktr->dpl_version_string, "34%02d%c-%c%d",
((rev2>>8)&0xff)-1, (rev1&0xff)+'@', ((rev1>>8)&0xff)+'@', rev2&0x1f);
}
* POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.45 2004/03/17 17:50:28 njl Exp $
- * $DragonFly: src/sys/dev/video/bktr/bktr_os.c,v 1.16 2006/10/25 20:56:02 dillon Exp $
+ * $DragonFly: src/sys/dev/video/bktr/bktr_os.c,v 1.17 2006/12/20 18:14:41 dillon Exp $
*/
/*
unit = device_get_unit(dev);
/* build the device name for bktr_name() */
- snprintf(bktr->bktr_xname, sizeof(bktr->bktr_xname), "bktr%d",unit);
+ ksnprintf(bktr->bktr_xname, sizeof(bktr->bktr_xname), "bktr%d",unit);
/*
* Enable bus mastering and Memory Mapped device
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/bktr/msp34xx.c,v 1.5 2004/12/16 23:19:57 julian Exp
- * $DragonFly: src/sys/dev/video/bktr/msp34xx.c,v 1.5 2006/10/25 20:56:02 dillon Exp $
+ * $DragonFly: src/sys/dev/video/bktr/msp34xx.c,v 1.6 2006/12/20 18:14:41 dillon Exp $
*/
/*
kfree(msp, M_DEVBUF);
return ENOMEM;
}
- snprintf(msp->threaddesc, 14, "%s_msp34xx_thread", bktr->bktr_xname);
+ ksnprintf(msp->threaddesc, 14, "%s_msp34xx_thread", bktr->bktr_xname);
for (i = 0; i < DFP_COUNT; i++)
msp->dfp_regs[i] = -1;
msp3400c_write(bktr,I2C_MSP3400C_DFP, 0x0014, 0x1040);
#endif
- sprintf(buf,"MSP34%02d%c-%c%d",
+ ksprintf(buf,"MSP34%02d%c-%c%d",
(rev2>>8)&0xff, (rev1&0xff)+'@', ((rev1>>8)&0xff)+'@', rev2&0x1f);
msp->nicam = (((rev2>>8)&0xff) != 00) ? 1 : 0;
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/i386/isa/gsc.c,v 1.35.2.1 2000/08/08 19:49:53 peter Exp $
- * $DragonFly: src/sys/dev/video/gsc/gsc.c,v 1.13 2006/09/10 01:26:38 dillon Exp $
+ * $DragonFly: src/sys/dev/video/gsc/gsc.c,v 1.14 2006/12/20 18:14:41 dillon Exp $
*
*/
char *p;
int width = geomtab[scu->geometry].dpl;
- sprintf(scu->sbuf.base,"P4 %d %d\n", width, scu->height);
+ ksprintf(scu->sbuf.base,"P4 %d %d\n", width, scu->height);
scu->bcount = scu->height * width / 8;
lprintf(("gsc%d.read: initializing pbm mode: `%s', bcount: 0x%x\n",
* @(#)procfs_status.c 8.4 (Berkeley) 6/15/94
*
* $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs_misc.c,v 1.3.2.8 2001/06/25 19:46:47 pirzyk Exp $
- * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c,v 1.14 2006/01/06 15:01:38 joerg Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c,v 1.15 2006/12/20 18:14:41 dillon Exp $
*/
#include <sys/param.h>
cached = vmstats.v_cache_count * PAGE_SIZE;
ps = psbuf;
- ps += sprintf(ps,
+ ps += ksprintf(ps,
" total: used: free: shared: buffers: cached:\n"
"Mem: %lu %lu %lu %lu %lu %lu\n"
"Swap: %llu %llu %llu\n"
}
ps = psbuf;
- ps += sprintf(ps,
+ ps += ksprintf(ps,
"processor\t: %d\n"
"vendor_id\t: %.20s\n"
"cpu family\t: %d\n"
"stepping\t: %d\n",
0, cpu_vendor, class, cpu, cpu_id & 0xf);
- ps += sprintf(ps,
+ ps += ksprintf(ps,
"flags\t\t:");
if (!strcmp(cpu_vendor, "AuthenticAMD") && (class < 6)) {
for (i = 0; i < 32; i++)
if (cpu_feature & (1 << i))
- ps += sprintf(ps, " %s", flags[i]);
- ps += sprintf(ps, "\n");
+ ps += ksprintf(ps, " %s", flags[i]);
+ ps += ksprintf(ps, "\n");
if (class >= 5) {
- ps += sprintf(ps,
+ ps += ksprintf(ps,
"cpu MHz\t\t: %d.%02d\n"
"bogomips\t: %d.%02d\n",
(tsc_freq + 4999) / 1000000,
char psbuf[512];
ps = psbuf;
- ps += sprintf(ps,
+ ps += ksprintf(ps,
"cpu %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64"\n"
"disk 0 0 0 0\n"
"page %u %u\n"
getmicrouptime(&tv);
ps = psbuf;
- ps += sprintf(ps, "%ld.%02ld %"PRIu64".%02"PRIu64"\n",
+ ps += ksprintf(ps, "%ld.%02ld %"PRIu64".%02"PRIu64"\n",
tv.tv_sec, tv.tv_usec / 10000,
T2S(cpu_time.cp_idle), T2J(cpu_time.cp_idle) % 100);
return (uiomove_frombuf(psbuf, ps - psbuf, uio));
char *ps, psbuf[1024];
ps = psbuf;
- ps += sprintf(ps, "%d", p->p_pid);
-#define PS_ADD(name, fmt, arg) ps += sprintf(ps, " " fmt, arg)
+ ps += ksprintf(ps, "%d", p->p_pid);
+#define PS_ADD(name, fmt, arg) ps += ksprintf(ps, " " fmt, arg)
PS_ADD("comm", "(%s)", p->p_comm);
PS_ADD("statr", "%c", '0'); /* XXX */
PS_ADD("ppid", "%d", p->p_pptr ? p->p_pptr->p_pid : 0);
PS_ADD("sigcatch", "%d", 0); /* XXX */
PS_ADD("wchan", "%u", 0); /* XXX */
#undef PS_ADD
- ps += sprintf(ps, "\n");
+ ps += ksprintf(ps, "\n");
return (uiomove_frombuf(psbuf, ps - psbuf, uio));
}
else
state = state_str[(int)p->p_stat];
-#define PS_ADD ps += sprintf
+#define PS_ADD ps += ksprintf
PS_ADD(ps, "Name:\t%s\n", p->p_comm); /* XXX escape */
PS_ADD(ps, "State:\t%s\n", state);
char *ps, psbuf[512];
ps = psbuf;
- ps += sprintf(ps, "%d.%02d %d.%02d %d.%02d %d/%d %d\n",
+ ps += ksprintf(ps, "%d.%02d %d.%02d %d.%02d %d/%d %d\n",
(int)(averunnable.ldavg[0] / averunnable.fscale),
(int)(averunnable.ldavg[0] * 100 / averunnable.fscale % 100),
(int)(averunnable.ldavg[1] / averunnable.fscale),
* @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95
*
* $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs_vnops.c,v 1.3.2.5 2001/08/12 14:29:19 rwatson Exp $
- * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c,v 1.37 2006/11/07 20:48:13 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c,v 1.38 2006/12/20 18:14:41 dillon Exp $
*/
/*
vap->va_uid = 0;
vap->va_gid = 0;
vap->va_size = vap->va_bytes =
- snprintf(buf, sizeof(buf), "%ld", (long)curproc->p_pid);
+ ksnprintf(buf, sizeof(buf), "%ld", (long)curproc->p_pid);
break;
}
return(0);
}
d_ino = PROCFS_FILENO(p->p_pid, Pproc);
- d_namlen = snprintf(d_name_pid, sizeof(d_name_pid),
+ d_namlen = ksnprintf(d_name_pid, sizeof(d_name_pid),
"%ld", (long)p->p_pid);
d_name = d_name_pid;
d_type = DT_DIR;
if (pfs->pfs_fileno != PROCFS_FILENO(0, Pself))
return (EINVAL);
- len = snprintf(buf, sizeof(buf), "%ld", (long)curproc->p_pid);
+ len = ksnprintf(buf, sizeof(buf), "%ld", (long)curproc->p_pid);
return (uiomove(buf, len, ap->a_uio));
/*
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.55.2.11 2003/05/01 20:16:09 anholt Exp $
- * $DragonFly: src/sys/emulation/linux/linux_ioctl.c,v 1.20 2006/06/05 07:26:09 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/linux_ioctl.c,v 1.21 2006/12/20 18:14:41 dillon Exp $
*/
#include <sys/param.h>
ethno = 0;
TAILQ_FOREACH(ifscan, &ifnet, if_link) {
if (ifscan == ifp)
- return (snprintf(buffer, buflen, "eth%d", ethno));
+ return (ksnprintf(buffer, buflen, "eth%d", ethno));
if (IFP_IS_ETH(ifscan))
ethno++;
}
bzero(&ifr, sizeof ifr);
if (IFP_IS_ETH(ifp))
- snprintf(ifr.ifr_name, LINUX_IFNAMSIZ, "eth%d",
+ ksnprintf(ifr.ifr_name, LINUX_IFNAMSIZ, "eth%d",
ethno++);
else
strlcpy(ifr.ifr_name, ifp->if_xname, LINUX_IFNAMSIZ);
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.57 2004/07/11 00:19:30 wpaul Exp $
- * $DragonFly: src/sys/emulation/ndis/kern_ndis.c,v 1.13 2006/10/25 20:56:02 dillon Exp $
+ * $DragonFly: src/sys/emulation/ndis/kern_ndis.c,v 1.14 2006/12/20 18:14:41 dillon Exp $
*/
#include <sys/param.h>
"NDIS API Version", "0x00050001", CTLFLAG_RD);
/* Bus type (PCI, PCMCIA, etc...) */
- sprintf(buf, "%d", (int)sc->ndis_iftype);
+ ksprintf(buf, "%d", (int)sc->ndis_iftype);
ndis_add_sysctl(sc, "BusType", "Bus Type", buf, CTLFLAG_RD);
if (sc->ndis_res_io != NULL) {
- sprintf(buf, "0x%lx", rman_get_start(sc->ndis_res_io));
+ ksprintf(buf, "0x%lx", rman_get_start(sc->ndis_res_io));
ndis_add_sysctl(sc, "IOBaseAddress",
"Base I/O Address", buf, CTLFLAG_RD);
}
if (sc->ndis_irq != NULL) {
- sprintf(buf, "%lu", rman_get_start(sc->ndis_irq));
+ ksprintf(buf, "%lu", rman_get_start(sc->ndis_irq));
ndis_add_sysctl(sc, "InterruptNumber",
"Interrupt Number", buf, CTLFLAG_RD);
}
cfg = kmalloc(sizeof(struct ndis_cfglist), M_DEVBUF, M_WAITOK|M_ZERO);
cfg->ndis_cfg.nc_cfgkey = kstrdup(key, M_DEVBUF);
if (desc == NULL) {
- snprintf(descstr, sizeof(descstr), "%s (dynamic)", key);
+ ksnprintf(descstr, sizeof(descstr), "%s (dynamic)", key);
cfg->ndis_cfg.nc_cfgdesc = kstrdup(descstr, M_DEVBUF);
} else
cfg->ndis_cfg.nc_cfgdesc = kstrdup(desc, M_DEVBUF);
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.62 2004/07/11 00:19:30 wpaul Exp $
- * $DragonFly: src/sys/emulation/ndis/subr_ndis.c,v 1.17 2006/10/25 20:56:02 dillon Exp $
+ * $DragonFly: src/sys/emulation/ndis/subr_ndis.c,v 1.18 2006/12/20 18:14:41 dillon Exp $
*/
/*
kfree(astr, M_DEVBUF);
break;
case ndis_parm_int:
- sprintf(val, "%d", parm->ncp_parmdata.ncp_intdata);
+ ksprintf(val, "%d", parm->ncp_parmdata.ncp_intdata);
break;
case ndis_parm_hexint:
- sprintf(val, "%xu", parm->ncp_parmdata.ncp_intdata);
+ ksprintf(val, "%xu", parm->ncp_parmdata.ncp_intdata);
break;
default:
return(NDIS_STATUS_FAILURE);
ndis_unicode_to_ascii(filename->nus_buf,
filename->nus_len, &afilename);
- sprintf(path, "%s/%s", ndis_filepath, afilename);
+ ksprintf(path, "%s/%s", ndis_filepath, afilename);
kfree(afilename, M_DEVBUF);
fh = kmalloc(sizeof(ndis_fh), M_TEMP, M_WAITOK);
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.40 2004/07/20 20:28:57 wpaul Exp $
- * $DragonFly: src/sys/emulation/ndis/subr_ntoskrnl.c,v 1.11 2006/12/18 20:41:01 dillon Exp $
+ * $DragonFly: src/sys/emulation/ndis/subr_ntoskrnl.c,v 1.12 2006/12/20 18:14:41 dillon Exp $
*/
#include <sys/ctype.h>
tc->tc_thrctx = thrctx;
tc->tc_thrfunc = thrfunc;
- sprintf(tname, "windows kthread %d", ntoskrnl_kth);
+ ksprintf(tname, "windows kthread %d", ntoskrnl_kth);
error = kthread_create_stk(ntoskrnl_thrfunc, tc, &td,
NDIS_KSTACK_PAGES * PAGE_SIZE, tname);
*handle = td;
{ "RtlFreeAnsiString", (FUNC)ntoskrnl_free_ansi_string },
{ "RtlFreeUnicodeString", (FUNC)ntoskrnl_free_unicode_string },
{ "RtlUnicodeStringToInteger", (FUNC)ntoskrnl_unicode_to_int },
- { "sprintf", (FUNC)sprintf },
+ { "sprintf", (FUNC)ksprintf },
{ "vsprintf", (FUNC)kvsprintf },
- { "_snprintf", (FUNC)snprintf },
+ { "_snprintf", (FUNC)ksnprintf },
{ "_vsnprintf", (FUNC)kvsnprintf },
{ "DbgPrint", (FUNC)ntoskrnl_dbgprint },
{ "DbgBreakPoint", (FUNC)ntoskrnl_debugger },
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/kern/imgact_elf.c,v 1.73.2.13 2002/12/28 19:49:41 dillon Exp $
- * $DragonFly: src/sys/kern/imgact_elf.c,v 1.43 2006/10/27 04:56:31 dillon Exp $
+ * $DragonFly: src/sys/kern/imgact_elf.c,v 1.44 2006/12/20 18:14:41 dillon Exp $
*/
#include <sys/param.h>
imgp->proc->p_sysent = brand_info->sysvec;
if (interp != NULL) {
path = kmalloc(MAXPATHLEN, M_TEMP, M_WAITOK);
projects / dragonfly.git / commitdiff