Module Name: src
Committed By: matt
Date: Wed Apr 30 00:51:01 UTC 2014
Modified Files:
src/sys/arch/mips/ralink: ralink_bus.c ralink_var.h
Log Message:
Add a static bus_space_handle_t for the core (sysctl) registers.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/ralink/ralink_bus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/ralink/ralink_var.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/mips/ralink/ralink_bus.c
diff -u src/sys/arch/mips/ralink/ralink_bus.c:1.2 src/sys/arch/mips/ralink/ralink_bus.c:1.3
--- src/sys/arch/mips/ralink/ralink_bus.c:1.2 Thu Jul 28 15:38:49 2011
+++ src/sys/arch/mips/ralink/ralink_bus.c Wed Apr 30 00:51:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_bus.c,v 1.2 2011/07/28 15:38:49 matt Exp $ */
+/* $NetBSD: ralink_bus.c,v 1.3 2014/04/30 00:51:01 matt Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -69,7 +69,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_bus.c,v 1.2 2011/07/28 15:38:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_bus.c,v 1.3 2014/04/30 00:51:01 matt Exp $");
#define _MIPS_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -91,10 +91,18 @@ struct mips_bus_dma_tag ra_bus_dmat = {
._dmatag_ops = _BUS_DMATAG_OPS_INITIALIZER,
};
+const bus_space_handle_t ra_sysctl_bsh =
+ (bus_space_handle_t) RA_IOREG_VADDR(RA_SYSCTL_BASE, 0);
+
void
ra_bus_init(void)
{
ra_bus_bus_mem_init(&ra_bus_memt, NULL);
+#ifdef DIAGNOSTIC
+ bus_space_handle_t bsh = 0xdeadfa11;
+ bus_space_map(&ra_bus_memt, RA_SYSCTL_BASE, 0x100, 0, &bsh);
+ KASSERT(ra_sysctl_bsh == bsh);
+#endif
}
/*
Index: src/sys/arch/mips/ralink/ralink_var.h
diff -u src/sys/arch/mips/ralink/ralink_var.h:1.5 src/sys/arch/mips/ralink/ralink_var.h:1.6
--- src/sys/arch/mips/ralink/ralink_var.h:1.5 Wed Feb 1 02:05:14 2012
+++ src/sys/arch/mips/ralink/ralink_var.h Wed Apr 30 00:51:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_var.h,v 1.5 2012/02/01 02:05:14 matt Exp $ */
+/* $NetBSD: ralink_var.h,v 1.6 2014/04/30 00:51:01 matt Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -41,8 +41,9 @@ extern int ra_spiflash_read(void *, vad
extern void ra_gpio_toggle_LED(void *);
-extern struct mips_bus_space ra_bus_memt;
-extern struct mips_bus_dma_tag ra_bus_dmat;
+extern struct mips_bus_space ra_bus_memt;
+extern struct mips_bus_dma_tag ra_bus_dmat;
+extern const bus_space_handle_t ra_sysctl_bsh;
struct mainbus_attach_args {
const char *ma_name;
