Module Name: src
Committed By: christos
Date: Thu Jul 21 17:02:15 UTC 2016
Modified Files:
src/sys/arch/sbmips/sbmips: cpu.c rtc.c sb1250_icu.c
Log Message:
make this compile.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sbmips/sbmips/rtc.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sbmips/sbmips/sb1250_icu.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/sbmips/sbmips/cpu.c
diff -u src/sys/arch/sbmips/sbmips/cpu.c:1.22 src/sys/arch/sbmips/sbmips/cpu.c:1.23
--- src/sys/arch/sbmips/sbmips/cpu.c:1.22 Mon Mar 24 15:13:48 2014
+++ src/sys/arch/sbmips/sbmips/cpu.c Thu Jul 21 13:02:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.22 2014/03/24 19:13:48 christos Exp $ */
+/* $NetBSD: cpu.c,v 1.23 2016/07/21 17:02:15 christos Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.22 2014/03/24 19:13:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.23 2016/07/21 17:02:15 christos Exp $");
#include "opt_multiprocessor.h"
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.22
#include <mips/sibyte/dev/sbscdvar.h>
#include <mips/cfe/cfe_api.h>
-#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(rp)))
+#define READ_REG(rp) mips3_ld((register_t)(rp))
static int cpu_match(device_t, cfdata_t, void *);
static void cpu_attach(device_t, device_t, void *);
Index: src/sys/arch/sbmips/sbmips/rtc.c
diff -u src/sys/arch/sbmips/sbmips/rtc.c:1.20 src/sys/arch/sbmips/sbmips/rtc.c:1.21
--- src/sys/arch/sbmips/sbmips/rtc.c:1.20 Thu Nov 20 11:34:25 2014
+++ src/sys/arch/sbmips/sbmips/rtc.c Thu Jul 21 13:02:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.20 2014/11/20 16:34:25 christos Exp $ */
+/* $NetBSD: rtc.c,v 1.21 2016/07/21 17:02:15 christos Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.20 2014/11/20 16:34:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.21 2016/07/21 17:02:15 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -417,8 +417,8 @@ return; /* XXX XXX */
#include <mips/sibyte/include/sb1250_regs.h>
#include <mips/sibyte/include/sb1250_smbus.h>
-#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(MIPS_PHYS_TO_KSEG1(rp))))
-#define WRITE_REG(rp, val) (mips3_sd((volatile uint64_t *)(MIPS_PHYS_TO_KSEG1(rp)), (val)))
+#define READ_REG(rp) mips3_ld((register_t)(MIPS_PHYS_TO_KSEG1(rp)))
+#define WRITE_REG(rp, val) mips3_sd((register_t)(MIPS_PHYS_TO_KSEG1(rp)), (val))
static void
time_smbus_init(int chan)
Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.13 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.14
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.13 Sat Jul 9 12:59:40 2011
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c Thu Jul 21 13:02:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sb1250_icu.c,v 1.13 2011/07/09 16:59:40 matt Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.14 2016/07/21 17:02:15 christos Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.13 2011/07/09 16:59:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.14 2016/07/21 17:02:15 christos Exp $");
#define __INTR_PRIVATE
@@ -90,8 +90,8 @@ static void sb1250_ipi_intr(void *, uint
#endif
#define SB1250_I_MAP(x) (R_IMR_INTERRUPT_MAP_BASE + (x) * 8)
-#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(rp)))
-#define WRITE_REG(rp, val) (mips3_sd((volatile uint64_t *)(rp), (val)))
+#define READ_REG(rp) mips3_ld((register_t)(rp))
+#define WRITE_REG(rp, val) mips3_sd((register_t)(rp), (val))
static void sb1250_cpu_intr(int, vaddr_t, uint32_t);
static void *sb1250_intr_establish(u_int, u_int,
