Module Name: src
Committed By: skrll
Date: Sun Aug 4 08:16:26 UTC 2024
Modified Files:
src/sys/arch/riscv/dev: plic_fdt.c
src/sys/arch/riscv/include: asm.h bswap.h bus_defs.h cpu.h
elf_machdep.h intr.h pcb.h pmap.h proc.h types.h
src/sys/arch/riscv/riscv: clock_machdep.c db_disasm.c mainbus.c
sig_machdep.c trap.c vm_machdep.c
src/sys/arch/riscv/starfive: jh71x0_clkc.c
Log Message:
spaces to tabs
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/riscv/dev/plic_fdt.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/riscv/include/asm.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/include/bswap.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/include/bus_defs.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/riscv/include/cpu.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/riscv/include/elf_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/include/intr.h \
src/sys/arch/riscv/include/proc.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/include/pcb.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/riscv/include/pmap.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/riscv/include/types.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/riscv/riscv/clock_machdep.c \
src/sys/arch/riscv/riscv/vm_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/riscv/riscv/db_disasm.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/riscv/riscv/mainbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/riscv/sig_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/riscv/riscv/trap.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/starfive/jh71x0_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/dev/plic_fdt.c
diff -u src/sys/arch/riscv/dev/plic_fdt.c:1.6 src/sys/arch/riscv/dev/plic_fdt.c:1.7
--- src/sys/arch/riscv/dev/plic_fdt.c:1.6 Sun Mar 24 08:34:20 2024
+++ src/sys/arch/riscv/dev/plic_fdt.c Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: plic_fdt.c,v 1.6 2024/03/24 08:34:20 skrll Exp $ */
+/* $NetBSD: plic_fdt.c,v 1.7 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plic_fdt.c,v 1.6 2024/03/24 08:34:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plic_fdt.c,v 1.7 2024/08/04 08:16:25 skrll Exp $");
#include <sys/param.h>
@@ -47,9 +47,9 @@ __KERNEL_RCSID(0, "$NetBSD: plic_fdt.c,v
#include <riscv/dev/plicvar.h>
static const struct device_compatible_entry compat_data[] = {
- { .compat = "riscv,plic0" },
- { .compat = "sifive,plic-1.0.0" },
- DEVICE_COMPAT_EOL
+ { .compat = "riscv,plic0" },
+ { .compat = "sifive,plic-1.0.0" },
+ DEVICE_COMPAT_EOL
};
static void *
@@ -88,7 +88,7 @@ plic_intrstr(device_t dev, u_int *specif
snprintf(buf, buflen, "%s irq %d", device_xname(dev), irq);
- return true;
+ return true;
}
static struct fdtbus_interrupt_controller_func plic_funcs = {
Index: src/sys/arch/riscv/include/asm.h
diff -u src/sys/arch/riscv/include/asm.h:1.7 src/sys/arch/riscv/include/asm.h:1.8
--- src/sys/arch/riscv/include/asm.h:1.7 Sun May 7 12:41:48 2023
+++ src/sys/arch/riscv/include/asm.h Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.7 2023/05/07 12:41:48 skrll Exp $ */
+/* $NetBSD: asm.h,v 1.8 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -113,7 +113,7 @@
MSG(msg)
#define MSG(msg) \
- .pushsection .rodata.str1.8,"aMS",@progbits,1; \
+ .pushsection .rodata.str1.8,"aMS",@progbits,1; \
9: .asciiz msg; \
.popsection
Index: src/sys/arch/riscv/include/bswap.h
diff -u src/sys/arch/riscv/include/bswap.h:1.1 src/sys/arch/riscv/include/bswap.h:1.2
--- src/sys/arch/riscv/include/bswap.h:1.1 Fri Sep 19 17:36:26 2014
+++ src/sys/arch/riscv/include/bswap.h Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
+/* $NetBSD: bswap.h,v 1.2 2024/08/04 08:16:25 skrll Exp $ */
#ifndef _RISCV_BSWAP_H_
#define _RISCV_BSWAP_H_
Index: src/sys/arch/riscv/include/bus_defs.h
diff -u src/sys/arch/riscv/include/bus_defs.h:1.3 src/sys/arch/riscv/include/bus_defs.h:1.4
--- src/sys/arch/riscv/include/bus_defs.h:1.3 Sun May 7 12:41:48 2023
+++ src/sys/arch/riscv/include/bus_defs.h Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.3 2023/05/07 12:41:48 skrll Exp $ */
+/* $NetBSD: bus_defs.h,v 1.4 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -412,7 +412,7 @@ struct riscv_bus_dma_tag {
* DMA tag utility functions
*/
int (*_dmatag_subregion)(bus_dma_tag_t, bus_addr_t, bus_addr_t,
- bus_dma_tag_t *, int);
+ bus_dma_tag_t *, int);
void (*_dmatag_destroy)(bus_dma_tag_t);
/*
Index: src/sys/arch/riscv/include/cpu.h
diff -u src/sys/arch/riscv/include/cpu.h:1.15 src/sys/arch/riscv/include/cpu.h:1.16
--- src/sys/arch/riscv/include/cpu.h:1.15 Mon Dec 25 13:21:30 2023
+++ src/sys/arch/riscv/include/cpu.h Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.15 2023/12/25 13:21:30 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.16 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -215,10 +215,10 @@ static inline void
cpu_dosoftints(void)
{
extern void dosoftints(void);
- struct cpu_info * const ci = curcpu();
- if (ci->ci_intr_depth == 0
+ struct cpu_info * const ci = curcpu();
+ if (ci->ci_intr_depth == 0
&& (ci->ci_data.cpu_softints >> ci->ci_cpl) > 0)
- dosoftints();
+ dosoftints();
}
static inline bool
Index: src/sys/arch/riscv/include/elf_machdep.h
diff -u src/sys/arch/riscv/include/elf_machdep.h:1.9 src/sys/arch/riscv/include/elf_machdep.h:1.10
--- src/sys/arch/riscv/include/elf_machdep.h:1.9 Sat Dec 3 08:54:38 2022
+++ src/sys/arch/riscv/include/elf_machdep.h Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.9 2022/12/03 08:54:38 skrll Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.10 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -128,7 +128,7 @@
#ifdef _KERNEL
#ifdef ELFSIZE
-#define ELF_MD_PROBE_FUNC ELFNAME2(cpu_netbsd,probe)
+#define ELF_MD_PROBE_FUNC ELFNAME2(cpu_netbsd,probe)
#endif
struct exec_package;
Index: src/sys/arch/riscv/include/intr.h
diff -u src/sys/arch/riscv/include/intr.h:1.5 src/sys/arch/riscv/include/intr.h:1.6
--- src/sys/arch/riscv/include/intr.h:1.5 Sun Sep 3 08:48:20 2023
+++ src/sys/arch/riscv/include/intr.h Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.5 2023/09/03 08:48:20 skrll Exp $ */
+/* $NetBSD: intr.h,v 1.6 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@ struct splsw;
typedef int ipl_t;
typedef struct {
- ipl_t _spl;
+ ipl_t _spl;
} ipl_cookie_t;
#ifdef _KERNEL
Index: src/sys/arch/riscv/include/proc.h
diff -u src/sys/arch/riscv/include/proc.h:1.5 src/sys/arch/riscv/include/proc.h:1.6
--- src/sys/arch/riscv/include/proc.h:1.5 Mon May 8 20:51:53 2023
+++ src/sys/arch/riscv/include/proc.h Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.5 2023/05/08 20:51:53 skrll Exp $ */
+/* $NetBSD: proc.h,v 1.6 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -68,8 +68,8 @@ struct mdproc {
#define LWP0_CPU_INFO &cpu_info_store[0] /* staticly set in lwp0 */
#if 0
#define LWP0_MD_INITIALIZER { \
- .md_utf = (void *)0xdeadbeef, \
- }
+ .md_utf = (void *)0xdeadbeef, \
+ }
#endif
#endif /* _KERNEL */
Index: src/sys/arch/riscv/include/pcb.h
diff -u src/sys/arch/riscv/include/pcb.h:1.2 src/sys/arch/riscv/include/pcb.h:1.3
--- src/sys/arch/riscv/include/pcb.h:1.2 Sun May 7 12:41:48 2023
+++ src/sys/arch/riscv/include/pcb.h Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pcb.h,v 1.2 2023/05/07 12:41:48 skrll Exp $ */
+/* $NetBSD: pcb.h,v 1.3 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,11 +35,11 @@
#include <riscv/reg.h>
struct pcb_faultinfo {
- void *pfi_faultptep;
- vaddr_t pfi_faultaddr;
- u_int pfi_repeats;
- pid_t pfi_lastpid;
- uint8_t pfi_cause;
+ void *pfi_faultptep;
+ vaddr_t pfi_faultaddr;
+ u_int pfi_repeats;
+ pid_t pfi_lastpid;
+ uint8_t pfi_cause;
};
struct pcb {
Index: src/sys/arch/riscv/include/pmap.h
diff -u src/sys/arch/riscv/include/pmap.h:1.23 src/sys/arch/riscv/include/pmap.h:1.24
--- src/sys/arch/riscv/include/pmap.h:1.23 Mon Jan 1 17:18:02 2024
+++ src/sys/arch/riscv/include/pmap.h Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.23 2024/01/01 17:18:02 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.24 2024/08/04 08:16:25 skrll Exp $ */
/*
* Copyright (c) 2014, 2019, 2021 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
#define PMAP_INVALID_SEGTAB_ADDRESS ((pmap_segtab_t *)0xdeadbeef)
#endif
#define PMAP_TLB_NUM_PIDS (__SHIFTOUT_MASK(SATP_ASID) + 1)
-#define PMAP_TLB_BITMAP_LENGTH PMAP_TLB_NUM_PIDS
+#define PMAP_TLB_BITMAP_LENGTH PMAP_TLB_NUM_PIDS
#define PMAP_TLB_FLUSH_ASID_ON_RESET true
#define pmap_phys_address(x) (x)
@@ -98,9 +98,9 @@
#ifndef __BSD_PTENTRY_T__
#define __BSD_PTENTRY_T__
#ifdef _LP64
-#define PRIxPTE PRIx64
+#define PRIxPTE PRIx64
#else
-#define PRIxPTE PRIx32
+#define PRIxPTE PRIx32
#endif
#endif /* __BSD_PTENTRY_T__ */
@@ -185,8 +185,8 @@ extern vaddr_t pmap_direct_end;
static inline bool
pmap_md_tlb_check_entry(void *ctx, vaddr_t va, tlb_asid_t asid, pt_entry_t pte)
{
- // TLB not walked and so not called.
- return false;
+ // TLB not walked and so not called.
+ return false;
}
static inline void
Index: src/sys/arch/riscv/include/types.h
diff -u src/sys/arch/riscv/include/types.h:1.17 src/sys/arch/riscv/include/types.h:1.18
--- src/sys/arch/riscv/include/types.h:1.17 Sat Apr 6 10:08:54 2024
+++ src/sys/arch/riscv/include/types.h Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.17 2024/04/06 10:08:54 skrll Exp $ */
+/* $NetBSD: types.h,v 1.18 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@ typedef unsigned int tlb_asid_t;
#if defined(_KERNEL)
typedef struct label_t { /* Used by setjmp & longjmp */
- register_t lb_reg[16]; /* */
+ register_t lb_reg[16]; /* */
__uint32_t lb_sr;
} label_t;
#endif
Index: src/sys/arch/riscv/riscv/clock_machdep.c
diff -u src/sys/arch/riscv/riscv/clock_machdep.c:1.8 src/sys/arch/riscv/riscv/clock_machdep.c:1.9
--- src/sys/arch/riscv/riscv/clock_machdep.c:1.8 Sun Apr 7 22:59:13 2024
+++ src/sys/arch/riscv/riscv/clock_machdep.c Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_machdep.c,v 1.8 2024/04/07 22:59:13 riastradh Exp $ */
+/* $NetBSD: clock_machdep.c,v 1.9 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__RCSID("$NetBSD: clock_machdep.c,v 1.8 2024/04/07 22:59:13 riastradh Exp $");
+__RCSID("$NetBSD: clock_machdep.c,v 1.9 2024/08/04 08:16:25 skrll Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -80,11 +80,11 @@ riscv_timer_frequency_get(void)
void
riscv_timer_register(void (*timerfn)(void))
{
- if (_riscv_timer_init != NULL) {
+ if (_riscv_timer_init != NULL) {
#ifdef DIAGNOSTIC
- aprint_verbose("%s: timer already registered\n", __func__);
+ aprint_verbose("%s: timer already registered\n", __func__);
#endif
- }
+ }
_riscv_timer_init = timerfn;
}
@@ -153,10 +153,10 @@ setstatclockrate(int newhz)
void
delay(unsigned long us)
{
- const uint64_t ticks = (uint64_t)us * timer_ticks_per_usec;
- const uint64_t finish = csr_time_read() + ticks;
+ const uint64_t ticks = (uint64_t)us * timer_ticks_per_usec;
+ const uint64_t finish = csr_time_read() + ticks;
- while (csr_time_read() < finish) {
- /* spin, baby spin */
- }
+ while (csr_time_read() < finish) {
+ /* spin, baby spin */
+ }
}
Index: src/sys/arch/riscv/riscv/vm_machdep.c
diff -u src/sys/arch/riscv/riscv/vm_machdep.c:1.8 src/sys/arch/riscv/riscv/vm_machdep.c:1.9
--- src/sys/arch/riscv/riscv/vm_machdep.c:1.8 Sun May 7 12:41:49 2023
+++ src/sys/arch/riscv/riscv/vm_machdep.c Sun Aug 4 08:16:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.8 2023/05/07 12:41:49 skrll Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.9 2024/08/04 08:16:26 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.8 2023/05/07 12:41:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.9 2024/08/04 08:16:26 skrll Exp $");
#define _PMAP_PRIVATE
@@ -219,7 +219,7 @@ vmapbuf(struct buf *bp, vsize_t len)
vaddr_t uva = trunc_page((vaddr_t)bp->b_data);
const vaddr_t off = (vaddr_t)bp->b_data - uva;
- len = round_page(off + len);
+ len = round_page(off + len);
kva = uvm_km_alloc(phys_map, len, atop(uva) & uvmexp.colormask,
UVM_KMF_VAONLY | UVM_KMF_WAITVA | UVM_KMF_COLORMATCH);
Index: src/sys/arch/riscv/riscv/db_disasm.c
diff -u src/sys/arch/riscv/riscv/db_disasm.c:1.10 src/sys/arch/riscv/riscv/db_disasm.c:1.11
--- src/sys/arch/riscv/riscv/db_disasm.c:1.10 Sun May 7 12:41:48 2023
+++ src/sys/arch/riscv/riscv/db_disasm.c Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.10 2023/05/07 12:41:48 skrll Exp $ */
+/* $NetBSD: db_disasm.c,v 1.11 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__RCSID("$NetBSD: db_disasm.c,v 1.10 2023/05/07 12:41:48 skrll Exp $");
+__RCSID("$NetBSD: db_disasm.c,v 1.11 2024/08/04 08:16:25 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -549,7 +549,7 @@ struct riscv_disasm32_entry {
// R4, In, U, J
const char *name;
// R, I, S, B
- struct {
+ struct {
const struct riscv_disasm_insn *v;
unsigned n;
} entries;
@@ -1282,7 +1282,7 @@ db_disasm_32(db_addr_t loc, uint32_t ins
INSN_FUNCT7(insn) >> 2);
db_print_riscv_fpround(", ", INSN_FUNCT3(insn));
db_printf("\n");
- break;
+ break;
case FMT_I:
/* immediates */
imm = INSN_IMM_I(insn);
Index: src/sys/arch/riscv/riscv/mainbus.c
diff -u src/sys/arch/riscv/riscv/mainbus.c:1.6 src/sys/arch/riscv/riscv/mainbus.c:1.7
--- src/sys/arch/riscv/riscv/mainbus.c:1.6 Sun May 7 12:41:49 2023
+++ src/sys/arch/riscv/riscv/mainbus.c Sun Aug 4 08:16:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.6 2023/05/07 12:41:49 skrll Exp $ */
+/* $NetBSD: mainbus.c,v 1.7 2024/08/04 08:16:25 skrll Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mainbus.c,v 1.6 2023/05/07 12:41:49 skrll Exp $");
+__RCSID("$NetBSD: mainbus.c,v 1.7 2024/08/04 08:16:25 skrll Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -60,7 +60,7 @@ extern struct bus_space riscv_generic_bs
bus_space_tag_t
fdtbus_bus_tag_create(int phandle, uint32_t flags)
{
- return &riscv_generic_bs_tag;
+ return &riscv_generic_bs_tag;
}
static inline bool
Index: src/sys/arch/riscv/riscv/sig_machdep.c
diff -u src/sys/arch/riscv/riscv/sig_machdep.c:1.5 src/sys/arch/riscv/riscv/sig_machdep.c:1.6
--- src/sys/arch/riscv/riscv/sig_machdep.c:1.5 Sun May 7 12:41:49 2023
+++ src/sys/arch/riscv/riscv/sig_machdep.c Sun Aug 4 08:16:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.5 2023/05/07 12:41:49 skrll Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.6 2024/08/04 08:16:26 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef COMPATNAME1
-__RCSID("$NetBSD: sig_machdep.c,v 1.5 2023/05/07 12:41:49 skrll Exp $");
+__RCSID("$NetBSD: sig_machdep.c,v 1.6 2024/08/04 08:16:26 skrll Exp $");
#endif
#include <sys/param.h>
@@ -107,7 +107,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
mutex_exit(p->p_lock);
COMPATNAME2(cpu_getmcontext)(l, &ksf.sf_uc.uc_mcontext,
- &ksf.sf_uc.uc_flags);
+ &ksf.sf_uc.uc_flags);
int error = copyout(&ksf, sf, sizeof(ksf));
mutex_enter(p->p_lock);
Index: src/sys/arch/riscv/riscv/trap.c
diff -u src/sys/arch/riscv/riscv/trap.c:1.26 src/sys/arch/riscv/riscv/trap.c:1.27
--- src/sys/arch/riscv/riscv/trap.c:1.26 Thu May 2 18:18:17 2024
+++ src/sys/arch/riscv/riscv/trap.c Sun Aug 4 08:16:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.26 2024/05/02 18:18:17 skrll Exp $ */
+/* $NetBSD: trap.c,v 1.27 2024/08/04 08:16:26 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#define __PMAP_PRIVATE
#define __UFETCHSTORE_PRIVATE
-__RCSID("$NetBSD: trap.c,v 1.26 2024/05/02 18:18:17 skrll Exp $");
+__RCSID("$NetBSD: trap.c,v 1.27 2024/08/04 08:16:26 skrll Exp $");
#include <sys/param.h>
@@ -272,7 +272,7 @@ dump_trapframe(const struct trapframe *t
{
const char *name = cause_name(tf->tf_cause);
static const char *regname[] = {
- "ra", "sp", "gp", // x0, x1, x2, x3,
+ "ra", "sp", "gp", // x0, x1, x2, x3,
"tp", "t0", "t1", "t2", // x4, x5, x6, x7,
"s0", "s1", "a0", "a1", // x8, x9, x10, x11,
"a2", "a3", "a4", "a5", // x12, x13, x14, x15,
Index: src/sys/arch/riscv/starfive/jh71x0_clkc.c
diff -u src/sys/arch/riscv/starfive/jh71x0_clkc.c:1.1 src/sys/arch/riscv/starfive/jh71x0_clkc.c:1.2
--- src/sys/arch/riscv/starfive/jh71x0_clkc.c:1.1 Sat Jul 27 07:09:50 2024
+++ src/sys/arch/riscv/starfive/jh71x0_clkc.c Sun Aug 4 08:16:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: jh71x0_clkc.c,v 1.1 2024/07/27 07:09:50 skrll Exp $ */
+/* $NetBSD: jh71x0_clkc.c,v 1.2 2024/08/04 08:16:26 skrll Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jh71x0_clkc.c,v 1.1 2024/07/27 07:09:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jh71x0_clkc.c,v 1.2 2024/08/04 08:16:26 skrll Exp $");
#include <sys/param.h>
@@ -298,7 +298,7 @@ jh71x0_clkc_fracdiv_get_rate(struct jh71
uint32_t val = RD4(sc, jcc->jcc_reg);
unsigned long div100 =
100UL * __SHIFTOUT(val, JH71X0_CLK_INT_MASK) +
- __SHIFTOUT(val, JH71X0_CLK_FRAC_MASK);
+ __SHIFTOUT(val, JH71X0_CLK_FRAC_MASK);
return (div100 >= JH71X0_CLK_FRAC_MIN) ? 100UL * rate / div100 : 0;
}
