Module Name: src
Committed By: matt
Date: Tue Jul 26 03:35:25 UTC 2011
Modified Files:
src/sys/arch/powerpc/booke/dev [matt-nb5-pq3]: pq3obio.c
Added Files:
src/sys/arch/powerpc/include/booke [matt-nb5-pq3]: obiovar.h
Log Message:
Back port improvements from -HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/powerpc/booke/dev/pq3obio.c
cvs rdiff -u -r0 -r1.2.2.2 src/sys/arch/powerpc/include/booke/obiovar.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/powerpc/booke/dev/pq3obio.c
diff -u src/sys/arch/powerpc/booke/dev/pq3obio.c:1.1.2.1 src/sys/arch/powerpc/booke/dev/pq3obio.c:1.1.2.2
--- src/sys/arch/powerpc/booke/dev/pq3obio.c:1.1.2.1 Fri Jan 7 01:26:19 2011
+++ src/sys/arch/powerpc/booke/dev/pq3obio.c Tue Jul 26 03:35:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3obio.c,v 1.1.2.1 2011/01/07 01:26:19 matt Exp $ */
+/* $NetBSD: pq3obio.c,v 1.1.2.2 2011/07/26 03:35:24 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3obio.c,v 1.1.2.1 2011/01/07 01:26:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3obio.c,v 1.1.2.2 2011/07/26 03:35:24 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -51,21 +51,7 @@
#include <powerpc/booke/cpuvar.h>
#include <powerpc/booke/e500var.h>
#include <powerpc/booke/e500reg.h>
-
-struct pq3lbc_softc {
- bus_addr_t lbc_base;
- bus_addr_t lbc_limit;
- uint32_t lbc_br;
- uint32_t lbc_or;
-};
-
-struct pq3obio_softc {
- device_t sc_dev;
- bus_space_tag_t sc_bst;
- bus_space_handle_t sc_bsh;
- struct pq3lbc_softc sc_lbcs[8];
- struct powerpc_bus_space sc_obio_bst;
-};
+#include <powerpc/booke/obiovar.h>
static int pq3obio_match(device_t, cfdata_t, void *);
static void pq3obio_attach(device_t, device_t, void *);
Added files:
Index: src/sys/arch/powerpc/include/booke/obiovar.h
diff -u /dev/null src/sys/arch/powerpc/include/booke/obiovar.h:1.2.2.2
--- /dev/null Tue Jul 26 03:35:25 2011
+++ src/sys/arch/powerpc/include/booke/obiovar.h Tue Jul 26 03:35:25 2011
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _POWERPC_BOOKE_OBIOVAR_H_
+#define _POWERPC_BOOKE_OBIOVAR_H_
+
+#include <sys/device.h>
+#include <sys/bus.h>
+
+struct pq3lbc_softc {
+ bus_addr_t lbc_base;
+ bus_addr_t lbc_limit;
+ uint32_t lbc_br;
+ uint32_t lbc_or;
+};
+
+struct pq3obio_softc {
+ device_t sc_dev;
+ bus_space_tag_t sc_bst;
+ bus_space_handle_t sc_bsh;
+ struct pq3lbc_softc sc_lbcs[8];
+ struct powerpc_bus_space sc_obio_bst;
+};
+
+#ifdef _KERNEL
+void lbc_lock(struct pq3obio_softc *);
+void lbc_unlock(struct pq3obio_softc *);
+uint32_t lbc_read_4(struct pq3obio_softc *, bus_size_t);
+void lbc_write_4(struct pq3obio_softc *, bus_size_t, uint32_t size);
+#endif
+
+#endif /* _POWERPC_BOOKE_OBIOVAR_H_ */
