Thu Mar 17 08:08:04 2022 UTC ()
revert broken to borken, it is used spelling in BSD and "tastes better that way".


(andvar)
diff -r1.67 -r1.68 src/sys/arch/next68k/dev/mb8795.c
diff -r1.49 -r1.50 src/sys/arch/sparc64/sparc64/ofw_machdep.c

cvs diff -r1.67 -r1.68 src/sys/arch/next68k/dev/mb8795.c (expand / switch to unified diff)

--- src/sys/arch/next68k/dev/mb8795.c 2022/03/16 20:31:01 1.67
+++ src/sys/arch/next68k/dev/mb8795.c 2022/03/17 08:08:03 1.68
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1/* $NetBSD: mb8795.c,v 1.67 2022/03/16 20:31:01 andvar Exp $ */ 1/* $NetBSD: mb8795.c,v 1.68 2022/03/17 08:08:03 andvar Exp $ */
2/* 2/*
3 * Copyright (c) 1998 Darrin B. Jewell 3 * Copyright (c) 1998 Darrin B. Jewell
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27#include <sys/cdefs.h> 27#include <sys/cdefs.h>
28__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.67 2022/03/16 20:31:01 andvar Exp $"); 28__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.68 2022/03/17 08:08:03 andvar Exp $");
29 29
30#include "opt_inet.h" 30#include "opt_inet.h"
31 31
32#include <sys/param.h> 32#include <sys/param.h>
33#include <sys/systm.h> 33#include <sys/systm.h>
34#include <sys/mbuf.h> 34#include <sys/mbuf.h>
35#include <sys/syslog.h> 35#include <sys/syslog.h>
36#include <sys/socket.h> 36#include <sys/socket.h>
37#include <sys/device.h> 37#include <sys/device.h>
38#include <sys/malloc.h> 38#include <sys/malloc.h>
39#include <sys/ioctl.h> 39#include <sys/ioctl.h>
40#include <sys/errno.h> 40#include <sys/errno.h>
41#include <sys/rndsource.h> 41#include <sys/rndsource.h>
@@ -506,27 +506,27 @@ mb8795_init(struct mb8795_softc *sc) @@ -506,27 +506,27 @@ mb8795_init(struct mb8795_softc *sc)
506 506
507 s = spldma(); 507 s = spldma();
508 if ((ifp->if_flags & IFF_RUNNING) == 0) 508 if ((ifp->if_flags & IFF_RUNNING) == 0)
509 mb8795_reset(sc); 509 mb8795_reset(sc);
510 510
511 if (ifp->if_flags & IFF_PROMISC) 511 if (ifp->if_flags & IFF_PROMISC)
512 rxmode = MB8795_RXMODE_PROMISCUOUS; 512 rxmode = MB8795_RXMODE_PROMISCUOUS;
513 else 513 else
514 rxmode = MB8795_RXMODE_NORMAL; 514 rxmode = MB8795_RXMODE_NORMAL;
515 /* XXX add support for multicast */ 515 /* XXX add support for multicast */
516 if (turbo) 516 if (turbo)
517 rxmode |= MB8795_RXMODE_TEST; 517 rxmode |= MB8795_RXMODE_TEST;
518 518
519 /* switching mode probably broken now with turbo */ 519 /* switching mode probably borken now with turbo */
520 MB_WRITE_REG(sc, MB8795_TXMODE, 520 MB_WRITE_REG(sc, MB8795_TXMODE,
521 turbo ? MB8795_TXMODE_TURBO1 : MB8795_TXMODE_LB_DISABLE); 521 turbo ? MB8795_TXMODE_TURBO1 : MB8795_TXMODE_LB_DISABLE);
522 MB_WRITE_REG(sc, MB8795_RXMODE, rxmode); 522 MB_WRITE_REG(sc, MB8795_RXMODE, rxmode);
523 523
524 if ((ifp->if_flags & IFF_RUNNING) == 0) { 524 if ((ifp->if_flags & IFF_RUNNING) == 0) {
525 MBDMA_RX_SETUP(sc); 525 MBDMA_RX_SETUP(sc);
526 MBDMA_TX_SETUP(sc); 526 MBDMA_TX_SETUP(sc);
527 527
528 ifp->if_flags |= IFF_RUNNING; 528 ifp->if_flags |= IFF_RUNNING;
529 ifp->if_flags &= ~IFF_OACTIVE; 529 ifp->if_flags &= ~IFF_OACTIVE;
530 ifp->if_timer = 0; 530 ifp->if_timer = 0;
531 531
532 MBDMA_RX_GO(sc); 532 MBDMA_RX_GO(sc);

cvs diff -r1.49 -r1.50 src/sys/arch/sparc64/sparc64/ofw_machdep.c (expand / switch to unified diff)

--- src/sys/arch/sparc64/sparc64/ofw_machdep.c 2022/03/16 20:31:02 1.49
+++ src/sys/arch/sparc64/sparc64/ofw_machdep.c 2022/03/17 08:08:03 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ofw_machdep.c,v 1.49 2022/03/16 20:31:02 andvar Exp $ */ 1/* $NetBSD: ofw_machdep.c,v 1.50 2022/03/17 08:08:03 andvar Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 1996 Wolfgang Solfrank. 4 * Copyright (C) 1996 Wolfgang Solfrank.
5 * Copyright (C) 1996 TooLs GmbH. 5 * Copyright (C) 1996 TooLs GmbH.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -24,27 +24,27 @@ @@ -24,27 +24,27 @@
24 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 24 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
25 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 25 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
26 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 26 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
27 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 27 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
28 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 28 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
29 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 29 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
30 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 30 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
31 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33 33
34#include "opt_multiprocessor.h" 34#include "opt_multiprocessor.h"
35 35
36#include <sys/cdefs.h> 36#include <sys/cdefs.h>
37__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.49 2022/03/16 20:31:02 andvar Exp $"); 37__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.50 2022/03/17 08:08:03 andvar Exp $");
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40#include <sys/buf.h> 40#include <sys/buf.h>
41#include <sys/conf.h> 41#include <sys/conf.h>
42#include <sys/device.h> 42#include <sys/device.h>
43#include <sys/disk.h> 43#include <sys/disk.h>
44#include <sys/disklabel.h> 44#include <sys/disklabel.h>
45#include <sys/fcntl.h> 45#include <sys/fcntl.h>
46#include <sys/ioctl.h> 46#include <sys/ioctl.h>
47#include <sys/kprintf.h> 47#include <sys/kprintf.h>
48#include <sys/malloc.h> 48#include <sys/malloc.h>
49#include <sys/stat.h> 49#include <sys/stat.h>
50#include <sys/systm.h> 50#include <sys/systm.h>
@@ -826,27 +826,27 @@ OF_mapintr(int node, int *interrupt, int @@ -826,27 +826,27 @@ OF_mapintr(int node, int *interrupt, int
826 && !strcmp(model, "SUNW,psycho")) { 826 && !strcmp(model, "SUNW,psycho")) {
827 DPRINTF(("OF_mapintr: interrupt %x already mapped\n", 827 DPRINTF(("OF_mapintr: interrupt %x already mapped\n",
828 *interrupt)); 828 *interrupt));
829 return validlen; 829 return validlen;
830 } 830 }
831 } 831 }
832 832
833 /* 833 /*
834 * If there is no interrupt map in the bus node, we  834 * If there is no interrupt map in the bus node, we
835 * need to convert the slot address to its parent 835 * need to convert the slot address to its parent
836 * bus format, and hunt up the parent bus to see if 836 * bus format, and hunt up the parent bus to see if
837 * we need to remap. 837 * we need to remap.
838 * 838 *
839 * The specification for interrupt mapping is broken. 839 * The specification for interrupt mapping is borken.
840 * You are supposed to query the interrupt parent in 840 * You are supposed to query the interrupt parent in
841 * the interrupt-map specification to determine the 841 * the interrupt-map specification to determine the
842 * number of address and interrupt cells, but we need 842 * number of address and interrupt cells, but we need
843 * to know how many address and interrupt cells to skip 843 * to know how many address and interrupt cells to skip
844 * to find the phandle... 844 * to find the phandle...
845 * 845 *
846 */ 846 */
847 if ((len = OF_getprop(node, "reg", &reg, sizeof(reg))) <= 0) { 847 if ((len = OF_getprop(node, "reg", &reg, sizeof(reg))) <= 0) {
848 printf("OF_mapintr: no reg property?\n"); 848 printf("OF_mapintr: no reg property?\n");
849 return (-1); 849 return (-1);
850 } 850 }
851 851
852 while (node) { 852 while (node) {