Module Name: src
Committed By: andvar
Date: Sun Oct 8 22:10:49 UTC 2023
Modified Files:
src/sys/arch/mipsco/include: bus.h isa_machdep.h
src/sys/arch/mipsco/isa: isa_machdep.c
Log Message:
Update __BS_TYPENAME(BITS) macro to combine uint type instead of u_int.
Constify bus_space_write_multi one of params.
Remove unused ic_intr property from mipsco_isa_chipset struct.
Add __INTR_PRIVATE definition to mipsco isa_machdep.c.
Fixes RC3230 mipsco kernel config (w/o KGDB option, will be addressed later).
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mipsco/include/bus.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mipsco/include/isa_machdep.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mipsco/isa/isa_machdep.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/mipsco/include/bus.h
diff -u src/sys/arch/mipsco/include/bus.h:1.23 src/sys/arch/mipsco/include/bus.h:1.24
--- src/sys/arch/mipsco/include/bus.h:1.23 Fri Apr 23 06:15:16 2021
+++ src/sys/arch/mipsco/include/bus.h Sun Oct 8 22:10:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.23 2021/04/23 06:15:16 skrll Exp $ */
+/* $NetBSD: bus.h,v 1.24 2023/10/08 22:10:49 andvar Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -342,7 +342,7 @@ int mipsco_bus_space_alloc(bus_space_tag
/*
* Utility macros; do not use outside this file.
*/
-#define __BS_TYPENAME(BITS) __CONCAT3(u_int,BITS,_t)
+#define __BS_TYPENAME(BITS) __CONCAT3(uint,BITS,_t)
#define __BS_OFFSET(t, o, BYTES) ((o) << (t)->bs_stride)
#define __BS_FUNCTION(func,BYTES) __CONCAT3(func,_,BYTES)
@@ -480,14 +480,14 @@ __bus_space_write(8,64)
#define __bus_space_write_multi(BYTES,BITS) \
static __inline void __BS_FUNCTION(bus_space_write_multi,BYTES) \
(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __BS_TYPENAME(BITS) *, size_t); \
+ const __BS_TYPENAME(BITS) *, size_t); \
\
static __inline void \
__BS_FUNCTION(bus_space_write_multi,BYTES)( \
bus_space_tag_t t, \
bus_space_handle_t h, \
bus_size_t o, \
- __BS_TYPENAME(BITS) *a, \
+ const __BS_TYPENAME(BITS) *a, \
size_t c) \
{ \
\
Index: src/sys/arch/mipsco/include/isa_machdep.h
diff -u src/sys/arch/mipsco/include/isa_machdep.h:1.10 src/sys/arch/mipsco/include/isa_machdep.h:1.11
--- src/sys/arch/mipsco/include/isa_machdep.h:1.10 Tue Oct 18 22:04:34 2016
+++ src/sys/arch/mipsco/include/isa_machdep.h Sun Oct 8 22:10:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.10 2016/10/18 22:04:34 jdolecek Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.11 2023/10/08 22:10:49 andvar Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -86,7 +86,6 @@
* Types provided to machine-independent ISA code.
*/
struct mipsco_isa_chipset {
- struct mipsco_intrhand ic_intr; /* XXX */
struct evcnt ic_intrcnt; /* Interrupt counter */
bus_space_tag_t ic_bst; /* bus_space tag */
bus_space_handle_t ic_bsh; /* interrupt control register */
Index: src/sys/arch/mipsco/isa/isa_machdep.c
diff -u src/sys/arch/mipsco/isa/isa_machdep.c:1.19 src/sys/arch/mipsco/isa/isa_machdep.c:1.20
--- src/sys/arch/mipsco/isa/isa_machdep.c:1.19 Sat Aug 7 16:19:00 2021
+++ src/sys/arch/mipsco/isa/isa_machdep.c Sun Oct 8 22:10:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.19 2021/08/07 16:19:00 thorpej Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.20 2023/10/08 22:10:49 andvar Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.19 2021/08/07 16:19:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.20 2023/10/08 22:10:49 andvar Exp $");
+
+#define __INTR_PRIVATE
#include <sys/param.h>
#include <sys/systm.h>
