fix various typos, mainly in comments.diff -r1.15 -r1.16 src/lib/libc/resolv/res_debug.c
(andvar)
--- src/lib/libc/resolv/res_debug.c 2018/12/13 08:45:29 1.15
+++ src/lib/libc/resolv/res_debug.c 2021/09/16 20:17:46 1.16
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: res_debug.c,v 1.15 2018/12/13 08:45:29 maya Exp $ */ | 1 | /* $NetBSD: res_debug.c,v 1.16 2021/09/16 20:17:46 andvar Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC") | 4 | * Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC") | |
5 | * Portions Copyright (C) 1996-2003 Internet Software Consortium. | 5 | * Portions Copyright (C) 1996-2003 Internet Software Consortium. | |
6 | * | 6 | * | |
7 | * Permission to use, copy, modify, and/or distribute this software for any | 7 | * Permission to use, copy, modify, and/or distribute this software for any | |
8 | * purpose with or without fee is hereby granted, provided that the above | 8 | * purpose with or without fee is hereby granted, provided that the above | |
9 | * copyright notice and this permission notice appear in all copies. | 9 | * copyright notice and this permission notice appear in all copies. | |
10 | * | 10 | * | |
11 | * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH | 11 | * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH | |
12 | * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY | 12 | * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY | |
13 | * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, | 13 | * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, | |
14 | * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM | 14 | * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM | |
@@ -87,27 +87,27 @@ | @@ -87,27 +87,27 @@ | |||
87 | * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A | 87 | * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A | |
88 | * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, | 88 | * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, | |
89 | * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING | 89 | * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING | |
90 | * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN | 90 | * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN | |
91 | * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. | 91 | * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. | |
92 | */ | 92 | */ | |
93 | 93 | |||
94 | #include <sys/cdefs.h> | 94 | #include <sys/cdefs.h> | |
95 | #if defined(LIBC_SCCS) && !defined(lint) | 95 | #if defined(LIBC_SCCS) && !defined(lint) | |
96 | #ifdef notdef | 96 | #ifdef notdef | |
97 | static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93"; | 97 | static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93"; | |
98 | static const char rcsid[] = "Id: res_debug.c,v 1.19 2009/02/26 11:20:20 tbox Exp"; | 98 | static const char rcsid[] = "Id: res_debug.c,v 1.19 2009/02/26 11:20:20 tbox Exp"; | |
99 | #else | 99 | #else | |
100 | __RCSID("$NetBSD: res_debug.c,v 1.15 2018/12/13 08:45:29 maya Exp $"); | 100 | __RCSID("$NetBSD: res_debug.c,v 1.16 2021/09/16 20:17:46 andvar Exp $"); | |
101 | #endif | 101 | #endif | |
102 | #endif /* LIBC_SCCS and not lint */ | 102 | #endif /* LIBC_SCCS and not lint */ | |
103 | 103 | |||
104 | #include "port_before.h" | 104 | #include "port_before.h" | |
105 | 105 | |||
106 | #include "namespace.h" | 106 | #include "namespace.h" | |
107 | #include <sys/types.h> | 107 | #include <sys/types.h> | |
108 | #include <sys/param.h> | 108 | #include <sys/param.h> | |
109 | #include <sys/socket.h> | 109 | #include <sys/socket.h> | |
110 | 110 | |||
111 | #include <netinet/in.h> | 111 | #include <netinet/in.h> | |
112 | #include <arpa/inet.h> | 112 | #include <arpa/inet.h> | |
113 | #include <arpa/nameser.h> | 113 | #include <arpa/nameser.h> | |
@@ -499,27 +499,27 @@ const struct res_sym __p_type_syms[] = { | @@ -499,27 +499,27 @@ const struct res_sym __p_type_syms[] = { | |||
499 | {ns_t_key, "KEY", "key"}, | 499 | {ns_t_key, "KEY", "key"}, | |
500 | {ns_t_px, "PX", "mapping information"}, | 500 | {ns_t_px, "PX", "mapping information"}, | |
501 | {ns_t_gpos, "GPOS", "geographical position (withdrawn)"}, | 501 | {ns_t_gpos, "GPOS", "geographical position (withdrawn)"}, | |
502 | {ns_t_aaaa, "AAAA", "IPv6 address"}, | 502 | {ns_t_aaaa, "AAAA", "IPv6 address"}, | |
503 | {ns_t_loc, "LOC", "location"}, | 503 | {ns_t_loc, "LOC", "location"}, | |
504 | {ns_t_nxt, "NXT", "next valid name (unimplemented)"}, | 504 | {ns_t_nxt, "NXT", "next valid name (unimplemented)"}, | |
505 | {ns_t_eid, "EID", "endpoint identifier (unimplemented)"}, | 505 | {ns_t_eid, "EID", "endpoint identifier (unimplemented)"}, | |
506 | {ns_t_nimloc, "NIMLOC", "NIMROD locator (unimplemented)"}, | 506 | {ns_t_nimloc, "NIMLOC", "NIMROD locator (unimplemented)"}, | |
507 | {ns_t_srv, "SRV", "server selection"}, | 507 | {ns_t_srv, "SRV", "server selection"}, | |
508 | {ns_t_atma, "ATMA", "ATM address (unimplemented)"}, | 508 | {ns_t_atma, "ATMA", "ATM address (unimplemented)"}, | |
509 | {ns_t_naptr, "NAPTR", "naptr"}, | 509 | {ns_t_naptr, "NAPTR", "naptr"}, | |
510 | {ns_t_kx, "KX", "key exchange"}, | 510 | {ns_t_kx, "KX", "key exchange"}, | |
511 | {ns_t_cert, "CERT", "certificate"}, | 511 | {ns_t_cert, "CERT", "certificate"}, | |
512 | {ns_t_a6, "A", "IPv6 address (experminental)"}, | 512 | {ns_t_a6, "A", "IPv6 address (experimental)"}, | |
513 | {ns_t_dname, "DNAME", "non-terminal redirection"}, | 513 | {ns_t_dname, "DNAME", "non-terminal redirection"}, | |
514 | {ns_t_opt, "OPT", "opt"}, | 514 | {ns_t_opt, "OPT", "opt"}, | |
515 | {ns_t_apl, "apl", "apl"}, | 515 | {ns_t_apl, "apl", "apl"}, | |
516 | {ns_t_ds, "DS", "delegation signer"}, | 516 | {ns_t_ds, "DS", "delegation signer"}, | |
517 | {ns_t_sshfp, "SSFP", "SSH fingerprint"}, | 517 | {ns_t_sshfp, "SSFP", "SSH fingerprint"}, | |
518 | {ns_t_ipseckey, "IPSECKEY", "IPSEC key"}, | 518 | {ns_t_ipseckey, "IPSECKEY", "IPSEC key"}, | |
519 | {ns_t_rrsig, "RRSIG", "rrsig"}, | 519 | {ns_t_rrsig, "RRSIG", "rrsig"}, | |
520 | {ns_t_nsec, "NSEC", "nsec"}, | 520 | {ns_t_nsec, "NSEC", "nsec"}, | |
521 | {ns_t_dnskey, "DNSKEY", "DNS key"}, | 521 | {ns_t_dnskey, "DNSKEY", "DNS key"}, | |
522 | {ns_t_dhcid, "DHCID", "dynamic host configuration identifier"}, | 522 | {ns_t_dhcid, "DHCID", "dynamic host configuration identifier"}, | |
523 | {ns_t_nsec3, "NSEC3", "nsec3"}, | 523 | {ns_t_nsec3, "NSEC3", "nsec3"}, | |
524 | {ns_t_nsec3param, "NSEC3PARAM", "NSEC3 parameters"}, | 524 | {ns_t_nsec3param, "NSEC3PARAM", "NSEC3 parameters"}, | |
525 | {ns_t_hip, "HIP", "host identity protocol"}, | 525 | {ns_t_hip, "HIP", "host identity protocol"}, | |
@@ -670,27 +670,27 @@ p_class(int class) { | @@ -670,27 +670,27 @@ p_class(int class) { | |||
670 | 670 | |||
671 | /*% | 671 | /*% | |
672 | * Return a mnemonic for an option | 672 | * Return a mnemonic for an option | |
673 | */ | 673 | */ | |
674 | const char * | 674 | const char * | |
675 | p_option(u_long option) { | 675 | p_option(u_long option) { | |
676 | char *nbuf = p_option_nbuf; | 676 | char *nbuf = p_option_nbuf; | |
677 | 677 | |||
678 | switch (option) { | 678 | switch (option) { | |
679 | case RES_INIT: return "init"; | 679 | case RES_INIT: return "init"; | |
680 | case RES_DEBUG: return "debug"; | 680 | case RES_DEBUG: return "debug"; | |
681 | case RES_AAONLY: return "aaonly(unimpl)"; | 681 | case RES_AAONLY: return "aaonly(unimpl)"; | |
682 | case RES_USEVC: return "usevc"; | 682 | case RES_USEVC: return "usevc"; | |
683 | case RES_PRIMARY: return "primry(unimpl)"; | 683 | case RES_PRIMARY: return "primary(unimpl)"; | |
684 | case RES_IGNTC: return "igntc"; | 684 | case RES_IGNTC: return "igntc"; | |
685 | case RES_RECURSE: return "recurs"; | 685 | case RES_RECURSE: return "recurs"; | |
686 | case RES_DEFNAMES: return "defnam"; | 686 | case RES_DEFNAMES: return "defnam"; | |
687 | case RES_STAYOPEN: return "styopn"; | 687 | case RES_STAYOPEN: return "styopn"; | |
688 | case RES_DNSRCH: return "dnsrch"; | 688 | case RES_DNSRCH: return "dnsrch"; | |
689 | case RES_INSECURE1: return "insecure1"; | 689 | case RES_INSECURE1: return "insecure1"; | |
690 | case RES_INSECURE2: return "insecure2"; | 690 | case RES_INSECURE2: return "insecure2"; | |
691 | case RES_NOALIASES: return "noaliases"; | 691 | case RES_NOALIASES: return "noaliases"; | |
692 | case RES_USE_INET6: return "inet6"; | 692 | case RES_USE_INET6: return "inet6"; | |
693 | #ifdef RES_USE_EDNS0 /*%< KAME extension */ | 693 | #ifdef RES_USE_EDNS0 /*%< KAME extension */ | |
694 | case RES_USE_EDNS0: return "edns0"; | 694 | case RES_USE_EDNS0: return "edns0"; | |
695 | case RES_NSID: return "nsid"; | 695 | case RES_NSID: return "nsid"; | |
696 | #endif | 696 | #endif |
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c 2021/08/17 22:00:26 1.99
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c 2021/09/16 20:17:46 1.100
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: rpc_machdep.c,v 1.99 2021/08/17 22:00:26 andvar Exp $ */ | 1 | /* $NetBSD: rpc_machdep.c,v 1.100 2021/09/16 20:17:46 andvar Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2000-2002 Reinoud Zandijk. | 4 | * Copyright (c) 2000-2002 Reinoud Zandijk. | |
5 | * Copyright (c) 1994-1998 Mark Brinicombe. | 5 | * Copyright (c) 1994-1998 Mark Brinicombe. | |
6 | * Copyright (c) 1994 Brini. | 6 | * Copyright (c) 1994 Brini. | |
7 | * All rights reserved. | 7 | * All rights reserved. | |
8 | * | 8 | * | |
9 | * This code is derived from software written for Brini by Mark Brinicombe | 9 | * This code is derived from software written for Brini by Mark Brinicombe | |
10 | * | 10 | * | |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without | |
12 | * modification, are permitted provided that the following conditions | 12 | * modification, are permitted provided that the following conditions | |
13 | * are met: | 13 | * are met: | |
14 | * 1. Redistributions of source code must retain the above copyright | 14 | * 1. Redistributions of source code must retain the above copyright | |
@@ -44,27 +44,27 @@ | @@ -44,27 +44,27 @@ | |||
44 | * This file still needs a lot of work | 44 | * This file still needs a lot of work | |
45 | * | 45 | * | |
46 | * Created : 17/09/94 | 46 | * Created : 17/09/94 | |
47 | * Updated for yet another new bootloader 28/12/02 | 47 | * Updated for yet another new bootloader 28/12/02 | |
48 | */ | 48 | */ | |
49 | 49 | |||
50 | #include "opt_ddb.h" | 50 | #include "opt_ddb.h" | |
51 | #include "opt_modular.h" | 51 | #include "opt_modular.h" | |
52 | #include "vidcvideo.h" | 52 | #include "vidcvideo.h" | |
53 | #include "podulebus.h" | 53 | #include "podulebus.h" | |
54 | 54 | |||
55 | #include <sys/param.h> | 55 | #include <sys/param.h> | |
56 | 56 | |||
57 | __KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.99 2021/08/17 22:00:26 andvar Exp $"); | 57 | __KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.100 2021/09/16 20:17:46 andvar Exp $"); | |
58 | 58 | |||
59 | #include <sys/systm.h> | 59 | #include <sys/systm.h> | |
60 | #include <sys/kernel.h> | 60 | #include <sys/kernel.h> | |
61 | #include <sys/reboot.h> | 61 | #include <sys/reboot.h> | |
62 | #include <sys/proc.h> | 62 | #include <sys/proc.h> | |
63 | #include <sys/msgbuf.h> | 63 | #include <sys/msgbuf.h> | |
64 | #include <sys/exec.h> | 64 | #include <sys/exec.h> | |
65 | #include <sys/exec_aout.h> | 65 | #include <sys/exec_aout.h> | |
66 | #include <sys/ksyms.h> | 66 | #include <sys/ksyms.h> | |
67 | #include <sys/bus.h> | 67 | #include <sys/bus.h> | |
68 | #include <sys/cpu.h> | 68 | #include <sys/cpu.h> | |
69 | #include <sys/intr.h> | 69 | #include <sys/intr.h> | |
70 | #include <sys/device.h> | 70 | #include <sys/device.h> | |
@@ -395,27 +395,27 @@ initarm(void *cookie) | @@ -395,27 +395,27 @@ initarm(void *cookie) | |||
395 | int loop1; | 395 | int loop1; | |
396 | u_int logical; | 396 | u_int logical; | |
397 | u_int kerneldatasize; | 397 | u_int kerneldatasize; | |
398 | u_int l1pagetable; | 398 | u_int l1pagetable; | |
399 | struct exec *kernexec = (struct exec *)KERNEL_TEXT_BASE; | 399 | struct exec *kernexec = (struct exec *)KERNEL_TEXT_BASE; | |
400 | bool hasKinetic = false; | 400 | bool hasKinetic = false; | |
401 | paddr_t kinetic_physical_start; | 401 | paddr_t kinetic_physical_start; | |
402 | 402 | |||
403 | /* | 403 | /* | |
404 | * Heads up ... Setup the CPU / MMU / TLB functions | 404 | * Heads up ... Setup the CPU / MMU / TLB functions | |
405 | */ | 405 | */ | |
406 | set_cpufuncs(); | 406 | set_cpufuncs(); | |
407 | 407 | |||
408 | /* canonicalise the boot configuration structure to alow versioning */ | 408 | /* canonicalise the boot configuration structure to allow versioning */ | |
409 | canonicalise_bootconfig(&bootconfig, raw_bootconf); | 409 | canonicalise_bootconfig(&bootconfig, raw_bootconf); | |
410 | booted_kernel = bootconfig.kernelname; | 410 | booted_kernel = bootconfig.kernelname; | |
411 | 411 | |||
412 | /* if the wscons interface is used, switch off VERBOSE booting :( */ | 412 | /* if the wscons interface is used, switch off VERBOSE booting :( */ | |
413 | #if NVIDCVIDEO>0 | 413 | #if NVIDCVIDEO>0 | |
414 | # undef VERBOSE_INIT_ARM | 414 | # undef VERBOSE_INIT_ARM | |
415 | #endif | 415 | #endif | |
416 | 416 | |||
417 | /* | 417 | /* | |
418 | * Initialise the video memory descriptor | 418 | * Initialise the video memory descriptor | |
419 | * | 419 | * | |
420 | * Note: all references to the video memory virtual/physical address | 420 | * Note: all references to the video memory virtual/physical address | |
421 | * should go via this structure. | 421 | * should go via this structure. |
--- src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c 2021/08/17 22:00:26 1.35
+++ src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c 2021/09/16 20:17:46 1.36
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: eb7500atx_machdep.c,v 1.35 2021/08/17 22:00:26 andvar Exp $ */ | 1 | /* $NetBSD: eb7500atx_machdep.c,v 1.36 2021/09/16 20:17:46 andvar Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2000-2002 Reinoud Zandijk. | 4 | * Copyright (c) 2000-2002 Reinoud Zandijk. | |
5 | * Copyright (c) 1994-1998 Mark Brinicombe. | 5 | * Copyright (c) 1994-1998 Mark Brinicombe. | |
6 | * Copyright (c) 1994 Brini. | 6 | * Copyright (c) 1994 Brini. | |
7 | * All rights reserved. | 7 | * All rights reserved. | |
8 | * | 8 | * | |
9 | * This code is derived from software written for Brini by Mark Brinicombe | 9 | * This code is derived from software written for Brini by Mark Brinicombe | |
10 | * | 10 | * | |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without | |
12 | * modification, are permitted provided that the following conditions | 12 | * modification, are permitted provided that the following conditions | |
13 | * are met: | 13 | * are met: | |
14 | * 1. Redistributions of source code must retain the above copyright | 14 | * 1. Redistributions of source code must retain the above copyright | |
@@ -44,27 +44,27 @@ | @@ -44,27 +44,27 @@ | |||
44 | * This file still needs a lot of work | 44 | * This file still needs a lot of work | |
45 | * | 45 | * | |
46 | * Created : 17/09/94 | 46 | * Created : 17/09/94 | |
47 | * Updated for yet another new bootloader 28/12/02 | 47 | * Updated for yet another new bootloader 28/12/02 | |
48 | */ | 48 | */ | |
49 | 49 | |||
50 | #include "opt_ddb.h" | 50 | #include "opt_ddb.h" | |
51 | #include "opt_modular.h" | 51 | #include "opt_modular.h" | |
52 | #include "vidcvideo.h" | 52 | #include "vidcvideo.h" | |
53 | #include "pckbc.h" | 53 | #include "pckbc.h" | |
54 | 54 | |||
55 | #include <sys/param.h> | 55 | #include <sys/param.h> | |
56 | 56 | |||
57 | __KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.35 2021/08/17 22:00:26 andvar Exp $"); | 57 | __KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.36 2021/09/16 20:17:46 andvar Exp $"); | |
58 | 58 | |||
59 | #include <sys/systm.h> | 59 | #include <sys/systm.h> | |
60 | #include <sys/kernel.h> | 60 | #include <sys/kernel.h> | |
61 | #include <sys/reboot.h> | 61 | #include <sys/reboot.h> | |
62 | #include <sys/proc.h> | 62 | #include <sys/proc.h> | |
63 | #include <sys/msgbuf.h> | 63 | #include <sys/msgbuf.h> | |
64 | #include <sys/exec.h> | 64 | #include <sys/exec.h> | |
65 | #include <sys/exec_aout.h> | 65 | #include <sys/exec_aout.h> | |
66 | #include <sys/ksyms.h> | 66 | #include <sys/ksyms.h> | |
67 | #include <sys/bus.h> | 67 | #include <sys/bus.h> | |
68 | #include <sys/cpu.h> | 68 | #include <sys/cpu.h> | |
69 | #include <sys/intr.h> | 69 | #include <sys/intr.h> | |
70 | #include <sys/device.h> | 70 | #include <sys/device.h> | |
@@ -360,27 +360,27 @@ initarm(void *cookie) | @@ -360,27 +360,27 @@ initarm(void *cookie) | |||
360 | struct bootconfig *raw_bootconf = cookie; | 360 | struct bootconfig *raw_bootconf = cookie; | |
361 | int loop; | 361 | int loop; | |
362 | int loop1; | 362 | int loop1; | |
363 | u_int logical; | 363 | u_int logical; | |
364 | u_int kerneldatasize; | 364 | u_int kerneldatasize; | |
365 | u_int l1pagetable; | 365 | u_int l1pagetable; | |
366 | struct exec *kernexec = (struct exec *)KERNEL_TEXT_BASE; | 366 | struct exec *kernexec = (struct exec *)KERNEL_TEXT_BASE; | |
367 | 367 | |||
368 | /* | 368 | /* | |
369 | * Heads up ... Setup the CPU / MMU / TLB functions | 369 | * Heads up ... Setup the CPU / MMU / TLB functions | |
370 | */ | 370 | */ | |
371 | set_cpufuncs(); | 371 | set_cpufuncs(); | |
372 | 372 | |||
373 | /* canonicalise the boot configuration structure to alow versioning */ | 373 | /* canonicalise the boot configuration structure to allow versioning */ | |
374 | canonicalise_bootconfig(&bootconfig, raw_bootconf); | 374 | canonicalise_bootconfig(&bootconfig, raw_bootconf); | |
375 | booted_kernel = bootconfig.kernelname; | 375 | booted_kernel = bootconfig.kernelname; | |
376 | 376 | |||
377 | /* if the wscons interface is used, switch off VERBOSE booting :( */ | 377 | /* if the wscons interface is used, switch off VERBOSE booting :( */ | |
378 | #if NVIDCVIDEO>0 | 378 | #if NVIDCVIDEO>0 | |
379 | # undef VERBOSE_INIT_ARM | 379 | # undef VERBOSE_INIT_ARM | |
380 | #endif | 380 | #endif | |
381 | 381 | |||
382 | /* | 382 | /* | |
383 | * Initialise the video memory descriptor | 383 | * Initialise the video memory descriptor | |
384 | * | 384 | * | |
385 | * Note: all references to the video memory virtual/physical address | 385 | * Note: all references to the video memory virtual/physical address | |
386 | * should go via this structure. | 386 | * should go via this structure. |
--- src/sys/arch/acorn32/podulebus/sbicreg.h 2006/03/08 23:46:22 1.5
+++ src/sys/arch/acorn32/podulebus/sbicreg.h 2021/09/16 20:17:46 1.6
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: sbicreg.h,v 1.5 2006/03/08 23:46:22 lukem Exp $ */ | 1 | /* $NetBSD: sbicreg.h,v 1.6 2021/09/16 20:17:46 andvar Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1990 The Regents of the University of California. | 4 | * Copyright (c) 1990 The Regents of the University of California. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to Berkeley by | 7 | * This code is derived from software contributed to Berkeley by | |
8 | * Van Jacobson of Lawrence Berkeley Laboratory. | 8 | * Van Jacobson of Lawrence Berkeley Laboratory. | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -105,27 +105,27 @@ | @@ -105,27 +105,27 @@ | |||
105 | /* 11 MHz is invalid */ | 105 | /* 11 MHz is invalid */ | |
106 | #define SBIC_ID_FS_12_15 0x40 /* Input clock is 12-15 MHz */ | 106 | #define SBIC_ID_FS_12_15 0x40 /* Input clock is 12-15 MHz */ | |
107 | #define SBIC_ID_FS_16_20 0x80 /* Input clock is 16-20 MHz */ | 107 | #define SBIC_ID_FS_16_20 0x80 /* Input clock is 16-20 MHz */ | |
108 | #define SBIC_ID_EHP 0x10 /* Enable host parity */ | 108 | #define SBIC_ID_EHP 0x10 /* Enable host parity */ | |
109 | #define SBIC_ID_EAF 0x08 /* Enable Advanced Features */ | 109 | #define SBIC_ID_EAF 0x08 /* Enable Advanced Features */ | |
110 | #define SBIC_ID_MASK 0x07 | 110 | #define SBIC_ID_MASK 0x07 | |
111 | #define SBIC_ID_CBDSIZE_MASK 0x0f /* if unk SCSI cmd group */ | 111 | #define SBIC_ID_CBDSIZE_MASK 0x0f /* if unk SCSI cmd group */ | |
112 | 112 | |||
113 | /* | 113 | /* | |
114 | * Control register | 114 | * Control register | |
115 | */ | 115 | */ | |
116 | 116 | |||
117 | #define SBIC_CTL_DMA 0x80 /* Single byte dma */ | 117 | #define SBIC_CTL_DMA 0x80 /* Single byte dma */ | |
118 | #define SBIC_CTL_DBA_DMA 0x40 /* direct buffer acces (bus master)*/ | 118 | #define SBIC_CTL_DBA_DMA 0x40 /* direct buffer access (bus master)*/ | |
119 | #define SBIC_CTL_BURST_DMA 0x20 /* continuous mode (8237) */ | 119 | #define SBIC_CTL_BURST_DMA 0x20 /* continuous mode (8237) */ | |
120 | #define SBIC_CTL_NO_DMA 0x00 /* Programmed I/O */ | 120 | #define SBIC_CTL_NO_DMA 0x00 /* Programmed I/O */ | |
121 | #define SBIC_CTL_HHP 0x10 /* Halt on host parity error */ | 121 | #define SBIC_CTL_HHP 0x10 /* Halt on host parity error */ | |
122 | #define SBIC_CTL_EDI 0x08 /* Ending disconnect interrupt */ | 122 | #define SBIC_CTL_EDI 0x08 /* Ending disconnect interrupt */ | |
123 | #define SBIC_CTL_IDI 0x04 /* Intermediate disconnect interrupt*/ | 123 | #define SBIC_CTL_IDI 0x04 /* Intermediate disconnect interrupt*/ | |
124 | #define SBIC_CTL_HA 0x02 /* Halt on ATN */ | 124 | #define SBIC_CTL_HA 0x02 /* Halt on ATN */ | |
125 | #define SBIC_CTL_HSP 0x01 /* Halt on SCSI parity error */ | 125 | #define SBIC_CTL_HSP 0x01 /* Halt on SCSI parity error */ | |
126 | 126 | |||
127 | /* | 127 | /* | |
128 | * Timeout period register | 128 | * Timeout period register | |
129 | * [val in msecs, input clk in 0.1 MHz] | 129 | * [val in msecs, input clk in 0.1 MHz] | |
130 | */ | 130 | */ | |
131 | 131 |
--- src/sys/arch/alpha/pci/pci_machdep.c 2021/07/04 22:36:43 1.32
+++ src/sys/arch/alpha/pci/pci_machdep.c 2021/09/16 20:17:46 1.33
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: pci_machdep.c,v 1.32 2021/07/04 22:36:43 thorpej Exp $ */ | 1 | /* $NetBSD: pci_machdep.c,v 1.33 2021/09/16 20:17:46 andvar Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2020 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2020 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Jason R. Thorpe. | 8 | * by Jason R. Thorpe. | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -52,27 +52,27 @@ | @@ -52,27 +52,27 @@ | |||
52 | * Carnegie Mellon University | 52 | * Carnegie Mellon University | |
53 | * Pittsburgh PA 15213-3890 | 53 | * Pittsburgh PA 15213-3890 | |
54 | * | 54 | * | |
55 | * any improvements or extensions that they make and grant Carnegie the | 55 | * any improvements or extensions that they make and grant Carnegie the | |
56 | * rights to redistribute these changes. | 56 | * rights to redistribute these changes. | |
57 | */ | 57 | */ | |
58 | 58 | |||
59 | /* | 59 | /* | |
60 | * Machine-specific functions for PCI autoconfiguration. | 60 | * Machine-specific functions for PCI autoconfiguration. | |
61 | */ | 61 | */ | |
62 | 62 | |||
63 | #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ | 63 | #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ | |
64 | 64 | |||
65 | __KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.32 2021/07/04 22:36:43 thorpej Exp $"); | 65 | __KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.33 2021/09/16 20:17:46 andvar Exp $"); | |
66 | 66 | |||
67 | #include <sys/types.h> | 67 | #include <sys/types.h> | |
68 | #include <sys/param.h> | 68 | #include <sys/param.h> | |
69 | #include <sys/time.h> | 69 | #include <sys/time.h> | |
70 | #include <sys/systm.h> | 70 | #include <sys/systm.h> | |
71 | #include <sys/errno.h> | 71 | #include <sys/errno.h> | |
72 | #include <sys/device.h> | 72 | #include <sys/device.h> | |
73 | #include <sys/cpu.h> | 73 | #include <sys/cpu.h> | |
74 | 74 | |||
75 | #include <dev/isa/isavar.h> | 75 | #include <dev/isa/isavar.h> | |
76 | #include <dev/pci/pcireg.h> | 76 | #include <dev/pci/pcireg.h> | |
77 | #include <dev/pci/pcivar.h> | 77 | #include <dev/pci/pcivar.h> | |
78 | #include <dev/pci/pcidevs.h> | 78 | #include <dev/pci/pcidevs.h> | |
@@ -264,27 +264,27 @@ alpha_pci_generic_intr_evcnt(pci_chipset | @@ -264,27 +264,27 @@ alpha_pci_generic_intr_evcnt(pci_chipset | |||
264 | } | 264 | } | |
265 | 265 | |||
266 | static struct cpu_info * | 266 | static struct cpu_info * | |
267 | alpha_pci_generic_intr_select_cpu(pci_chipset_tag_t const pc, u_int const irq, | 267 | alpha_pci_generic_intr_select_cpu(pci_chipset_tag_t const pc, u_int const irq, | |
268 | u_int const flags) | 268 | u_int const flags) | |
269 | { | 269 | { | |
270 | struct cpu_info *ci, *best_ci; | 270 | struct cpu_info *ci, *best_ci; | |
271 | CPU_INFO_ITERATOR cii; | 271 | CPU_INFO_ITERATOR cii; | |
272 | 272 | |||
273 | KASSERT(mutex_owned(&cpu_lock)); | 273 | KASSERT(mutex_owned(&cpu_lock)); | |
274 | 274 | |||
275 | /* | 275 | /* | |
276 | * If the back-end didn't tell us where we can route, then | 276 | * If the back-end didn't tell us where we can route, then | |
277 | * they all go to the primry CPU. | 277 | * they all go to the primary CPU. | |
278 | */ | 278 | */ | |
279 | if (pc->pc_eligible_cpus == 0) { | 279 | if (pc->pc_eligible_cpus == 0) { | |
280 | return &cpu_info_primary; | 280 | return &cpu_info_primary; | |
281 | } | 281 | } | |
282 | 282 | |||
283 | /* | 283 | /* | |
284 | * If the interrupt already has a CPU assigned, keep on using it, | 284 | * If the interrupt already has a CPU assigned, keep on using it, | |
285 | * unless the CPU has become ineligible. | 285 | * unless the CPU has become ineligible. | |
286 | */ | 286 | */ | |
287 | ci = alpha_shared_intr_get_cpu(pc->pc_shared_intrs, irq); | 287 | ci = alpha_shared_intr_get_cpu(pc->pc_shared_intrs, irq); | |
288 | if (ci != NULL) { | 288 | if (ci != NULL) { | |
289 | if ((ci->ci_schedstate.spc_flags & SPCF_NOINTR) == 0 || | 289 | if ((ci->ci_schedstate.spc_flags & SPCF_NOINTR) == 0 || | |
290 | CPU_IS_PRIMARY(ci)) { | 290 | CPU_IS_PRIMARY(ci)) { |
--- src/sys/arch/amiga/dev/sbicreg.h 2010/02/05 12:13:36 1.8
+++ src/sys/arch/amiga/dev/sbicreg.h 2021/09/16 20:17:46 1.9
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: sbicreg.h,v 1.8 2010/02/05 12:13:36 phx Exp $ */ | 1 | /* $NetBSD: sbicreg.h,v 1.9 2021/09/16 20:17:46 andvar Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1990 The Regents of the University of California. | 4 | * Copyright (c) 1990 The Regents of the University of California. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to Berkeley by | 7 | * This code is derived from software contributed to Berkeley by | |
8 | * Van Jacobson of Lawrence Berkeley Laboratory. | 8 | * Van Jacobson of Lawrence Berkeley Laboratory. | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -105,27 +105,27 @@ | @@ -105,27 +105,27 @@ | |||
105 | /* 11 MHz is invalid */ | 105 | /* 11 MHz is invalid */ | |
106 | #define SBIC_ID_FS_12_15 0x40 /* Input clock is 12-15 MHz */ | 106 | #define SBIC_ID_FS_12_15 0x40 /* Input clock is 12-15 MHz */ | |
107 | #define SBIC_ID_FS_16_20 0x80 /* Input clock is 16-20 MHz */ | 107 | #define SBIC_ID_FS_16_20 0x80 /* Input clock is 16-20 MHz */ | |
108 | #define SBIC_ID_EHP 0x10 /* Enable host parity */ | 108 | #define SBIC_ID_EHP 0x10 /* Enable host parity */ | |
109 | #define SBIC_ID_EAF 0x08 /* Enable Advanced Features */ | 109 | #define SBIC_ID_EAF 0x08 /* Enable Advanced Features */ | |
110 | #define SBIC_ID_MASK 0x07 | 110 | #define SBIC_ID_MASK 0x07 | |
111 | #define SBIC_ID_CBDSIZE_MASK 0x0f /* if unk SCSI cmd group */ | 111 | #define SBIC_ID_CBDSIZE_MASK 0x0f /* if unk SCSI cmd group */ | |
112 | 112 | |||
113 | /* | 113 | /* | |
114 | * Control register | 114 | * Control register | |
115 | */ | 115 | */ | |
116 | 116 | |||
117 | #define SBIC_CTL_DMA 0x80 /* Single byte dma */ | 117 | #define SBIC_CTL_DMA 0x80 /* Single byte dma */ | |
118 | #define SBIC_CTL_DBA_DMA 0x40 /* direct buffer acces (bus master)*/ | 118 | #define SBIC_CTL_DBA_DMA 0x40 /* direct buffer access (bus master)*/ | |
119 | #define SBIC_CTL_BURST_DMA 0x20 /* continuous mode (8237) */ | 119 | #define SBIC_CTL_BURST_DMA 0x20 /* continuous mode (8237) */ | |
120 | #define SBIC_CTL_NO_DMA 0x00 /* Programmed I/O */ | 120 | #define SBIC_CTL_NO_DMA 0x00 /* Programmed I/O */ | |
121 | #define SBIC_CTL_HHP 0x10 /* Halt on host parity error */ | 121 | #define SBIC_CTL_HHP 0x10 /* Halt on host parity error */ | |
122 | #define SBIC_CTL_EDI 0x08 /* Ending disconnect interrupt */ | 122 | #define SBIC_CTL_EDI 0x08 /* Ending disconnect interrupt */ | |
123 | #define SBIC_CTL_IDI 0x04 /* Intermediate disconnect interrupt*/ | 123 | #define SBIC_CTL_IDI 0x04 /* Intermediate disconnect interrupt*/ | |
124 | #define SBIC_CTL_HA 0x02 /* Halt on ATN */ | 124 | #define SBIC_CTL_HA 0x02 /* Halt on ATN */ | |
125 | #define SBIC_CTL_HSP 0x01 /* Halt on SCSI parity error */ | 125 | #define SBIC_CTL_HSP 0x01 /* Halt on SCSI parity error */ | |
126 | 126 | |||
127 | /* | 127 | /* | |
128 | * Timeout period register | 128 | * Timeout period register | |
129 | * [val in msecs, input clk in 0.1 MHz] | 129 | * [val in msecs, input clk in 0.1 MHz] | |
130 | */ | 130 | */ | |
131 | 131 |
--- src/sys/arch/atari/atari/le_bus.c 2021/01/03 17:42:10 1.21
+++ src/sys/arch/atari/atari/le_bus.c 2021/09/16 20:17:47 1.22
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: le_bus.c,v 1.21 2021/01/03 17:42:10 thorpej Exp $ */ | 1 | /* $NetBSD: le_bus.c,v 1.22 2021/09/16 20:17:47 andvar Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 1998 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 1998 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Leo Weppelman. | 8 | * by Leo Weppelman. | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -20,38 +20,38 @@ | @@ -20,38 +20,38 @@ | |||
20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
29 | * POSSIBILITY OF SUCH DAMAGE. | 29 | * POSSIBILITY OF SUCH DAMAGE. | |
30 | */ | 30 | */ | |
31 | 31 | |||
32 | #include <sys/cdefs.h> | 32 | #include <sys/cdefs.h> | |
33 | __KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.21 2021/01/03 17:42:10 thorpej Exp $"); | 33 | __KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.22 2021/09/16 20:17:47 andvar Exp $"); | |
34 | 34 | |||
35 | #include <sys/types.h> | 35 | #include <sys/types.h> | |
36 | #include <sys/param.h> | 36 | #include <sys/param.h> | |
37 | #include <sys/systm.h> | 37 | #include <sys/systm.h> | |
38 | #include <sys/kmem.h> | 38 | #include <sys/kmem.h> | |
39 | #include <sys/bswap.h> | 39 | #include <sys/bswap.h> | |
40 | #include <machine/cpu.h> | 40 | #include <machine/cpu.h> | |
41 | #include <sys/bus.h> | 41 | #include <sys/bus.h> | |
42 | 42 | |||
43 | /* | 43 | /* | |
44 | * This file contains the common functions for using a litte endian (linear) | 44 | * This file contains the common functions for using a little endian (linear) | |
45 | * bus on a big endian atari. | 45 | * bus on a big endian atari. | |
46 | */ | 46 | */ | |
47 | 47 | |||
48 | /* Autoconf detection stuff */ | 48 | /* Autoconf detection stuff */ | |
49 | static int leb_bus_space_peek_1(bus_space_tag_t, | 49 | static int leb_bus_space_peek_1(bus_space_tag_t, | |
50 | bus_space_handle_t, bus_size_t); | 50 | bus_space_handle_t, bus_size_t); | |
51 | static int leb_bus_space_peek_2(bus_space_tag_t, | 51 | static int leb_bus_space_peek_2(bus_space_tag_t, | |
52 | bus_space_handle_t, bus_size_t); | 52 | bus_space_handle_t, bus_size_t); | |
53 | static int leb_bus_space_peek_4(bus_space_tag_t, | 53 | static int leb_bus_space_peek_4(bus_space_tag_t, | |
54 | bus_space_handle_t, bus_size_t); | 54 | bus_space_handle_t, bus_size_t); | |
55 | static int leb_bus_space_peek_8(bus_space_tag_t, | 55 | static int leb_bus_space_peek_8(bus_space_tag_t, | |
56 | bus_space_handle_t, bus_size_t); | 56 | bus_space_handle_t, bus_size_t); | |
57 | 57 |
--- src/sys/arch/evbarm/stand/Makefile 2020/09/12 15:25:41 1.13
+++ src/sys/arch/evbarm/stand/Makefile 2021/09/16 20:17:47 1.14
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | # $NetBSD: Makefile,v 1.13 2020/09/12 15:25:41 jmcneill Exp $ | 1 | # $NetBSD: Makefile,v 1.14 2021/09/16 20:17:47 andvar Exp $ | |
2 | 2 | |||
3 | .include <bsd.endian.mk> | 3 | .include <bsd.endian.mk> | |
4 | 4 | |||
5 | .if ${MACHINE_CPU} == "arm" | 5 | .if ${MACHINE_CPU} == "arm" | |
6 | SUBDIR+= gzboot | 6 | SUBDIR+= gzboot | |
7 | SUBDIR+= boot2440 | 7 | SUBDIR+= boot2440 | |
8 | .if ${TARGET_ENDIANNESS} == "1234" | 8 | .if ${TARGET_ENDIANNESS} == "1234" | |
9 | # According to the i.MX23 Reference Manual section 3.1, Page 3-3: | 9 | # According to the i.MX23 Reference Manual section 3.1, Page 3-3: | |
10 | # "The i.MX23 always operates in litle-endian mode." | 10 | # "The i.MX23 always operates in little-endian mode." | |
11 | SUBDIR+= bootimx23 | 11 | SUBDIR+= bootimx23 | |
12 | .endif | 12 | .endif | |
13 | .endif | 13 | .endif | |
14 | 14 | |||
15 | .if ${HAVE_UEFI:Uno} == "yes" | 15 | .if ${HAVE_UEFI:Uno} == "yes" | |
16 | . if !empty(MACHINE_ARCH:Maarch64*) | 16 | . if !empty(MACHINE_ARCH:Maarch64*) | |
17 | SUBDIR+= ../../../stand/efiboot/bootaa64 | 17 | SUBDIR+= ../../../stand/efiboot/bootaa64 | |
18 | . else | 18 | . else | |
19 | SUBDIR+= ../../../stand/efiboot/bootarm | 19 | SUBDIR+= ../../../stand/efiboot/bootarm | |
20 | . endif | 20 | . endif | |
21 | .endif | 21 | .endif | |
22 | 22 | |||
23 | .include <bsd.subdir.mk> | 23 | .include <bsd.subdir.mk> |
--- src/sys/arch/i386/stand/lib/netif/3c509.h 2006/11/24 22:52:16 1.6
+++ src/sys/arch/i386/stand/lib/netif/3c509.h 2021/09/16 20:17:47 1.7
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: 3c509.h,v 1.6 2006/11/24 22:52:16 wiz Exp $ */ | 1 | /* $NetBSD: 3c509.h,v 1.7 2021/09/16 20:17:47 andvar Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1993 Herb Peyerl | 4 | * Copyright (c) 1993 Herb Peyerl | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. The name of the author may not be used to endorse or promote products | 12 | * 2. The name of the author may not be used to endorse or promote products | |
13 | * derived from this software without specific prior written permission. | 13 | * derived from this software without specific prior written permission. | |
14 | * | 14 | * | |
@@ -50,27 +50,27 @@ | @@ -50,27 +50,27 @@ | |||
50 | #define TX_INIT_MAX_RATE 64 | 50 | #define TX_INIT_MAX_RATE 64 | |
51 | #define RX_INIT_LATENCY 64 | 51 | #define RX_INIT_LATENCY 64 | |
52 | #define RX_INIT_EARLY_THRESH 64 | 52 | #define RX_INIT_EARLY_THRESH 64 | |
53 | #define MIN_RX_EARLY_THRESHF 16 /* not less than ether_header */ | 53 | #define MIN_RX_EARLY_THRESHF 16 /* not less than ether_header */ | |
54 | #define MIN_RX_EARLY_THRESHL 4 | 54 | #define MIN_RX_EARLY_THRESHL 4 | |
55 | 55 | |||
56 | #define EEPROMSIZE 0x40 | 56 | #define EEPROMSIZE 0x40 | |
57 | #define MAX_EEPROMBUSY 1000 | 57 | #define MAX_EEPROMBUSY 1000 | |
58 | #define EP_LAST_TAG 0xd7 | 58 | #define EP_LAST_TAG 0xd7 | |
59 | #define EP_MAX_BOARDS 16 | 59 | #define EP_MAX_BOARDS 16 | |
60 | #define EP_ID_PORT 0x100 | 60 | #define EP_ID_PORT 0x100 | |
61 | 61 | |||
62 | /* | 62 | /* | |
63 | * some macros to acces long named fields | 63 | * some macros to access long named fields | |
64 | */ | 64 | */ | |
65 | #define IS_BASE (eth_base) | 65 | #define IS_BASE (eth_base) | |
66 | #define BASE (eth_base) | 66 | #define BASE (eth_base) | |
67 | 67 | |||
68 | /* | 68 | /* | |
69 | * Commands to read/write EEPROM through EEPROM command register (Window 0, | 69 | * Commands to read/write EEPROM through EEPROM command register (Window 0, | |
70 | * Offset 0xa) | 70 | * Offset 0xa) | |
71 | */ | 71 | */ | |
72 | #define EEPROM_CMD_RD 0x0080 /* Read: Address required (5 bits) */ | 72 | #define EEPROM_CMD_RD 0x0080 /* Read: Address required (5 bits) */ | |
73 | #define EEPROM_CMD_WR 0x0040 /* Write: Address required (5 bits) */ | 73 | #define EEPROM_CMD_WR 0x0040 /* Write: Address required (5 bits) */ | |
74 | #define EEPROM_CMD_ERASE 0x00c0 /* Erase: Address required (5 bits) */ | 74 | #define EEPROM_CMD_ERASE 0x00c0 /* Erase: Address required (5 bits) */ | |
75 | #define EEPROM_CMD_EWEN 0x0030 /* Erase/Write Enable: No data required */ | 75 | #define EEPROM_CMD_EWEN 0x0030 /* Erase/Write Enable: No data required */ | |
76 | 76 |
--- src/sys/arch/mips/rmi/rmixl_obio_el_space.c 2011/07/01 19:01:31 1.3
+++ src/sys/arch/mips/rmi/rmixl_obio_el_space.c 2021/09/16 20:17:47 1.4
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: rmixl_obio_el_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $ */ | 1 | /* $NetBSD: rmixl_obio_el_space.c,v 1.4 2021/09/16 20:17:47 andvar Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2001 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2001 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Jason R. Thorpe. | 8 | * by Jason R. Thorpe. | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -20,31 +20,31 @@ | @@ -20,31 +20,31 @@ | |||
20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
29 | * POSSIBILITY OF SUCH DAMAGE. | 29 | * POSSIBILITY OF SUCH DAMAGE. | |
30 | */ | 30 | */ | |
31 | 31 | |||
32 | /* | 32 | /* | |
33 | * Litle Endian bus_space(9) support for RMI {XLP,XLR,XLS} obio | 33 | * Little Endian bus_space(9) support for RMI {XLP,XLR,XLS} obio | |
34 | */ | 34 | */ | |
35 | 35 | |||
36 | #include <sys/cdefs.h> | 36 | #include <sys/cdefs.h> | |
37 | __KERNEL_RCSID(0, "$NetBSD: rmixl_obio_el_space.c,v 1.3 2011/07/01 19:01:31 dyoung Exp $"); | 37 | __KERNEL_RCSID(0, "$NetBSD: rmixl_obio_el_space.c,v 1.4 2021/09/16 20:17:47 andvar Exp $"); | |
38 | 38 | |||
39 | #include <sys/types.h> | 39 | #include <sys/types.h> | |
40 | #include <sys/param.h> | 40 | #include <sys/param.h> | |
41 | 41 | |||
42 | #include <sys/bus.h> | 42 | #include <sys/bus.h> | |
43 | #include <mips/rmi/rmixl_obiovar.h> | 43 | #include <mips/rmi/rmixl_obiovar.h> | |
44 | #include <mips/rmi/rmixlreg.h> | 44 | #include <mips/rmi/rmixlreg.h> | |
45 | #include <mips/rmi/rmixlvar.h> | 45 | #include <mips/rmi/rmixlvar.h> | |
46 | 46 | |||
47 | #define CHIP rmixl_obio_el | 47 | #define CHIP rmixl_obio_el | |
48 | #define CHIP_MEM /* defined */ | 48 | #define CHIP_MEM /* defined */ | |
49 | #define CHIP_ACCESS_SIZE 4 | 49 | #define CHIP_ACCESS_SIZE 4 | |
50 | #define CHIP_LITTLE_ENDIAN | 50 | #define CHIP_LITTLE_ENDIAN |
--- src/sys/arch/mvme68k/dev/sbicreg.h 2008/01/12 09:54:27 1.5
+++ src/sys/arch/mvme68k/dev/sbicreg.h 2021/09/16 20:17:47 1.6
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: sbicreg.h,v 1.5 2008/01/12 09:54:27 tsutsui Exp $ */ | 1 | /* $NetBSD: sbicreg.h,v 1.6 2021/09/16 20:17:47 andvar Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1990 The Regents of the University of California. | 4 | * Copyright (c) 1990 The Regents of the University of California. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to Berkeley by | 7 | * This code is derived from software contributed to Berkeley by | |
8 | * Van Jacobson of Lawrence Berkeley Laboratory. | 8 | * Van Jacobson of Lawrence Berkeley Laboratory. | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -105,27 +105,27 @@ | @@ -105,27 +105,27 @@ | |||
105 | /* 11 MHz is invalid */ | 105 | /* 11 MHz is invalid */ | |
106 | #define SBIC_ID_FS_12_15 0x40 /* Input clock is 12-15 MHz */ | 106 | #define SBIC_ID_FS_12_15 0x40 /* Input clock is 12-15 MHz */ | |
107 | #define SBIC_ID_FS_16_20 0x80 /* Input clock is 16-20 MHz */ | 107 | #define SBIC_ID_FS_16_20 0x80 /* Input clock is 16-20 MHz */ | |
108 | #define SBIC_ID_EHP 0x10 /* Enable host parity */ | 108 | #define SBIC_ID_EHP 0x10 /* Enable host parity */ | |
109 | #define SBIC_ID_EAF 0x08 /* Enable Advanced Features */ | 109 | #define SBIC_ID_EAF 0x08 /* Enable Advanced Features */ | |
110 | #define SBIC_ID_MASK 0x07 | 110 | #define SBIC_ID_MASK 0x07 | |
111 | #define SBIC_ID_CBDSIZE_MASK 0x0f /* if unk SCSI cmd group */ | 111 | #define SBIC_ID_CBDSIZE_MASK 0x0f /* if unk SCSI cmd group */ | |
112 | 112 | |||
113 | /* | 113 | /* | |
114 | * Control register | 114 | * Control register | |
115 | */ | 115 | */ | |
116 | 116 | |||
117 | #define SBIC_CTL_DMA 0x80 /* Single byte dma */ | 117 | #define SBIC_CTL_DMA 0x80 /* Single byte dma */ | |
118 | #define SBIC_CTL_DBA_DMA 0x40 /* direct buffer acces (bus master)*/ | 118 | #define SBIC_CTL_DBA_DMA 0x40 /* direct buffer access (bus master)*/ | |
119 | #define SBIC_CTL_BURST_DMA 0x20 /* continuous mode (8237) */ | 119 | #define SBIC_CTL_BURST_DMA 0x20 /* continuous mode (8237) */ | |
120 | #define SBIC_CTL_NO_DMA 0x00 /* Programmed I/O */ | 120 | #define SBIC_CTL_NO_DMA 0x00 /* Programmed I/O */ | |
121 | #define SBIC_CTL_HHP 0x10 /* Halt on host parity error */ | 121 | #define SBIC_CTL_HHP 0x10 /* Halt on host parity error */ | |
122 | #define SBIC_CTL_EDI 0x08 /* Ending disconnect interrupt */ | 122 | #define SBIC_CTL_EDI 0x08 /* Ending disconnect interrupt */ | |
123 | #define SBIC_CTL_IDI 0x04 /* Intermediate disconnect interrupt*/ | 123 | #define SBIC_CTL_IDI 0x04 /* Intermediate disconnect interrupt*/ | |
124 | #define SBIC_CTL_HA 0x02 /* Halt on ATN */ | 124 | #define SBIC_CTL_HA 0x02 /* Halt on ATN */ | |
125 | #define SBIC_CTL_HSP 0x01 /* Halt on SCSI parity error */ | 125 | #define SBIC_CTL_HSP 0x01 /* Halt on SCSI parity error */ | |
126 | 126 | |||
127 | /* | 127 | /* | |
128 | * Timeout period register | 128 | * Timeout period register | |
129 | * [val in msecs, input clk in 0.1 MHz] | 129 | * [val in msecs, input clk in 0.1 MHz] | |
130 | */ | 130 | */ | |
131 | 131 |
--- src/sys/arch/xen/include/i82489var.h 2010/11/14 13:40:31 1.2
+++ src/sys/arch/xen/include/i82489var.h 2021/09/16 20:17:47 1.3
@@ -1,11 +1,11 @@ | @@ -1,11 +1,11 @@ | |||
1 | /* $NetBSD: i82489var.h,v 1.2 2010/11/14 13:40:31 bouyer Exp $ */ | 1 | /* $NetBSD: i82489var.h,v 1.3 2021/09/16 20:17:47 andvar Exp $ */ | |
2 | 2 | |||
3 | #include <x86/i82489var.h> | 3 | #include <x86/i82489var.h> | |
4 | 4 | |||
5 | /* | 5 | /* | |
6 | * Xen doesn't give acces to the lapic. In addition, the lapic number provided | 6 | * Xen doesn't give access to the lapic. In addition, the lapic number provided | |
7 | * by the dom0 to Xen when setting up iopics is ignored, the hypervisor will | 7 | * by the dom0 to Xen when setting up iopics is ignored, the hypervisor will | |
8 | * decide itself to which physical CPU the interrupt should be routed to. | 8 | * decide itself to which physical CPU the interrupt should be routed to. | |
9 | */ | 9 | */ | |
10 | #undef lapic_cpu_number | 10 | #undef lapic_cpu_number | |
11 | #define lapic_cpu_number() (0) | 11 | #define lapic_cpu_number() (0) |
--- src/sys/dev/pci/if_bge.c 2021/09/03 21:55:00 1.348
+++ src/sys/dev/pci/if_bge.c 2021/09/16 20:17:47 1.349
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: if_bge.c,v 1.348 2021/09/03 21:55:00 andvar Exp $ */ | 1 | /* $NetBSD: if_bge.c,v 1.349 2021/09/16 20:17:47 andvar Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2001 Wind River Systems | 4 | * Copyright (c) 2001 Wind River Systems | |
5 | * Copyright (c) 1997, 1998, 1999, 2001 | 5 | * Copyright (c) 1997, 1998, 1999, 2001 | |
6 | * Bill Paul <wpaul@windriver.com>. All rights reserved. | 6 | * Bill Paul <wpaul@windriver.com>. 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 | |
@@ -69,27 +69,27 @@ | @@ -69,27 +69,27 @@ | |||
69 | * does not support external SSRAM. | 69 | * does not support external SSRAM. | |
70 | * | 70 | * | |
71 | * Broadcom also produces a variation of the BCM5700 under the "Altima" | 71 | * Broadcom also produces a variation of the BCM5700 under the "Altima" | |
72 | * brand name, which is functionally similar but lacks PCI-X support. | 72 | * brand name, which is functionally similar but lacks PCI-X support. | |
73 | * | 73 | * | |
74 | * Without external SSRAM, you can only have at most 4 TX rings, | 74 | * Without external SSRAM, you can only have at most 4 TX rings, | |
75 | * and the use of the mini RX ring is disabled. This seems to imply | 75 | * and the use of the mini RX ring is disabled. This seems to imply | |
76 | * that these features are simply not available on the BCM5701. As a | 76 | * that these features are simply not available on the BCM5701. As a | |
77 | * result, this driver does not implement any support for the mini RX | 77 | * result, this driver does not implement any support for the mini RX | |
78 | * ring. | 78 | * ring. | |
79 | */ | 79 | */ | |
80 | 80 | |||
81 | #include <sys/cdefs.h> | 81 | #include <sys/cdefs.h> | |
82 | __KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.348 2021/09/03 21:55:00 andvar Exp $"); | 82 | __KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.349 2021/09/16 20:17:47 andvar Exp $"); | |
83 | 83 | |||
84 | #include <sys/param.h> | 84 | #include <sys/param.h> | |
85 | #include <sys/systm.h> | 85 | #include <sys/systm.h> | |
86 | #include <sys/callout.h> | 86 | #include <sys/callout.h> | |
87 | #include <sys/sockio.h> | 87 | #include <sys/sockio.h> | |
88 | #include <sys/mbuf.h> | 88 | #include <sys/mbuf.h> | |
89 | #include <sys/malloc.h> | 89 | #include <sys/malloc.h> | |
90 | #include <sys/kernel.h> | 90 | #include <sys/kernel.h> | |
91 | #include <sys/device.h> | 91 | #include <sys/device.h> | |
92 | #include <sys/socket.h> | 92 | #include <sys/socket.h> | |
93 | #include <sys/sysctl.h> | 93 | #include <sys/sysctl.h> | |
94 | #include <sys/rndsource.h> | 94 | #include <sys/rndsource.h> | |
95 | 95 | |||
@@ -2893,27 +2893,27 @@ bge_blockinit(struct bge_softc *sc) | @@ -2893,27 +2893,27 @@ bge_blockinit(struct bge_softc *sc) | |||
2893 | */ | 2893 | */ | |
2894 | if (sc->bge_chipid == BGE_CHIPID_BCM5719_A0 || | 2894 | if (sc->bge_chipid == BGE_CHIPID_BCM5719_A0 || | |
2895 | BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5762) { | 2895 | BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5762) { | |
2896 | dmactl &= ~(BGE_RDMA_RSRVCTRL_FIFO_LWM_MASK | | 2896 | dmactl &= ~(BGE_RDMA_RSRVCTRL_FIFO_LWM_MASK | | |
2897 | BGE_RDMA_RSRVCTRL_FIFO_HWM_MASK | | 2897 | BGE_RDMA_RSRVCTRL_FIFO_HWM_MASK | | |
2898 | BGE_RDMA_RSRVCTRL_TXMRGN_MASK); | 2898 | BGE_RDMA_RSRVCTRL_TXMRGN_MASK); | |
2899 | dmactl |= BGE_RDMA_RSRVCTRL_FIFO_LWM_1_5K | | 2899 | dmactl |= BGE_RDMA_RSRVCTRL_FIFO_LWM_1_5K | | |
2900 | BGE_RDMA_RSRVCTRL_FIFO_HWM_1_5K | | 2900 | BGE_RDMA_RSRVCTRL_FIFO_HWM_1_5K | | |
2901 | BGE_RDMA_RSRVCTRL_TXMRGN_320B; | 2901 | BGE_RDMA_RSRVCTRL_TXMRGN_320B; | |
2902 | } | 2902 | } | |
2903 | /* | 2903 | /* | |
2904 | * Enable fix for read DMA FIFO overruns. | 2904 | * Enable fix for read DMA FIFO overruns. | |
2905 | * The fix is to limit the number of RX BDs | 2905 | * The fix is to limit the number of RX BDs | |
2906 | * the hardware would fetch at a fime. | 2906 | * the hardware would fetch at a time. | |
2907 | */ | 2907 | */ | |
2908 | CSR_WRITE_4(sc, rdmareg, dmactl | | 2908 | CSR_WRITE_4(sc, rdmareg, dmactl | | |
2909 | BGE_RDMA_RSRVCTRL_FIFO_OFLW_FIX); | 2909 | BGE_RDMA_RSRVCTRL_FIFO_OFLW_FIX); | |
2910 | } | 2910 | } | |
2911 | 2911 | |||
2912 | if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5719) { | 2912 | if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5719) { | |
2913 | CSR_WRITE_4(sc, BGE_RDMA_LSO_CRPTEN_CTRL, | 2913 | CSR_WRITE_4(sc, BGE_RDMA_LSO_CRPTEN_CTRL, | |
2914 | CSR_READ_4(sc, BGE_RDMA_LSO_CRPTEN_CTRL) | | 2914 | CSR_READ_4(sc, BGE_RDMA_LSO_CRPTEN_CTRL) | | |
2915 | BGE_RDMA_LSO_CRPTEN_CTRL_BLEN_BD_4K | | 2915 | BGE_RDMA_LSO_CRPTEN_CTRL_BLEN_BD_4K | | |
2916 | BGE_RDMA_LSO_CRPTEN_CTRL_BLEN_LSO_4K); | 2916 | BGE_RDMA_LSO_CRPTEN_CTRL_BLEN_LSO_4K); | |
2917 | } else if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5720) { | 2917 | } else if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5720) { | |
2918 | /* | 2918 | /* | |
2919 | * Allow 4KB burst length reads for non-LSO frames. | 2919 | * Allow 4KB burst length reads for non-LSO frames. |
--- src/sys/net/if.c 2021/07/01 22:08:13 1.487
+++ src/sys/net/if.c 2021/09/16 20:17:47 1.488
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: if.c,v 1.487 2021/07/01 22:08:13 blymn Exp $ */ | 1 | /* $NetBSD: if.c,v 1.488 2021/09/16 20:17:47 andvar Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by William Studenmund and Jason R. Thorpe. | 8 | * by William Studenmund and Jason R. Thorpe. | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -80,27 +80,27 @@ | @@ -80,27 +80,27 @@ | |||
80 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | 80 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | |
81 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | 81 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
82 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | 82 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |
83 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | 83 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
84 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | 84 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | |
85 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 85 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
86 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 86 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
87 | * SUCH DAMAGE. | 87 | * SUCH DAMAGE. | |
88 | * | 88 | * | |
89 | * @(#)if.c 8.5 (Berkeley) 1/9/95 | 89 | * @(#)if.c 8.5 (Berkeley) 1/9/95 | |
90 | */ | 90 | */ | |
91 | 91 | |||
92 | #include <sys/cdefs.h> | 92 | #include <sys/cdefs.h> | |
93 | __KERNEL_RCSID(0, "$NetBSD: if.c,v 1.487 2021/07/01 22:08:13 blymn Exp $"); | 93 | __KERNEL_RCSID(0, "$NetBSD: if.c,v 1.488 2021/09/16 20:17:47 andvar Exp $"); | |
94 | 94 | |||
95 | #if defined(_KERNEL_OPT) | 95 | #if defined(_KERNEL_OPT) | |
96 | #include "opt_inet.h" | 96 | #include "opt_inet.h" | |
97 | #include "opt_ipsec.h" | 97 | #include "opt_ipsec.h" | |
98 | #include "opt_atalk.h" | 98 | #include "opt_atalk.h" | |
99 | #include "opt_wlan.h" | 99 | #include "opt_wlan.h" | |
100 | #include "opt_net_mpsafe.h" | 100 | #include "opt_net_mpsafe.h" | |
101 | #include "opt_mrouting.h" | 101 | #include "opt_mrouting.h" | |
102 | #endif | 102 | #endif | |
103 | 103 | |||
104 | #include <sys/param.h> | 104 | #include <sys/param.h> | |
105 | #include <sys/mbuf.h> | 105 | #include <sys/mbuf.h> | |
106 | #include <sys/systm.h> | 106 | #include <sys/systm.h> | |
@@ -1316,27 +1316,27 @@ if_detach(struct ifnet *ifp) | @@ -1316,27 +1316,27 @@ if_detach(struct ifnet *ifp) | |||
1316 | * XXX socket structure... | 1316 | * XXX socket structure... | |
1317 | */ | 1317 | */ | |
1318 | memset(&so, 0, sizeof(so)); | 1318 | memset(&so, 0, sizeof(so)); | |
1319 | 1319 | |||
1320 | s = splnet(); | 1320 | s = splnet(); | |
1321 | 1321 | |||
1322 | sysctl_teardown(&ifp->if_sysctl_log); | 1322 | sysctl_teardown(&ifp->if_sysctl_log); | |
1323 | 1323 | |||
1324 | IFNET_LOCK(ifp); | 1324 | IFNET_LOCK(ifp); | |
1325 | 1325 | |||
1326 | /* | 1326 | /* | |
1327 | * Unset all queued link states and pretend a | 1327 | * Unset all queued link states and pretend a | |
1328 | * link state change is scheduled. | 1328 | * link state change is scheduled. | |
1329 | * This stops any more link state changes occuring for this | 1329 | * This stops any more link state changes occurring for this | |
1330 | * interface while it's being detached so it's safe | 1330 | * interface while it's being detached so it's safe | |
1331 | * to drain the workqueue. | 1331 | * to drain the workqueue. | |
1332 | */ | 1332 | */ | |
1333 | IF_LINK_STATE_CHANGE_LOCK(ifp); | 1333 | IF_LINK_STATE_CHANGE_LOCK(ifp); | |
1334 | ifp->if_link_queue = -1; /* all bits set, see link_state_change() */ | 1334 | ifp->if_link_queue = -1; /* all bits set, see link_state_change() */ | |
1335 | ifp->if_link_scheduled = true; | 1335 | ifp->if_link_scheduled = true; | |
1336 | IF_LINK_STATE_CHANGE_UNLOCK(ifp); | 1336 | IF_LINK_STATE_CHANGE_UNLOCK(ifp); | |
1337 | workqueue_wait(ifnet_link_state_wq, &ifp->if_link_work); | 1337 | workqueue_wait(ifnet_link_state_wq, &ifp->if_link_work); | |
1338 | 1338 | |||
1339 | if_deactivate(ifp); | 1339 | if_deactivate(ifp); | |
1340 | IFNET_UNLOCK(ifp); | 1340 | IFNET_UNLOCK(ifp); | |
1341 | 1341 | |||
1342 | /* | 1342 | /* |
--- src/sys/nfs/nfs_serv.c 2020/09/05 16:30:12 1.181
+++ src/sys/nfs/nfs_serv.c 2021/09/16 20:17:47 1.182
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: nfs_serv.c,v 1.181 2020/09/05 16:30:12 riastradh Exp $ */ | 1 | /* $NetBSD: nfs_serv.c,v 1.182 2021/09/16 20:17:47 andvar Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1989, 1993 | 4 | * Copyright (c) 1989, 1993 | |
5 | * The Regents of the University of California. All rights reserved. | 5 | * The Regents of the University of California. All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to Berkeley by | 7 | * This code is derived from software contributed to Berkeley by | |
8 | * Rick Macklem at The University of Guelph. | 8 | * Rick Macklem at The University of Guelph. | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -45,27 +45,27 @@ | @@ -45,27 +45,27 @@ | |||
45 | * - do not mix the phases, since the nfsm_?? macros can return failures | 45 | * - do not mix the phases, since the nfsm_?? macros can return failures | |
46 | * on a bad rpc or similar and do not do any vrele() or vput()'s | 46 | * on a bad rpc or similar and do not do any vrele() or vput()'s | |
47 | * | 47 | * | |
48 | * - the nfsm_reply() macro generates an nfs rpc reply with the nfs | 48 | * - the nfsm_reply() macro generates an nfs rpc reply with the nfs | |
49 | * error number iff error != 0 whereas | 49 | * error number iff error != 0 whereas | |
50 | * returning an error from the server function implies a fatal error | 50 | * returning an error from the server function implies a fatal error | |
51 | * such as a badly constructed rpc request that should be dropped without | 51 | * such as a badly constructed rpc request that should be dropped without | |
52 | * a reply. | 52 | * a reply. | |
53 | * For Version 3, nfsm_reply() does not return for the error case, since | 53 | * For Version 3, nfsm_reply() does not return for the error case, since | |
54 | * most version 3 rpcs return more than the status for error cases. | 54 | * most version 3 rpcs return more than the status for error cases. | |
55 | */ | 55 | */ | |
56 | 56 | |||
57 | #include <sys/cdefs.h> | 57 | #include <sys/cdefs.h> | |
58 | __KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.181 2020/09/05 16:30:12 riastradh Exp $"); | 58 | __KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.182 2021/09/16 20:17:47 andvar Exp $"); | |
59 | 59 | |||
60 | #include <sys/param.h> | 60 | #include <sys/param.h> | |
61 | #include <sys/systm.h> | 61 | #include <sys/systm.h> | |
62 | #include <sys/proc.h> | 62 | #include <sys/proc.h> | |
63 | #include <sys/file.h> | 63 | #include <sys/file.h> | |
64 | #include <sys/namei.h> | 64 | #include <sys/namei.h> | |
65 | #include <sys/vnode.h> | 65 | #include <sys/vnode.h> | |
66 | #include <sys/mount.h> | 66 | #include <sys/mount.h> | |
67 | #include <sys/fstrans.h> | 67 | #include <sys/fstrans.h> | |
68 | #include <sys/socket.h> | 68 | #include <sys/socket.h> | |
69 | #include <sys/socketvar.h> | 69 | #include <sys/socketvar.h> | |
70 | #include <sys/mbuf.h> | 70 | #include <sys/mbuf.h> | |
71 | #include <sys/dirent.h> | 71 | #include <sys/dirent.h> | |
@@ -343,27 +343,27 @@ nfsrv_setattr(struct nfsrv_descript *nfs | @@ -343,27 +343,27 @@ nfsrv_setattr(struct nfsrv_descript *nfs | |||
343 | if (!error && gcheck && | 343 | if (!error && gcheck && | |
344 | (preat.va_ctime.tv_sec != guard.tv_sec || | 344 | (preat.va_ctime.tv_sec != guard.tv_sec || | |
345 | preat.va_ctime.tv_nsec != guard.tv_nsec)) | 345 | preat.va_ctime.tv_nsec != guard.tv_nsec)) | |
346 | error = NFSERR_NOT_SYNC; | 346 | error = NFSERR_NOT_SYNC; | |
347 | if (error) { | 347 | if (error) { | |
348 | vput(vp); | 348 | vput(vp); | |
349 | nfsm_reply(NFSX_WCCDATA(v3)); | 349 | nfsm_reply(NFSX_WCCDATA(v3)); | |
350 | nfsm_srvwcc_data(preat_ret, &preat, postat_ret, &va); | 350 | nfsm_srvwcc_data(preat_ret, &preat, postat_ret, &va); | |
351 | return (0); | 351 | return (0); | |
352 | } | 352 | } | |
353 | } | 353 | } | |
354 | 354 | |||
355 | /* | 355 | /* | |
356 | * If the size is being changed write acces is required, otherwise | 356 | * If the size is being changed write access is required, otherwise | |
357 | * just check for a read only file system. | 357 | * just check for a read only file system. | |
358 | */ | 358 | */ | |
359 | if (va.va_size == ((u_quad_t)((quad_t) -1))) { | 359 | if (va.va_size == ((u_quad_t)((quad_t) -1))) { | |
360 | if (rdonly || (vp->v_mount->mnt_flag & MNT_RDONLY)) { | 360 | if (rdonly || (vp->v_mount->mnt_flag & MNT_RDONLY)) { | |
361 | error = EROFS; | 361 | error = EROFS; | |
362 | goto out; | 362 | goto out; | |
363 | } | 363 | } | |
364 | } else { | 364 | } else { | |
365 | if (vp->v_type == VDIR) { | 365 | if (vp->v_type == VDIR) { | |
366 | error = EISDIR; | 366 | error = EISDIR; | |
367 | goto out; | 367 | goto out; | |
368 | } else if ((error = nfsrv_access(vp, VWRITE, cred, rdonly, | 368 | } else if ((error = nfsrv_access(vp, VWRITE, cred, rdonly, | |
369 | lwp, 0)) != 0) | 369 | lwp, 0)) != 0) |
--- src/sys/sys/flashio.h 2011/06/28 20:49:43 1.4
+++ src/sys/sys/flashio.h 2021/09/16 20:17:48 1.5
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: flashio.h,v 1.4 2011/06/28 20:49:43 ahoka Exp $ */ | 1 | /* $NetBSD: flashio.h,v 1.5 2021/09/16 20:17:48 andvar Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2011 Department of Software Engineering, | 4 | * Copyright (c) 2011 Department of Software Engineering, | |
5 | * University of Szeged, Hungary | 5 | * University of Szeged, Hungary | |
6 | * Copyright (c) 2011 Adam Hoka <ahoka@NetBSD.org> | 6 | * Copyright (c) 2011 Adam Hoka <ahoka@NetBSD.org> | |
7 | * Copyright (c) 2010 David Tengeri <dtengeri@inf.u-szeged.hu> | 7 | * Copyright (c) 2010 David Tengeri <dtengeri@inf.u-szeged.hu> | |
8 | * All rights reserved. | 8 | * All rights reserved. | |
9 | * | 9 | * | |
10 | * This code is derived from software contributed to The NetBSD Foundation | 10 | * This code is derived from software contributed to The NetBSD Foundation | |
11 | * by the Department of Software Engineering, University of Szeged, Hungary | 11 | * by the Department of Software Engineering, University of Szeged, Hungary | |
12 | * | 12 | * | |
13 | * Redistribution and use in source and binary forms, with or without | 13 | * Redistribution and use in source and binary forms, with or without | |
14 | * modification, are permitted provided that the following conditions | 14 | * modification, are permitted provided that the following conditions | |
@@ -27,27 +27,27 @@ | @@ -27,27 +27,27 @@ | |||
27 | * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 27 | * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |
28 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED | 28 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED | |
29 | * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | 29 | * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | |
30 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 30 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
31 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 31 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
32 | * SUCH DAMAGE. | 32 | * SUCH DAMAGE. | |
33 | */ | 33 | */ | |
34 | 34 | |||
35 | #ifndef _FLASHIO_H_ | 35 | #ifndef _FLASHIO_H_ | |
36 | #define _FLASHIO_H_ | 36 | #define _FLASHIO_H_ | |
37 | 37 | |||
38 | #include <sys/ioctl.h> | 38 | #include <sys/ioctl.h> | |
39 | 39 | |||
40 | /* this header may be used fron the kernel */ | 40 | /* this header may be used from the kernel */ | |
41 | #if defined(_KERNEL) || defined(_STANDALONE) | 41 | #if defined(_KERNEL) || defined(_STANDALONE) | |
42 | #include <sys/types.h> | 42 | #include <sys/types.h> | |
43 | #else | 43 | #else | |
44 | #include <stdint.h> | 44 | #include <stdint.h> | |
45 | #include <stdbool.h> | 45 | #include <stdbool.h> | |
46 | #endif | 46 | #endif | |
47 | 47 | |||
48 | enum { | 48 | enum { | |
49 | FLASH_ERASE_DONE = 0x0, | 49 | FLASH_ERASE_DONE = 0x0, | |
50 | FLASH_ERASE_FAILED = 0x1 | 50 | FLASH_ERASE_FAILED = 0x1 | |
51 | }; | 51 | }; | |
52 | 52 | |||
53 | enum { | 53 | enum { |