CVS commit: src/sys/arch/riscv/starfive
Module Name:src Committed By: skrll Date: Wed Jan 17 07:05:35 UTC 2024 Modified Files: src/sys/arch/riscv/starfive: jh7100_clkc.h Log Message: Fix types of constants To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/starfive/jh7100_clkc.h 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/riscv/starfive/jh7100_clkc.h diff -u src/sys/arch/riscv/starfive/jh7100_clkc.h:1.1 src/sys/arch/riscv/starfive/jh7100_clkc.h:1.2 --- src/sys/arch/riscv/starfive/jh7100_clkc.h:1.1 Tue Jan 16 09:06:46 2024 +++ src/sys/arch/riscv/starfive/jh7100_clkc.h Wed Jan 17 07:05:35 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: jh7100_clkc.h,v 1.1 2024/01/16 09:06:46 skrll Exp $ */ +/* $NetBSD: jh7100_clkc.h,v 1.2 2024/01/17 07:05:35 skrll Exp $ */ /*- * Copyright (c) 2023 The NetBSD Foundation, Inc. @@ -49,8 +49,8 @@ #define JH7100_CLK_INT_MASK __BITS(7, 0) /* fractional divider min/max */ -#define JH7100_CLK_FRAC_MIN 100 -#define JH7100_CLK_FRAC_MAX (26600 - 1) +#define JH7100_CLK_FRAC_MIN 100UL +#define JH7100_CLK_FRAC_MAX (26600UL - 1) struct jh7100_clkc_softc; struct jh7100_clkc_clk;
CVS commit: src/sys/arch/riscv/starfive
Module Name:src Committed By: skrll Date: Wed Jan 17 07:05:35 UTC 2024 Modified Files: src/sys/arch/riscv/starfive: jh7100_clkc.h Log Message: Fix types of constants To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/starfive/jh7100_clkc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/starfive
Module Name:src Committed By: skrll Date: Wed Jan 17 06:56:50 UTC 2024 Modified Files: src/sys/arch/riscv/starfive: jh7100_clkc.c Log Message: Implement jh7100_clkc_fracdiv_get_rate To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/starfive/jh7100_clkc.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/riscv/starfive/jh7100_clkc.c diff -u src/sys/arch/riscv/starfive/jh7100_clkc.c:1.1 src/sys/arch/riscv/starfive/jh7100_clkc.c:1.2 --- src/sys/arch/riscv/starfive/jh7100_clkc.c:1.1 Tue Jan 16 09:06:46 2024 +++ src/sys/arch/riscv/starfive/jh7100_clkc.c Wed Jan 17 06:56:50 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: jh7100_clkc.c,v 1.1 2024/01/16 09:06:46 skrll Exp $ */ +/* $NetBSD: jh7100_clkc.c,v 1.2 2024/01/17 06:56:50 skrll Exp $ */ /*- * Copyright (c) 2023 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: jh7100_clkc.c,v 1.1 2024/01/16 09:06:46 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: jh7100_clkc.c,v 1.2 2024/01/17 06:56:50 skrll Exp $"); #include @@ -395,9 +395,12 @@ jh7100_clkc_fracdiv_get_rate(struct jh71 if (rate == 0) return 0; - panic("Implement me"); + uint32_t val = RD4(sc, jcc->jcc_reg); + unsigned long div100 = + 100UL * __SHIFTOUT(val, JH7100_CLK_INT_MASK) + + __SHIFTOUT(val, JH7100_CLK_FRAC_MASK); - return rate; + return (div100 >= JH7100_CLK_FRAC_MIN) ? 100UL * rate / div100 : 0; } int
CVS commit: src/sys/arch/riscv/starfive
Module Name:src Committed By: skrll Date: Wed Jan 17 06:56:50 UTC 2024 Modified Files: src/sys/arch/riscv/starfive: jh7100_clkc.c Log Message: Implement jh7100_clkc_fracdiv_get_rate To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/starfive/jh7100_clkc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: thorpej Date: Wed Jan 17 05:41:57 UTC 2024 Modified Files: src/sys/arch/m68k/m68k: switch_subr.s Log Message: cpu_switchto(): No need for the pmap_activate() dance here; it's already done for us in mi_switch(). To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/m68k/m68k/switch_subr.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/m68k/m68k/switch_subr.s diff -u src/sys/arch/m68k/m68k/switch_subr.s:1.36 src/sys/arch/m68k/m68k/switch_subr.s:1.37 --- src/sys/arch/m68k/m68k/switch_subr.s:1.36 Tue Sep 26 14:33:55 2023 +++ src/sys/arch/m68k/m68k/switch_subr.s Wed Jan 17 05:41:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: switch_subr.s,v 1.36 2023/09/26 14:33:55 tsutsui Exp $ */ +/* $NetBSD: switch_subr.s,v 1.37 2024/01/17 05:41:57 thorpej Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation. @@ -88,7 +88,7 @@ GLOBAL(_Idle)/* For sun2/sun3's cloc * Switch to the specific next LWP. */ ENTRY(cpu_switchto) - movl 4(%sp),%a1 | fetch `current' lwp + movl 4(%sp),%a1 | fetch outgoing lwp /* * Save state of previous process in its pcb. */ @@ -133,78 +133,38 @@ ENTRY(cpu_switchto) #endif /* !_M68K_CUSTOM_FPU_CTX */ movl 8(%sp),%a0 | get newlwp - movl %a0,_C_LABEL(curlwp) + movl %a0,_C_LABEL(curlwp) | curlwp = new lwp movl L_PCB(%a0),%a1 | get its pcb - movl %a1,_C_LABEL(curpcb) + movl %a1,_C_LABEL(curpcb) | curpcb = new pcb -#if defined(sun2) || defined(sun3) - movl L_PROC(%a0),%a2 - movl P_VMSPACE(%a2),%a2 | vm = p->p_vmspace -#if defined(DIAGNOSTIC) && !defined(sun2) - tstl %a2 | vm == VM_MAP_NULL? - jeq .Lcpu_switch_badsw | panic -#endif - pea (%a0) | save newlwp -#if !defined(_SUN3X_) || defined(PMAP_DEBUG) - movl VM_PMAP(%a2),-(%sp) | push vm->vm_map.pmap - jbsr _C_LABEL(_pmap_switch) | _pmap_switch(pmap) - addql #4,%sp - movl _C_LABEL(curpcb),%a1 | restore curpcb -| Note: _pmap_switch() will clear the cache if needed. -#else - /* Use this inline version on sun3x when not debugging the pmap. */ - lea _C_LABEL(kernel_crp),%a3 | our CPU Root Ptr. (CRP) - movl VM_PMAP(%a2),%a2 | pmap = vm->vm_map.pmap - movl PM_A_PHYS(%a2),%d0 | phys = pmap->pm_a_phys - cmpl 4(%a3),%d0 | == kernel_crp.rp_addr ? - jeq .Lsame_mmuctx | skip loadcrp/flush - /* OK, it is a new MMU context. Load it up. */ - movl %d0,4(%a3) - movl #CACHE_CLR,%d0 - movc %d0,%cacr | invalidate cache(s) - pflusha| flush entire TLB - pmove (%a3),%crp | load new user root pointer -.Lsame_mmuctx: -#endif /* !defined(_SUN3X_) || defined(PMAP_DEBUG) */ -#else /* !defined(sun2) && !defined(sun3) */ /* - * Activate process's address space. - * XXX Should remember the last USTP value loaded, and call this - * XXX only of it has changed. + * Check for restartable atomic sequences (RAS) */ - pea (%a0) | push newlwp - jbsr _C_LABEL(pmap_activate) | pmap_activate(newlwp) - /* Note that newlwp will be popped off the stack later. */ -#endif - - /* - * Check for restartable atomic sequences (RAS) - */ - movl _C_LABEL(curlwp),%a0 movl L_PROC(%a0),%a2 - tstl P_RASLIST(%a2) - jeq 1f + tstl P_RASLIST(%a2) | p->p_raslist == NULL? + jeq 2f | yes, skip it. movl L_MD_REGS(%a0),%a1 - movl TF_PC(%a1),-(%sp) - movl %a2,-(%sp) - jbsr _C_LABEL(ras_lookup) + movl TF_PC(%a1),-(%sp) | push return PC + movl %a2,-(%sp) | push proc + jbsr _C_LABEL(ras_lookup) | a0 = ras_lookup(p, pc) addql #8,%sp movql #-1,%d0 - cmpl %a0,%d0 - jeq 1f + cmpl %a0,%d0 | a0 == -1? + jeq 1f | yes, skip it. movl _C_LABEL(curlwp),%a1 movl L_MD_REGS(%a1),%a1 - movl %a0,TF_PC(%a1) + movl %a0,TF_PC(%a1) | fixup return PC 1: - movl (%sp)+,%d0 | restore newlwp - movl _C_LABEL(curpcb),%a1 | restore pcb + movl _C_LABEL(curlwp),%a0 | recover new lwp + movl _C_LABEL(curpcb),%a1 | recover new pcb +2: + movl %a0,%d0 | free up %a0 + movl 4(%sp),%d1 | get oldlwp for return value + lea _ASM_LABEL(tmpstk),%sp | switch to tmp stack in case of NMI - movl 4(%sp),%d1 | restore oldlwp for a return value - lea _ASM_LABEL(tmpstk),%sp | now goto a tmp stack for NMI - - moveml PCB_REGS(%a1),%d2-%d7/%a2-%a7 | and registers + moveml PCB_REGS(%a1),%d2-%d7/%a2-%a7 | restore registers movl PCB_USP(%a1),%a0 - movl %a0,%usp | and USP + movl %a0,%usp | and USP #ifdef _M68K_CUSTOM_FPU_CTX moveml %d0/%d1,-(%sp) @@ -245,14 +205,10 @@ ENTRY(cpu_switchto) #endif /* !_M68K_CUSTOM_FPU_CTX */ .Lcpu_switch_nofprest: - movl %d1,%d0 - movl %d0,%a0 + movl %d1,%d0 | return outgoing lwp + movl %d0,%a0 | (in a0, too) rts -.Lcpu_switch_badsw: - PANIC("switch") - /*NOTREACHED*/ - /* * savectx(pcb) * Update pcb, saving current processor state.
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: thorpej Date: Wed Jan 17 05:41:57 UTC 2024 Modified Files: src/sys/arch/m68k/m68k: switch_subr.s Log Message: cpu_switchto(): No need for the pmap_activate() dance here; it's already done for us in mi_switch(). To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/m68k/m68k/switch_subr.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src Committed By: thorpej Date: Wed Jan 17 05:22:11 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: locore.s Log Message: G/C intrcnt[]. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/virt68k/virt68k/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/virt68k/virt68k/locore.s diff -u src/sys/arch/virt68k/virt68k/locore.s:1.10 src/sys/arch/virt68k/virt68k/locore.s:1.11 --- src/sys/arch/virt68k/virt68k/locore.s:1.10 Tue Jan 16 15:38:58 2024 +++ src/sys/arch/virt68k/virt68k/locore.s Wed Jan 17 05:22:11 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.10 2024/01/16 15:38:58 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.11 2024/01/17 05:22:11 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -622,24 +622,3 @@ GLOBAL(cputype) GLOBAL(fputype) .long FPU_68040 | default to FPU_68040 - -/* - * interrupt counters. - * XXXSCW: Will go away soon; kept here to keep vmstat happy - */ -GLOBAL(intrnames) - .asciz "spur" - .asciz "lev1" - .asciz "lev2" - .asciz "lev3" - .asciz "lev4" - .asciz "clock" - .asciz "lev6" - .asciz "nmi" - .asciz "statclock" -GLOBAL(eintrnames) - .even - -GLOBAL(intrcnt) - .long 0,0,0,0,0,0,0,0,0 -GLOBAL(eintrcnt)
CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src Committed By: thorpej Date: Wed Jan 17 05:22:11 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: locore.s Log Message: G/C intrcnt[]. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/virt68k/virt68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: andvar Date: Tue Jan 16 21:08:52 UTC 2024 Modified Files: src/sys/dev/i2c: mcp980x.c src/sys/dev/ic: icpsp.c Log Message: Fix typos in word "particularly", in comments. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/i2c/mcp980x.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/icpsp.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/dev/i2c/mcp980x.c diff -u src/sys/dev/i2c/mcp980x.c:1.7 src/sys/dev/i2c/mcp980x.c:1.8 --- src/sys/dev/i2c/mcp980x.c:1.7 Mon Dec 23 14:48:58 2019 +++ src/sys/dev/i2c/mcp980x.c Tue Jan 16 21:08:52 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: mcp980x.c,v 1.7 2019/12/23 14:48:58 thorpej Exp $ */ +/* $NetBSD: mcp980x.c,v 1.8 2024/01/16 21:08:52 andvar Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -32,13 +32,13 @@ /* * Microchip MCP9800/1/2/3 2-Wire High-Accuracy Temperature Sensor driver. * - * TODO: better error checking, particurarly in user settable limits. + * TODO: better error checking, particularly in user settable limits. * * Note: MCP9805 is different and is supported by the sdtemp(4) driver. */ #include -__KERNEL_RCSID(0, "$NetBSD: mcp980x.c,v 1.7 2019/12/23 14:48:58 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcp980x.c,v 1.8 2024/01/16 21:08:52 andvar Exp $"); #include #include Index: src/sys/dev/ic/icpsp.c diff -u src/sys/dev/ic/icpsp.c:1.28 src/sys/dev/ic/icpsp.c:1.29 --- src/sys/dev/ic/icpsp.c:1.28 Sat Aug 7 16:19:12 2021 +++ src/sys/dev/ic/icpsp.c Tue Jan 16 21:08:52 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: icpsp.c,v 1.28 2021/08/07 16:19:12 thorpej Exp $ */ +/* $NetBSD: icpsp.c,v 1.29 2024/01/16 21:08:52 andvar Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.28 2021/08/07 16:19:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.29 2024/01/16 21:08:52 andvar Exp $"); #include #include @@ -259,7 +259,7 @@ icpsp_scsipi_request(struct scsipi_chann case ADAPTER_REQ_SET_XFER_MODE: /* * Neither of these cases are supported, and neither of them - * is particulatly relevant, since we have an abstract view + * is particularly relevant, since we have an abstract view * of the bus; the controller takes care of all the nitty * gritty. */
CVS commit: src/sys/dev
Module Name:src Committed By: andvar Date: Tue Jan 16 21:08:52 UTC 2024 Modified Files: src/sys/dev/i2c: mcp980x.c src/sys/dev/ic: icpsp.c Log Message: Fix typos in word "particularly", in comments. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/i2c/mcp980x.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/icpsp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/i386
Module Name:src Committed By: gson Date: Tue Jan 16 21:04:26 UTC 2024 Modified Files: src/usr.sbin/sysinst/arch/i386: msg.md.en Log Message: The serial bootblocks use the selected serial port, not the first serial port. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/i386/msg.md.en Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/arch/i386/msg.md.en diff -u src/usr.sbin/sysinst/arch/i386/msg.md.en:1.4 src/usr.sbin/sysinst/arch/i386/msg.md.en:1.5 --- src/usr.sbin/sysinst/arch/i386/msg.md.en:1.4 Sat Nov 16 21:25:14 2019 +++ src/usr.sbin/sysinst/arch/i386/msg.md.en Tue Jan 16 21:04:26 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.en,v 1.4 2019/11/16 21:25:14 martin Exp $ */ +/* $NetBSD: msg.md.en,v 1.5 2024/01/16 21:04:26 gson Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -53,7 +53,7 @@ message getboottype {Would you like to install the normal set of bootblocks or serial bootblocks? Normal bootblocks use the BIOS console device as the console -(usually the monitor and keyboard). Serial bootblocks use the first +(usually the monitor and keyboard). Serial bootblocks use the selected serial port as the console. Selected bootblock: }
CVS commit: src/usr.sbin/sysinst/arch/i386
Module Name:src Committed By: gson Date: Tue Jan 16 21:04:26 UTC 2024 Modified Files: src/usr.sbin/sysinst/arch/i386: msg.md.en Log Message: The serial bootblocks use the selected serial port, not the first serial port. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/i386/msg.md.en Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Tue Jan 16 15:38:59 UTC 2024 Modified Files: src/sys/arch/amiga/amiga: locore.s src/sys/arch/atari/atari: locore.s src/sys/arch/cesfic/cesfic: locore.s src/sys/arch/hp300/hp300: locore.s src/sys/arch/luna68k/luna68k: locore.s src/sys/arch/m68k/conf: files.m68k src/sys/arch/m68k/m68k: support.s src/sys/arch/mac68k/mac68k: locore.s src/sys/arch/mvme68k/mvme68k: locore.s src/sys/arch/news68k/news68k: locore.s src/sys/arch/next68k/next68k: locore.s src/sys/arch/sun2/sun2: locore.s src/sys/arch/sun3/sun3: locore.s src/sys/arch/sun3/sun3x: locore.s src/sys/arch/virt68k/virt68k: locore.s src/sys/arch/x68k/x68k: locore.s Log Message: Build m68k/support.s on its own; don't include it from locore.s To generate a diff of this commit: cvs rdiff -u -r1.167 -r1.168 src/sys/arch/amiga/amiga/locore.s cvs rdiff -u -r1.123 -r1.124 src/sys/arch/atari/atari/locore.s cvs rdiff -u -r1.43 -r1.44 src/sys/arch/cesfic/cesfic/locore.s cvs rdiff -u -r1.181 -r1.182 src/sys/arch/hp300/hp300/locore.s cvs rdiff -u -r1.79 -r1.80 src/sys/arch/luna68k/luna68k/locore.s cvs rdiff -u -r1.51 -r1.52 src/sys/arch/m68k/conf/files.m68k cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/m68k/support.s cvs rdiff -u -r1.180 -r1.181 src/sys/arch/mac68k/mac68k/locore.s cvs rdiff -u -r1.127 -r1.128 src/sys/arch/mvme68k/mvme68k/locore.s cvs rdiff -u -r1.82 -r1.83 src/sys/arch/news68k/news68k/locore.s cvs rdiff -u -r1.82 -r1.83 src/sys/arch/next68k/next68k/locore.s cvs rdiff -u -r1.35 -r1.36 src/sys/arch/sun2/sun2/locore.s cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sun3/sun3/locore.s cvs rdiff -u -r1.75 -r1.76 src/sys/arch/sun3/sun3x/locore.s cvs rdiff -u -r1.9 -r1.10 src/sys/arch/virt68k/virt68k/locore.s cvs rdiff -u -r1.128 -r1.129 src/sys/arch/x68k/x68k/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/amiga/amiga/locore.s diff -u src/sys/arch/amiga/amiga/locore.s:1.167 src/sys/arch/amiga/amiga/locore.s:1.168 --- src/sys/arch/amiga/amiga/locore.s:1.167 Fri Jan 12 01:53:56 2024 +++ src/sys/arch/amiga/amiga/locore.s Tue Jan 16 15:38:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.167 2024/01/12 01:53:56 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.168 2024/01/16 15:38:57 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -1063,11 +1063,6 @@ Lnoflush: */ /* - * Use common m68k support routines. - */ -#include - -/* * non-local gotos */ ENTRY(qsetjmp) Index: src/sys/arch/atari/atari/locore.s diff -u src/sys/arch/atari/atari/locore.s:1.123 src/sys/arch/atari/atari/locore.s:1.124 --- src/sys/arch/atari/atari/locore.s:1.123 Fri Jan 12 01:53:57 2024 +++ src/sys/arch/atari/atari/locore.s Tue Jan 16 15:38:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.123 2024/01/12 01:53:57 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.124 2024/01/16 15:38:57 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -1052,11 +1052,6 @@ Lnoflush: */ /* - * Use common m68k support routines. - */ -#include - -/* * non-local gotos */ ENTRY(qsetjmp) Index: src/sys/arch/cesfic/cesfic/locore.s diff -u src/sys/arch/cesfic/cesfic/locore.s:1.43 src/sys/arch/cesfic/cesfic/locore.s:1.44 --- src/sys/arch/cesfic/cesfic/locore.s:1.43 Mon Jan 15 19:28:06 2024 +++ src/sys/arch/cesfic/cesfic/locore.s Tue Jan 16 15:38:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.43 2024/01/15 19:28:06 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.44 2024/01/16 15:38:57 thorpej Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -735,11 +735,6 @@ Ldorte: */ /* - * Use common m68k support routines. - */ -#include - -/* * Use common m68k process/lwp switch and context save subroutines. */ #define FPCOPROC /* XXX: Temporarily required */ Index: src/sys/arch/hp300/hp300/locore.s diff -u src/sys/arch/hp300/hp300/locore.s:1.181 src/sys/arch/hp300/hp300/locore.s:1.182 --- src/sys/arch/hp300/hp300/locore.s:1.181 Tue Jan 16 03:44:44 2024 +++ src/sys/arch/hp300/hp300/locore.s Tue Jan 16 15:38:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.181 2024/01/16 03:44:44 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.182 2024/01/16 15:38:57 thorpej Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -957,11 +957,6 @@ Laststkadj: */ /* - * Use common m68k support routines. - */ -#include - -/* * Use common m68k process/lwp switch and context save subroutines. */ #define FPCOPROC /* XXX: Temp. reqd. */ Index: src/sys/arch/luna68k/luna68k/locore.s diff -u src/sys/arch/luna68k/luna68k/locore.s:1.79 src/sys/arch/luna68k/luna68k/locore.s:1.80 --- src/sys/arch/luna68k/luna68k/locore.s:1.79 Mon Jan 15 20:10:34 2024 +++ src/sys/arch/luna68k/luna68k/locore.s Tue Jan 16 15:38:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.79 2024/01/15 20:10:34 thorpej Exp $ */ +/* $NetBSD:
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Tue Jan 16 15:38:59 UTC 2024 Modified Files: src/sys/arch/amiga/amiga: locore.s src/sys/arch/atari/atari: locore.s src/sys/arch/cesfic/cesfic: locore.s src/sys/arch/hp300/hp300: locore.s src/sys/arch/luna68k/luna68k: locore.s src/sys/arch/m68k/conf: files.m68k src/sys/arch/m68k/m68k: support.s src/sys/arch/mac68k/mac68k: locore.s src/sys/arch/mvme68k/mvme68k: locore.s src/sys/arch/news68k/news68k: locore.s src/sys/arch/next68k/next68k: locore.s src/sys/arch/sun2/sun2: locore.s src/sys/arch/sun3/sun3: locore.s src/sys/arch/sun3/sun3x: locore.s src/sys/arch/virt68k/virt68k: locore.s src/sys/arch/x68k/x68k: locore.s Log Message: Build m68k/support.s on its own; don't include it from locore.s To generate a diff of this commit: cvs rdiff -u -r1.167 -r1.168 src/sys/arch/amiga/amiga/locore.s cvs rdiff -u -r1.123 -r1.124 src/sys/arch/atari/atari/locore.s cvs rdiff -u -r1.43 -r1.44 src/sys/arch/cesfic/cesfic/locore.s cvs rdiff -u -r1.181 -r1.182 src/sys/arch/hp300/hp300/locore.s cvs rdiff -u -r1.79 -r1.80 src/sys/arch/luna68k/luna68k/locore.s cvs rdiff -u -r1.51 -r1.52 src/sys/arch/m68k/conf/files.m68k cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/m68k/support.s cvs rdiff -u -r1.180 -r1.181 src/sys/arch/mac68k/mac68k/locore.s cvs rdiff -u -r1.127 -r1.128 src/sys/arch/mvme68k/mvme68k/locore.s cvs rdiff -u -r1.82 -r1.83 src/sys/arch/news68k/news68k/locore.s cvs rdiff -u -r1.82 -r1.83 src/sys/arch/next68k/next68k/locore.s cvs rdiff -u -r1.35 -r1.36 src/sys/arch/sun2/sun2/locore.s cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sun3/sun3/locore.s cvs rdiff -u -r1.75 -r1.76 src/sys/arch/sun3/sun3x/locore.s cvs rdiff -u -r1.9 -r1.10 src/sys/arch/virt68k/virt68k/locore.s cvs rdiff -u -r1.128 -r1.129 src/sys/arch/x68k/x68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Tue Jan 16 14:30:22 UTC 2024 Modified Files: src/bin/sh: sh.1 Log Message: Remove an ancient incorrect notion which somehow survived intact for ages. "$@" is (as it is in double quotes) not subject to field splitting. "$@" generates (potentially) multiple words, but field splitting has nothing to do with it. While here, rename the section from "White Space Splitting (Field Splitting)" to simply be "Field Splitting" as white space is only relevant if it happens to occur in IFS (which is the default case, but IFS can be anything, and isn't required to contain any white space at all). To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/sh/sh.1 diff -u src/bin/sh/sh.1:1.258 src/bin/sh/sh.1:1.259 --- src/bin/sh/sh.1:1.258 Thu Oct 12 01:45:07 2023 +++ src/bin/sh/sh.1 Tue Jan 16 14:30:22 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: sh.1,v 1.258 2023/10/12 01:45:07 uwe Exp $ +.\" $NetBSD: sh.1,v 1.259 2024/01/16 14:30:22 kre Exp $ .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -2299,14 +2299,11 @@ and .Dq \&[ . .\" .\" -.Ss White Space Splitting (Field Splitting) +.Ss Field Splitting .\" After parameter expansion, command substitution, and arithmetic expansion the shell scans the results of expansions and substitutions that did not occur in double quotes, -and -.Dq Li $@ -even if it did, for field splitting and multiple fields can result. .Pp The shell treats each character of the
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Tue Jan 16 14:30:22 UTC 2024 Modified Files: src/bin/sh: sh.1 Log Message: Remove an ancient incorrect notion which somehow survived intact for ages. "$@" is (as it is in double quotes) not subject to field splitting. "$@" generates (potentially) multiple words, but field splitting has nothing to do with it. While here, rename the section from "White Space Splitting (Field Splitting)" to simply be "Field Splitting" as white space is only relevant if it happens to occur in IFS (which is the default case, but IFS can be anything, and isn't required to contain any white space at all). To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Tue Jan 16 09:42:44 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: sqlite3-3.45 out To generate a diff of this commit: cvs rdiff -u -r1.1975 -r1.1976 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1975 src/doc/3RDPARTY:1.1976 --- src/doc/3RDPARTY:1.1975 Fri Jan 12 19:31:43 2024 +++ src/doc/3RDPARTY Tue Jan 16 09:42:44 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1975 2024/01/12 19:31:43 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1976 2024/01/16 09:42:44 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1328,10 +1328,10 @@ original. Package: sqlite Version: 3.43.0 -Current Vers: 3.44.0 +Current Vers: 3.45.0 Maintainer: Richard Hipp Home Page: http://www.sqlite.org -Date: 2023-09-04 +Date: 2024-01-16 Responsible: joerg License: Public domain Location: external/public-domain/sqlite/dist
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Tue Jan 16 09:42:44 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: sqlite3-3.45 out To generate a diff of this commit: cvs rdiff -u -r1.1975 -r1.1976 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv
Module Name:src Committed By: skrll Date: Tue Jan 16 09:06:47 UTC 2024 Modified Files: src/sys/arch/riscv/conf: GENERIC64 files.generic64 Added Files: src/sys/arch/riscv/starfive: files.starfive jh7100_clkc.c jh7100_clkc.h Log Message: risc-v: add a StarTech JH7100 SoC clock driver The JH7100 is seen in the Beagle-V board. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/conf/GENERIC64 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/conf/files.generic64 cvs rdiff -u -r0 -r1.1 src/sys/arch/riscv/starfive/files.starfive \ src/sys/arch/riscv/starfive/jh7100_clkc.c \ src/sys/arch/riscv/starfive/jh7100_clkc.h 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/riscv/conf/GENERIC64 diff -u src/sys/arch/riscv/conf/GENERIC64:1.2 src/sys/arch/riscv/conf/GENERIC64:1.3 --- src/sys/arch/riscv/conf/GENERIC64:1.2 Sat Jan 13 17:01:58 2024 +++ src/sys/arch/riscv/conf/GENERIC64 Tue Jan 16 09:06:46 2024 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC64,v 1.2 2024/01/13 17:01:58 skrll Exp $ +# $NetBSD: GENERIC64,v 1.3 2024/01/16 09:06:46 skrll Exp $ # # GENERIC machine description file # @@ -49,5 +49,8 @@ options DEBUG # expensive debugging ch # Cache controller ccache* at fdt? # SiFive FU[57]40 L2 Cache +# Clock controller +jh7100clkc* at fdt? pass 2 # StarFive JH7100 clock controller + # Pull in optional local configuration - always at end cinclude "arch/riscv/conf/GENERIC64.local" Index: src/sys/arch/riscv/conf/files.generic64 diff -u src/sys/arch/riscv/conf/files.generic64:1.1 src/sys/arch/riscv/conf/files.generic64:1.2 --- src/sys/arch/riscv/conf/files.generic64:1.1 Sun May 7 12:41:48 2023 +++ src/sys/arch/riscv/conf/files.generic64 Tue Jan 16 09:06:46 2024 @@ -1,7 +1,8 @@ -# $NetBSD: files.generic64,v 1.1 2023/05/07 12:41:48 skrll Exp $ +# $NetBSD: files.generic64,v 1.2 2024/01/16 09:06:46 skrll Exp $ # # Generic (RV64) kernel configuration info # -# Add other board files here +# Add other board / vendor files here include "arch/riscv/sifive/files.sifive" +include "arch/riscv/starfive/files.starfive" Added files: Index: src/sys/arch/riscv/starfive/files.starfive diff -u /dev/null src/sys/arch/riscv/starfive/files.starfive:1.1 --- /dev/null Tue Jan 16 09:06:47 2024 +++ src/sys/arch/riscv/starfive/files.starfive Tue Jan 16 09:06:46 2024 @@ -0,0 +1,10 @@ +# $NetBSD: files.starfive,v 1.1 2024/01/16 09:06:46 skrll Exp $ +# +# Configuration info for StarFive SoCs +# + +# JH7100 Clock controller +device jh7100clkc +attach jh7100clkc at fdt with jh7100_clkc +file arch/riscv/starfive/jh7100_clkc.c jh7100_clkc + Index: src/sys/arch/riscv/starfive/jh7100_clkc.c diff -u /dev/null src/sys/arch/riscv/starfive/jh7100_clkc.c:1.1 --- /dev/null Tue Jan 16 09:06:47 2024 +++ src/sys/arch/riscv/starfive/jh7100_clkc.c Tue Jan 16 09:06:46 2024 @@ -0,0 +1,924 @@ +/* $NetBSD: jh7100_clkc.c,v 1.1 2024/01/16 09:06:46 skrll Exp $ */ + +/*- + * Copyright (c) 2023 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Nick Hudson + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +__KERNEL_RCSID(0, "$NetBSD: jh7100_clkc.c,v 1.1 2024/01/16 09:06:46 skrll Exp $"); + +#include + +#include +#include + +#include + +#include + +#include + + +#define JH7100_CLK_CPUNDBUS_ROOT 0 +#define JH7100_CLK_DSP_ROOT 2 +#define JH7100_CLK_GMACUSB_ROOT 3 +#define JH7100_CLK_PERH0_ROOT 4 +#define JH7100_CLK_PERH1_ROOT 5 +#define JH7100_CLK_VOUT_ROOT 7 +#define JH7100_CLK_AUDIO_ROOT 8 +#define JH7100_CLK_VOUTBUS_ROOT 11
CVS commit: src/sys/arch/riscv
Module Name:src Committed By: skrll Date: Tue Jan 16 09:06:47 UTC 2024 Modified Files: src/sys/arch/riscv/conf: GENERIC64 files.generic64 Added Files: src/sys/arch/riscv/starfive: files.starfive jh7100_clkc.c jh7100_clkc.h Log Message: risc-v: add a StarTech JH7100 SoC clock driver The JH7100 is seen in the Beagle-V board. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/conf/GENERIC64 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/conf/files.generic64 cvs rdiff -u -r0 -r1.1 src/sys/arch/riscv/starfive/files.starfive \ src/sys/arch/riscv/starfive/jh7100_clkc.c \ src/sys/arch/riscv/starfive/jh7100_clkc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Tue Jan 16 08:28:51 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 src/external/gpl2/groff/tmac [netbsd-10]: mdoc.local src/sys/sys [netbsd-10]: param.h Log Message: Welcome to 10.0 RC3 To generate a diff of this commit: cvs rdiff -u -r1.1.2.189 -r1.1.2.190 src/doc/CHANGES-10.0 cvs rdiff -u -r1.7.6.3 -r1.7.6.4 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.722.2.3 -r1.722.2.4 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.189 src/doc/CHANGES-10.0:1.1.2.190 --- src/doc/CHANGES-10.0:1.1.2.189 Tue Jan 16 08:28:00 2024 +++ src/doc/CHANGES-10.0 Tue Jan 16 08:28:51 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.189 2024/01/16 08:28:00 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.190 2024/01/16 08:28:51 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -15236,3 +15236,7 @@ sys/arch/arm/imx/imx23_usb.c 1.7 evbarm: fix build for IMX23_OLINUXINO kernel config. [andvar, ticket #556] +external/gpl2/groff/tmac/mdoc.local (manually edited) +sys/sys/param.h (manually edited) + + Welcome to 10.0_RC3 Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.7.6.3 src/external/gpl2/groff/tmac/mdoc.local:1.7.6.4 --- src/external/gpl2/groff/tmac/mdoc.local:1.7.6.3 Mon Jan 1 11:47:38 2024 +++ src/external/gpl2/groff/tmac/mdoc.local Tue Jan 16 08:28:51 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.7.6.3 2024/01/01 11:47:38 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.7.6.4 2024/01/16 08:28:51 martin Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -46,7 +46,7 @@ .\" Default .Os value .ds doc-operating-system NetBSD\~10.0_BETA .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~10.0_RC2 +.ds doc-default-operating-system NetBSD\~10.0_RC3 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.722.2.3 src/sys/sys/param.h:1.722.2.4 --- src/sys/sys/param.h:1.722.2.3 Mon Jan 1 11:47:38 2024 +++ src/sys/sys/param.h Tue Jan 16 08:28:51 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.722.2.3 2024/01/01 11:47:38 martin Exp $ */ +/* $NetBSD: param.h,v 1.722.2.4 2024/01/16 08:28:51 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 10 /* NetBSD 10.0_RC2 */ +#define __NetBSD_Version__ 10 /* NetBSD 10.0_RC3 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Tue Jan 16 08:28:51 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 src/external/gpl2/groff/tmac [netbsd-10]: mdoc.local src/sys/sys [netbsd-10]: param.h Log Message: Welcome to 10.0 RC3 To generate a diff of this commit: cvs rdiff -u -r1.1.2.189 -r1.1.2.190 src/doc/CHANGES-10.0 cvs rdiff -u -r1.7.6.3 -r1.7.6.4 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.722.2.3 -r1.722.2.4 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Jan 16 08:28:00 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #556 To generate a diff of this commit: cvs rdiff -u -r1.1.2.188 -r1.1.2.189 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.188 src/doc/CHANGES-10.0:1.1.2.189 --- src/doc/CHANGES-10.0:1.1.2.188 Mon Jan 15 16:13:10 2024 +++ src/doc/CHANGES-10.0 Tue Jan 16 08:28:00 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.188 2024/01/15 16:13:10 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.189 2024/01/16 08:28:00 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -15231,3 +15231,8 @@ usr.bin/ftp/fetch.c1.237,1.238 Avoid confusing message when downloading empty files. [mlelstv, ticket #555] +sys/arch/arm/imx/imx23_usb.c 1.7 + + evbarm: fix build for IMX23_OLINUXINO kernel config. + [andvar, ticket #556] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Jan 16 08:28:00 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #556 To generate a diff of this commit: cvs rdiff -u -r1.1.2.188 -r1.1.2.189 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/arm/imx
Module Name:src Committed By: martin Date: Tue Jan 16 08:25:48 UTC 2024 Modified Files: src/sys/arch/arm/imx [netbsd-10]: imx23_usb.c Log Message: Pull up following revision(s) (requested by andvar in ticket #556): sys/arch/arm/imx/imx23_usb.c: revision 1.7 Fix imx23_usb_init() function declaration, it expects two parameters. Fixes build for IMX23_OLINUXINO kernel config. To generate a diff of this commit: cvs rdiff -u -r1.5.6.1 -r1.5.6.2 src/sys/arch/arm/imx/imx23_usb.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/arm/imx/imx23_usb.c diff -u src/sys/arch/arm/imx/imx23_usb.c:1.5.6.1 src/sys/arch/arm/imx/imx23_usb.c:1.5.6.2 --- src/sys/arch/arm/imx/imx23_usb.c:1.5.6.1 Sun May 28 10:14:36 2023 +++ src/sys/arch/arm/imx/imx23_usb.c Tue Jan 16 08:25:48 2024 @@ -1,4 +1,4 @@ -/* $Id: imx23_usb.c,v 1.5.6.1 2023/05/28 10:14:36 martin Exp $ */ +/* $Id: imx23_usb.c,v 1.5.6.2 2024/01/16 08:25:48 martin Exp $ */ /* * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ static void imx23_usb_attach(device_t, d static int imx23_usb_activate(device_t, enum devact); static int imxusbc_search(device_t, cfdata_t, const int *, void *); -static void imx23_usb_init(struct imxehci_softc *); +static void imx23_usb_init(struct imxehci_softc *, uintptr_t); CFATTACH_DECL3_NEW(imxusbc, sizeof(struct imx23_usb_softc),
CVS commit: [netbsd-10] src/sys/arch/arm/imx
Module Name:src Committed By: martin Date: Tue Jan 16 08:25:48 UTC 2024 Modified Files: src/sys/arch/arm/imx [netbsd-10]: imx23_usb.c Log Message: Pull up following revision(s) (requested by andvar in ticket #556): sys/arch/arm/imx/imx23_usb.c: revision 1.7 Fix imx23_usb_init() function declaration, it expects two parameters. Fixes build for IMX23_OLINUXINO kernel config. To generate a diff of this commit: cvs rdiff -u -r1.5.6.1 -r1.5.6.2 src/sys/arch/arm/imx/imx23_usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.