summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/sbus/dma_sbus.c5
-rw-r--r--sys/dev/sbus/isp_sbus.c6
-rw-r--r--sys/dev/sbus/lebuffer.c5
-rw-r--r--sys/dev/sbus/qec.c5
-rw-r--r--sys/dev/sdmmc/sdhc.c6
-rw-r--r--sys/dev/sdmmc/sdmmc.c9
-rw-r--r--sys/dev/sdmmc/sdmmc_scsi.c17
-rw-r--r--sys/dev/systrace.c12
-rw-r--r--sys/dev/wscons/wsemul_vt100.c6
-rw-r--r--sys/dev/wscons/wsevent.c5
-rw-r--r--sys/dev/wscons/wskbd.c5
-rw-r--r--sys/dev/wsfont/wsfont.c15
12 files changed, 42 insertions, 54 deletions
diff --git a/sys/dev/sbus/dma_sbus.c b/sys/dev/sbus/dma_sbus.c
index e4b94a5cc05..48cb2bddac1 100644
--- a/sys/dev/sbus/dma_sbus.c
+++ b/sys/dev/sbus/dma_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma_sbus.c,v 1.13 2006/06/02 20:00:56 miod Exp $ */
+/* $OpenBSD: dma_sbus.c,v 1.14 2007/09/10 19:49:31 gilles Exp $ */
/* $NetBSD: dma_sbus.c,v 1.5 2000/07/09 20:57:42 pk Exp $ */
/*-
@@ -279,11 +279,10 @@ dma_alloc_bustag(struct dma_softc *sc)
{
struct sparc_bus_space_tag *sbt;
- sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT);
+ sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT|M_ZERO);
if (sbt == NULL)
return (NULL);
- bzero(sbt, sizeof *sbt);
sbt->cookie = sc;
sbt->parent = sc->sc_lsi64854.sc_bustag;
sbt->asi = sbt->parent->asi;
diff --git a/sys/dev/sbus/isp_sbus.c b/sys/dev/sbus/isp_sbus.c
index 35b9403240b..ea8aa78cfda 100644
--- a/sys/dev/sbus/isp_sbus.c
+++ b/sys/dev/sbus/isp_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_sbus.c,v 1.8 2006/06/02 20:00:56 miod Exp $ */
+/* $OpenBSD: isp_sbus.c,v 1.9 2007/09/10 19:49:31 gilles Exp $ */
/* $NetBSD: isp_sbus.c,v 1.46 2001/09/26 20:53:14 eeh Exp $ */
/*
@@ -380,12 +380,12 @@ isp_sbus_mbxdma(struct ispsoftc *isp)
return (0);
n = isp->isp_maxcmds * sizeof (XS_T *);
- isp->isp_xflist = (XS_T **) malloc(n, M_DEVBUF, M_WAITOK);
+ isp->isp_xflist = (XS_T **) malloc(n, M_DEVBUF, M_WAITOK|M_ZERO);
if (isp->isp_xflist == NULL) {
isp_prt(isp, ISP_LOGERR, "cannot alloc xflist array");
return (1);
}
- MEMZERO(isp->isp_xflist, n);
+
n = sizeof (bus_dmamap_t) * isp->isp_maxcmds;
sbc->sbus_dmamap = (bus_dmamap_t *) malloc(n, M_DEVBUF, M_WAITOK);
if (sbc->sbus_dmamap == NULL) {
diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c
index 4e9397295fd..1cc9f1cf2db 100644
--- a/sys/dev/sbus/lebuffer.c
+++ b/sys/dev/sbus/lebuffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lebuffer.c,v 1.6 2006/06/02 20:00:56 miod Exp $ */
+/* $OpenBSD: lebuffer.c,v 1.7 2007/09/10 19:49:31 gilles Exp $ */
/* $NetBSD: lebuffer.c,v 1.12 2002/03/11 16:00:57 pk Exp $ */
/*-
@@ -131,12 +131,11 @@ lebufattach(struct device *parent, struct device *self, void *aux)
sc->sc_burst &= sbusburst;
/* Allocate a bus tag */
- sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT);
+ sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT|M_ZERO);
if (sbt == NULL) {
printf("%s: attach: out of memory\n", self->dv_xname);
return;
}
- bzero(sbt, sizeof(*sbt));
printf(": %dK memory\n", sc->sc_bufsiz / 1024);
diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c
index 5f118c0b5a3..bc699718374 100644
--- a/sys/dev/sbus/qec.c
+++ b/sys/dev/sbus/qec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qec.c,v 1.10 2006/06/02 20:00:56 miod Exp $ */
+/* $OpenBSD: qec.c,v 1.11 2007/09/10 19:49:31 gilles Exp $ */
/* $NetBSD: qec.c,v 1.12 2000/12/04 20:12:55 fvdl Exp $ */
/*-
@@ -192,13 +192,12 @@ qecattach(parent, self, aux)
}
/* Allocate a bus tag */
- sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT);
+ sbt = malloc(sizeof(*sbt), M_DEVBUF, M_NOWAIT|M_ZERO);
if (sbt == NULL) {
printf("%s: attach: out of memory\n", self->dv_xname);
return;
}
- bzero(sbt, sizeof *sbt);
strlcpy(sbt->name, sc->sc_dev.dv_xname, sizeof(sbt->name));
sbt->cookie = sc;
sbt->parent = sc->sc_bustag;
diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c
index 52220e17205..78ebdf4009e 100644
--- a/sys/dev/sdmmc/sdhc.c
+++ b/sys/dev/sdmmc/sdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdhc.c,v 1.22 2007/09/06 08:01:01 jsg Exp $ */
+/* $OpenBSD: sdhc.c,v 1.23 2007/09/10 19:49:31 gilles Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -155,7 +155,7 @@ sdhc_host_found(struct sdhc_softc *sc, bus_space_tag_t iot,
/* Allocate one more host structure. */
sc->sc_nhosts++;
- MALLOC(hp, struct sdhc_host *, sizeof(struct sdhc_host),
+ hp = (struct sdhc_host *)malloc(sizeof(struct sdhc_host),
M_DEVBUF, M_WAITOK);
sc->sc_host[sc->sc_nhosts - 1] = hp;
@@ -246,7 +246,7 @@ sdhc_host_found(struct sdhc_softc *sc, bus_space_tag_t iot,
return 0;
err:
- FREE(hp, M_DEVBUF);
+ free(hp, M_DEVBUF);
sc->sc_host[sc->sc_nhosts - 1] = NULL;
sc->sc_nhosts--;
return (error);
diff --git a/sys/dev/sdmmc/sdmmc.c b/sys/dev/sdmmc/sdmmc.c
index 1c2e5145e09..c4948cfa0f2 100644
--- a/sys/dev/sdmmc/sdmmc.c
+++ b/sys/dev/sdmmc/sdmmc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc.c,v 1.12 2007/05/31 10:09:01 uwe Exp $ */
+/* $OpenBSD: sdmmc.c,v 1.13 2007/09/10 19:49:31 gilles Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -419,9 +419,8 @@ sdmmc_function_alloc(struct sdmmc_softc *sc)
{
struct sdmmc_function *sf;
- MALLOC(sf, struct sdmmc_function *, sizeof *sf, M_DEVBUF,
- M_WAITOK);
- bzero(sf, sizeof *sf);
+ sf = (struct sdmmc_function *)malloc(sizeof *sf, M_DEVBUF,
+ M_WAITOK|M_ZERO);
sf->sc = sc;
sf->number = -1;
sf->cis.manufacturer = SDMMC_VENDOR_INVALID;
@@ -433,7 +432,7 @@ sdmmc_function_alloc(struct sdmmc_softc *sc)
void
sdmmc_function_free(struct sdmmc_function *sf)
{
- FREE(sf, M_DEVBUF);
+ free(sf, M_DEVBUF);
}
/*
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index 0a476127478..8a49dd3c2ce 100644
--- a/sys/dev/sdmmc/sdmmc_scsi.c
+++ b/sys/dev/sdmmc/sdmmc_scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc_scsi.c,v 1.7 2006/11/28 23:59:45 dlg Exp $ */
+/* $OpenBSD: sdmmc_scsi.c,v 1.8 2007/09/10 19:49:31 gilles Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -99,14 +99,11 @@ sdmmc_scsi_attach(struct sdmmc_softc *sc)
struct sdmmc_scsi_softc *scbus;
struct sdmmc_function *sf;
- MALLOC(scbus, struct sdmmc_scsi_softc *,
- sizeof *scbus, M_DEVBUF, M_WAITOK);
- bzero(scbus, sizeof *scbus);
+ scbus = (struct sdmmc_scsi_softc *)malloc(sizeof *scbus,
+ M_DEVBUF, M_WAITOK|M_ZERO);
- MALLOC(scbus->sc_tgt, struct sdmmc_scsi_target *,
- sizeof(*scbus->sc_tgt) * (SDMMC_SCSIID_MAX+1),
- M_DEVBUF, M_WAITOK);
- bzero(scbus->sc_tgt, sizeof(*scbus->sc_tgt) * (SDMMC_SCSIID_MAX+1));
+ scbus->sc_tgt = (struct sdmmc_scsi_target *)malloc(sizeof(*scbus->sc_tgt) *
+ (SDMMC_SCSIID_MAX+1), M_DEVBUF, M_WAITOK|M_ZERO);
/*
* Each card that sent us a CID in the identification stage
@@ -178,10 +175,10 @@ sdmmc_scsi_detach(struct sdmmc_softc *sc)
config_detach(scbus->sc_child, DETACH_FORCE);
if (scbus->sc_tgt != NULL)
- FREE(scbus->sc_tgt, M_DEVBUF);
+ free(scbus->sc_tgt, M_DEVBUF);
sdmmc_free_ccbs(scbus);
- FREE(scbus, M_DEVBUF);
+ free(scbus, M_DEVBUF);
sc->sc_scsibus = NULL;
}
diff --git a/sys/dev/systrace.c b/sys/dev/systrace.c
index 2ab5a06512c..5546815917c 100644
--- a/sys/dev/systrace.c
+++ b/sys/dev/systrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: systrace.c,v 1.44 2007/03/15 10:22:30 art Exp $ */
+/* $OpenBSD: systrace.c,v 1.45 2007/09/10 19:49:31 gilles Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -494,7 +494,7 @@ systracef_close(fp, p)
vrele(fst->fd_rdir);
rw_exit_write(&fst->lock);
- FREE(fp->f_data, M_XDATA);
+ free(fp->f_data, M_XDATA);
fp->f_data = NULL;
return (0);
@@ -562,10 +562,8 @@ systraceioctl(dev, cmd, data, flag, p)
switch (cmd) {
case STRIOCCLONE:
- MALLOC(fst, struct fsystrace *, sizeof(struct fsystrace),
- M_XDATA, M_WAITOK);
-
- memset(fst, 0, sizeof(struct fsystrace));
+ fst = (struct fsystrace *)malloc(sizeof(struct fsystrace),
+ M_XDATA, M_WAITOK|M_ZERO);
rw_init(&fst->lock, "systrace");
TAILQ_INIT(&fst->processes);
TAILQ_INIT(&fst->messages);
@@ -578,7 +576,7 @@ systraceioctl(dev, cmd, data, flag, p)
error = falloc(p, &f, &fd);
if (error) {
- FREE(fst, M_XDATA);
+ free(fst, M_XDATA);
return (error);
}
f->f_flag = FREAD | FWRITE;
diff --git a/sys/dev/wscons/wsemul_vt100.c b/sys/dev/wscons/wsemul_vt100.c
index 26a29c6bdf4..a59894075f6 100644
--- a/sys/dev/wscons/wsemul_vt100.c
+++ b/sys/dev/wscons/wsemul_vt100.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_vt100.c,v 1.18 2007/02/14 01:12:16 jsg Exp $ */
+/* $OpenBSD: wsemul_vt100.c,v 1.19 2007/09/10 19:49:31 gilles Exp $ */
/* $NetBSD: wsemul_vt100.c,v 1.13 2000/04/28 21:56:16 mycroft Exp $ */
/*
@@ -214,9 +214,7 @@ wsemul_vt100_attach(console, type, cookie, ccol, crow, cbcookie, defattr)
edp->cbcookie = cbcookie;
edp->tabs = malloc(edp->ncols, M_DEVBUF, M_NOWAIT);
- edp->dblwid = malloc(edp->nrows, M_DEVBUF, M_NOWAIT);
- if (edp->dblwid != NULL)
- memset(edp->dblwid, 0, edp->nrows);
+ edp->dblwid = malloc(edp->nrows, M_DEVBUF, M_NOWAIT|M_ZERO);
edp->dw = 0;
edp->dcsarg = malloc(DCS_MAXLEN, M_DEVBUF, M_NOWAIT);
edp->isolatin1tab = malloc(128 * sizeof(int), M_DEVBUF, M_NOWAIT);
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index ea030c1534c..fe35b9c7b08 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsevent.c,v 1.5 2005/11/21 18:16:45 millert Exp $ */
+/* $OpenBSD: wsevent.c,v 1.6 2007/09/10 19:49:31 gilles Exp $ */
/* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */
/*
@@ -104,8 +104,7 @@ wsevent_init(struct wseventvar *ev)
}
ev->get = ev->put = 0;
ev->q = malloc((u_long)WSEVENT_QSIZE * sizeof(struct wscons_event),
- M_DEVBUF, M_WAITOK);
- bzero((caddr_t)ev->q, WSEVENT_QSIZE * sizeof(struct wscons_event));
+ M_DEVBUF, M_WAITOK|M_ZERO);
}
/*
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index b57f8600298..3946b70c3f5 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbd.c,v 1.56 2007/06/02 07:19:28 tedu Exp $ */
+/* $OpenBSD: wskbd.c,v 1.57 2007/09/10 19:49:31 gilles Exp $ */
/* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */
/*
@@ -385,8 +385,7 @@ wskbd_attach(struct device *parent, struct device *self, void *aux)
sc->id = &wskbd_console_data;
} else {
sc->id = malloc(sizeof(struct wskbd_internal),
- M_DEVBUF, M_WAITOK);
- bzero(sc->id, sizeof(struct wskbd_internal));
+ M_DEVBUF, M_WAITOK|M_ZERO);
sc->id->t_keymap = ap->keymap;
wskbd_update_layout(sc->id, ap->keymap->layout);
}
diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index 35fcafa5880..2bd7287a5ad 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsfont.c,v 1.20 2006/08/06 16:00:46 miod Exp $ */
+/* $OpenBSD: wsfont.c,v 1.21 2007/09/10 19:49:31 gilles Exp $ */
/* $NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $ */
/*-
@@ -476,7 +476,7 @@ wsfont_add(font, copy)
return (-1);
}
- MALLOC(ent, struct font *, sizeof *ent, M_DEVBUF, M_WAITOK);
+ ent = (struct font *)malloc(sizeof *ent, M_DEVBUF, M_WAITOK);
ent->lockcount = 0;
ent->flg = 0;
@@ -489,12 +489,13 @@ wsfont_add(font, copy)
ent->font = font;
ent->flg = WSFONT_STATIC;
} else {
- MALLOC(ent->font, struct wsdisplay_font *, sizeof *ent->font,
+ ent->font = (struct wsdisplay_font *)malloc(sizeof *ent->font,
M_DEVBUF, M_WAITOK);
+
memcpy(ent->font, font, sizeof(*ent->font));
size = font->fontheight * font->numchars * font->stride;
- MALLOC(ent->font->data, void *, size, M_DEVBUF, M_WAITOK);
+ ent->font->data = (void *)malloc(size, M_DEVBUF, M_WAITOK);
memcpy(ent->font->data, font->data, size);
ent->flg = 0;
}
@@ -530,8 +531,8 @@ wsfont_remove(cookie)
/* Don't free statically allocated font data */
if ((ent->flg & WSFONT_STATIC) != 0) {
- FREE(ent->font->data, M_DEVBUF);
- FREE(ent->font, M_DEVBUF);
+ free(ent->font->data, M_DEVBUF);
+ free(ent->font, M_DEVBUF);
}
/* Remove from list, free entry */
@@ -543,7 +544,7 @@ wsfont_remove(cookie)
if (ent->next)
ent->next->prev = ent->prev;
- FREE(ent, M_DEVBUF);
+ free(ent, M_DEVBUF);
splx(s);
return (0);
}
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.