CVS commit: src/sys/arch/mvmeppc/mvmeppc
Module Name:src Committed By: thorpej Date: Sat Nov 21 17:57:40 UTC 2020 Modified Files: src/sys/arch/mvmeppc/mvmeppc: mainbus.c Log Message: malloc(9) -> kmem(9) To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mvmeppc/mvmeppc/mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mvmeppc/mvmeppc/mainbus.c diff -u src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.19 src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.20 --- src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.19 Tue Jul 7 03:38:47 2020 +++ src/sys/arch/mvmeppc/mvmeppc/mainbus.c Sat Nov 21 17:57:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.19 2020/07/07 03:38:47 thorpej Exp $ */ +/* $NetBSD: mainbus.c,v 1.20 2020/11/21 17:57:40 thorpej Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -31,12 +31,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.19 2020/07/07 03:38:47 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.20 2020/11/21 17:57:40 thorpej Exp $"); #include #include #include -#include +#include #include #include @@ -107,12 +107,10 @@ mainbus_attach(device_t parent, device_t * XXX that's not currently possible. */ #if NPCI > 0 - genppc_pct = malloc(sizeof(struct genppc_pci_chipset), M_DEVBUF, - M_WAITOK); + genppc_pct = kmem_alloc(sizeof(struct genppc_pci_chipset), KM_SLEEP); mvmeppc_pci_get_chipset_tag(genppc_pct); - pbi = malloc(sizeof(struct genppc_pci_chipset_businfo), - M_DEVBUF, M_WAITOK); + pbi = kmem_alloc(sizeof(struct genppc_pci_chipset_businfo), KM_SLEEP); pbi->pbi_properties = prop_dictionary_create(); KASSERT(pbi->pbi_properties != NULL);
CVS commit: src/sys/arch/mvmeppc/mvmeppc
Module Name:src
Committed By: mlelstv
Date: Sun Apr 3 11:04:14 UTC 2016
Modified Files:
src/sys/arch/mvmeppc/mvmeppc: mainbus.c
Log Message:
Use symbolic constant. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvmeppc/mvmeppc/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvmeppc/mvmeppc/mainbus.c
diff -u src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.15 src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.16
--- src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.15 Fri Jan 27 18:52:59 2012
+++ src/sys/arch/mvmeppc/mvmeppc/mainbus.c Sun Apr 3 11:04:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.15 2012/01/27 18:52:59 para Exp $ */
+/* $NetBSD: mainbus.c,v 1.16 2016/04/03 11:04:14 mlelstv Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.15 2012/01/27 18:52:59 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16 2016/04/03 11:04:14 mlelstv Exp $");
#include
#include
@@ -123,7 +123,7 @@ mainbus_attach(device_t parent, device_t
memext = extent_create("pcimem", 0x, 0x0fff,
NULL, 0, EX_NOWAIT);
- pci_configure_bus(0, ioext, memext, NULL, 0, 32);
+ pci_configure_bus(genppc_pct, ioext, memext, NULL, 0, CACHELINESIZE);
extent_destroy(ioext);
extent_destroy(memext);
CVS commit: src/sys/arch/mvmeppc/mvmeppc
Module Name:src Committed By: joerg Date: Thu Aug 7 09:08:41 UTC 2014 Modified Files: src/sys/arch/mvmeppc/mvmeppc: locore.S Log Message: Use cmpwi. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvmeppc/mvmeppc/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mvmeppc/mvmeppc/locore.S diff -u src/sys/arch/mvmeppc/mvmeppc/locore.S:1.15 src/sys/arch/mvmeppc/mvmeppc/locore.S:1.16 --- src/sys/arch/mvmeppc/mvmeppc/locore.S:1.15 Mon Jun 20 19:56:12 2011 +++ src/sys/arch/mvmeppc/mvmeppc/locore.S Thu Aug 7 09:08:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.15 2011/06/20 19:56:12 matt Exp $ */ +/* $NetBSD: locore.S,v 1.16 2014/08/07 09:08:41 joerg Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -132,7 +132,7 @@ __start: /* enable internal i/d-cache */ mfpvr %r9 rlwinm %r9,%r9,16,16,31 - cmpi %cr0,%r9,1 + cmpwi %cr0,%r9,1 beq 3f /* not needed for 601 */ mfspr %r11,SPR_HID0 andi. %r0,%r11,HID0_DCE @@ -147,9 +147,9 @@ __start: mtspr SPR_HID0,%r11 /* enable caches */ sync isync - cmpi %cr0,%r9,4 /* check for 604 */ - cmpi %cr1,%r9,9 /* or 604e */ - cmpi %cr2,%r9,10 /* or mach5 */ + cmpwi %cr0,%r9,4 /* check for 604 */ + cmpwi %cr1,%r9,9 /* or 604e */ + cmpwi %cr2,%r9,10 /* or mach5 */ cror 2,2,6 cror 2,2,10 bne 3f
CVS commit: src/sys/arch/mvmeppc/mvmeppc
Module Name:src
Committed By: christos
Date: Wed Mar 26 17:44:36 UTC 2014
Modified Files:
src/sys/arch/mvmeppc/mvmeppc: machdep.c platform_160x.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mvmeppc/mvmeppc/machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvmeppc/mvmeppc/platform_160x.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvmeppc/mvmeppc/machdep.c
diff -u src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.30 src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.31
--- src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.30 Sat Oct 13 13:58:54 2012
+++ src/sys/arch/mvmeppc/mvmeppc/machdep.c Wed Mar 26 13:44:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.30 2012/10/13 17:58:54 jdc Exp $ */
+/* $NetBSD: machdep.c,v 1.31 2014/03/26 17:44:36 christos Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2012/10/13 17:58:54 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2014/03/26 17:44:36 christos Exp $");
#include "opt_compat_netbsd.h"
#include "opt_mvmetype.h"
@@ -123,7 +123,7 @@ initppc(u_long startkernel, u_long endke
extern void _mvmeppc_unsup_board(const char *, const char *);
char msg[80];
- sprintf(msg, "Unsupported model: MVME%04x",
+ snprintf(msg, sizeof(msg), "Unsupported model: MVME%04x",
bootinfo.bi_modelnumber);
_mvmeppc_unsup_board(msg, &msg[strlen(msg)]);
/* NOTREACHED */
@@ -168,7 +168,8 @@ cpu_startup(void)
if (!prep_intr_reg)
panic("startup: no room for interrupt register");
- sprintf(modelbuf, "%s\nCore Speed: %dMHz, Bus Speed: %dMHz\n",
+ snprintf(modelbuf, sizeof(modelbuf),
+ "%s\nCore Speed: %dMHz, Bus Speed: %dMHz\n",
platform->model,
bootinfo.bi_mpuspeed/100,
bootinfo.bi_busspeed/100);
Index: src/sys/arch/mvmeppc/mvmeppc/platform_160x.c
diff -u src/sys/arch/mvmeppc/mvmeppc/platform_160x.c:1.8 src/sys/arch/mvmeppc/mvmeppc/platform_160x.c:1.9
--- src/sys/arch/mvmeppc/mvmeppc/platform_160x.c:1.8 Sat Jun 18 04:08:29 2011
+++ src/sys/arch/mvmeppc/mvmeppc/platform_160x.c Wed Mar 26 13:44:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_160x.c,v 1.8 2011/06/18 08:08:29 matt Exp $ */
+/* $NetBSD: platform_160x.c,v 1.9 2014/03/26 17:44:36 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: platform_160x.c,v 1.8 2011/06/18 08:08:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: platform_160x.c,v 1.9 2014/03/26 17:44:36 christos Exp $");
#include
#include
@@ -104,8 +104,8 @@ p160x_match(struct platform *p)
for (cp = &bid.pwa[sizeof(bid.pwa) - 1]; *cp == ' '; cp--)
*cp = '\0';
- sprintf(p160x_model, "%s, Serial: %s, PWA: %s", bid.id,
- bid.serial, bid.pwa);
+ snprintf(p160x_model, sizeof(p160x_model),
+ "%s, Serial: %s, PWA: %s", bid.id, bid.serial, bid.pwa);
p->model = p160x_model;
speed[3] = '\0';
