Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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).
This commit is contained in:
andvar 2023-10-08 22:10:49 +00:00
parent 917ce79018
commit 7f42acfa49
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/mipsco/include/bus.h
View File

@ -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_t, bus_addr_t, bus_addr_t,
/*
* 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) \
{ \
\

3
sys/arch/mipsco/include/isa_machdep.h
View File

@ -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 */

6
sys/arch/mipsco/isa/isa_machdep.c
View File

@ -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>