Module Name: src
Committed By: jmcneill
Date: Wed Dec 16 12:17:45 UTC 2015
Modified Files:
src/sys/dev/fdt: fdt_gpio.c fdt_i2c.c fdt_intr.c fdt_openfirm.c
fdt_regulator.c fdt_subr.c fdtvar.h
Removed Files:
src/sys/dev/fdt: fdt_openfirm.h
Log Message:
Only OF_* functions should be in fdt_openfirm.c, move the rest to fdt_subr.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/fdt_gpio.c src/sys/dev/fdt/fdt_i2c.c \
src/sys/dev/fdt/fdt_intr.c src/sys/dev/fdt/fdt_openfirm.c \
src/sys/dev/fdt/fdt_regulator.c src/sys/dev/fdt/fdtvar.h
cvs rdiff -u -r1.1 -r0 src/sys/dev/fdt/fdt_openfirm.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/fdt_subr.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/dev/fdt/fdt_gpio.c
diff -u src/sys/dev/fdt/fdt_gpio.c:1.1 src/sys/dev/fdt/fdt_gpio.c:1.2
--- src/sys/dev/fdt/fdt_gpio.c:1.1 Wed Dec 16 12:03:44 2015
+++ src/sys/dev/fdt/fdt_gpio.c Wed Dec 16 12:17:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_gpio.c,v 1.1 2015/12/16 12:03:44 jmcneill Exp $ */
+/* $NetBSD: fdt_gpio.c,v 1.2 2015/12/16 12:17:45 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,15 +27,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_gpio.c,v 1.1 2015/12/16 12:03:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_gpio.c,v 1.2 2015/12/16 12:17:45 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/kmem.h>
#include <libfdt.h>
-#include <dev/ofw/openfirm.h>
-#include <dev/fdt/fdt_openfirm.h>
#include <dev/fdt/fdtvar.h>
struct fdtbus_gpio_controller {
Index: src/sys/dev/fdt/fdt_i2c.c
diff -u src/sys/dev/fdt/fdt_i2c.c:1.1 src/sys/dev/fdt/fdt_i2c.c:1.2
--- src/sys/dev/fdt/fdt_i2c.c:1.1 Wed Dec 16 12:03:44 2015
+++ src/sys/dev/fdt/fdt_i2c.c Wed Dec 16 12:17:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_i2c.c,v 1.1 2015/12/16 12:03:44 jmcneill Exp $ */
+/* $NetBSD: fdt_i2c.c,v 1.2 2015/12/16 12:17:45 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,15 +27,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.1 2015/12/16 12:03:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.2 2015/12/16 12:17:45 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/kmem.h>
#include <libfdt.h>
-#include <dev/ofw/openfirm.h>
-#include <dev/fdt/fdt_openfirm.h>
#include <dev/fdt/fdtvar.h>
struct fdtbus_i2c_controller {
Index: src/sys/dev/fdt/fdt_intr.c
diff -u src/sys/dev/fdt/fdt_intr.c:1.1 src/sys/dev/fdt/fdt_intr.c:1.2
--- src/sys/dev/fdt/fdt_intr.c:1.1 Wed Dec 16 12:03:44 2015
+++ src/sys/dev/fdt/fdt_intr.c Wed Dec 16 12:17:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_intr.c,v 1.1 2015/12/16 12:03:44 jmcneill Exp $ */
+/* $NetBSD: fdt_intr.c,v 1.2 2015/12/16 12:17:45 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,15 +27,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_intr.c,v 1.1 2015/12/16 12:03:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_intr.c,v 1.2 2015/12/16 12:17:45 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/kmem.h>
#include <libfdt.h>
-#include <dev/ofw/openfirm.h>
-#include <dev/fdt/fdt_openfirm.h>
#include <dev/fdt/fdtvar.h>
struct fdtbus_interrupt_controller {
@@ -71,13 +69,13 @@ fdtbus_get_interrupt_parent(int phandle)
interrupt_parent = fdt32_to_cpu(interrupt_parent);
- const void *data = fdt_openfirm_get_data();
+ const void *data = fdtbus_get_data();
const int off = fdt_node_offset_by_phandle(data, interrupt_parent);
if (off < 0) {
return -1;
}
- return fdt_openfirm_get_phandle(off);
+ return fdtbus_offset2phandle(off);
}
static struct fdtbus_interrupt_controller *
Index: src/sys/dev/fdt/fdt_openfirm.c
diff -u src/sys/dev/fdt/fdt_openfirm.c:1.1 src/sys/dev/fdt/fdt_openfirm.c:1.2
--- src/sys/dev/fdt/fdt_openfirm.c:1.1 Sun Dec 13 17:30:40 2015
+++ src/sys/dev/fdt/fdt_openfirm.c Wed Dec 16 12:17:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_openfirm.c,v 1.1 2015/12/13 17:30:40 jmcneill Exp $ */
+/* $NetBSD: fdt_openfirm.c,v 1.2 2015/12/16 12:17:45 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,59 +27,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_openfirm.c,v 1.1 2015/12/13 17:30:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_openfirm.c,v 1.2 2015/12/16 12:17:45 jmcneill Exp $");
#include <sys/param.h>
#include <libfdt.h>
-#include <dev/ofw/openfirm.h>
-#include <dev/fdt/fdt_openfirm.h>
-
-static const void *fdt_data;
-
-bool
-fdt_openfirm_set_data(const void *data)
-{
- KASSERT(fdt_data == NULL);
- if (fdt_check_header(data) != 0) {
- return false;
- }
- fdt_data = data;
- return true;
-}
-
-const void *
-fdt_openfirm_get_data(void)
-{
- return fdt_data;
-}
-
-int
-fdt_openfirm_get_phandle(int offset)
-{
- if (offset < 0)
- return 0;
-
- return offset + fdt_off_dt_struct(fdt_data);
-}
-
-int
-fdt_openfirm_get_offset(int phandle)
-{
- const int dtoff = fdt_off_dt_struct(fdt_data);
-
- if (phandle == -1)
- phandle = dtoff;
-
- if (phandle < dtoff)
- return -1;
-
- return phandle - dtoff;
-}
+#include <dev/fdt/fdtvar.h>
int
OF_peer(int phandle)
{
+ const void *fdt_data = fdtbus_get_data();
int off, depth;
if (fdt_data == NULL) {
@@ -87,10 +45,10 @@ OF_peer(int phandle)
}
if (phandle == 0) {
- return fdt_openfirm_get_phandle(0);
+ return fdtbus_offset2phandle(0);
}
- off = fdt_openfirm_get_offset(phandle);
+ off = fdtbus_phandle2offset(phandle);
if (off < 0) {
return 0;
}
@@ -100,7 +58,7 @@ OF_peer(int phandle)
off >= 0 && depth >= 0;
off = fdt_next_node(fdt_data, off, &depth)) {
if (depth == 1) {
- return fdt_openfirm_get_phandle(off);
+ return fdtbus_offset2phandle(off);
}
}
@@ -110,13 +68,14 @@ OF_peer(int phandle)
int
OF_child(int phandle)
{
+ const void *fdt_data = fdtbus_get_data();
int off, depth;
if (fdt_data == NULL) {
return -1;
}
- off = fdt_openfirm_get_offset(phandle);
+ off = fdtbus_phandle2offset(phandle);
if (off < 0) {
return 0;
}
@@ -126,7 +85,7 @@ OF_child(int phandle)
off >= 0 && depth > 0;
off = fdt_next_node(fdt_data, off, &depth)) {
if (depth == 1) {
- return fdt_openfirm_get_phandle(off);
+ return fdtbus_offset2phandle(off);
}
}
@@ -136,13 +95,14 @@ OF_child(int phandle)
int
OF_parent(int phandle)
{
+ const void *fdt_data = fdtbus_get_data();
int off;
if (fdt_data == NULL) {
return -1;
}
- off = fdt_openfirm_get_offset(phandle);
+ off = fdtbus_phandle2offset(phandle);
if (off < 0) {
return -1;
}
@@ -152,12 +112,13 @@ OF_parent(int phandle)
return -1;
}
- return fdt_openfirm_get_phandle(off);
+ return fdtbus_offset2phandle(off);
}
int
OF_nextprop(int phandle, const char *prop, void *nextprop)
{
+ const void *fdt_data = fdtbus_get_data();
const char *name;
const void *val;
int off, len;
@@ -166,7 +127,7 @@ OF_nextprop(int phandle, const char *pro
return -1;
}
- off = fdt_openfirm_get_offset(phandle);
+ off = fdtbus_phandle2offset(phandle);
if (off < 0) {
return -1;
}
@@ -207,6 +168,7 @@ OF_nextprop(int phandle, const char *pro
int
OF_getprop(int phandle, const char *prop, void *buf, int buflen)
{
+ const void *fdt_data = fdtbus_get_data();
const char *name;
const void *val;
int off, len;
@@ -215,7 +177,7 @@ OF_getprop(int phandle, const char *prop
return -1;
}
- off = fdt_openfirm_get_offset(phandle);
+ off = fdtbus_phandle2offset(phandle);
if (off < 0) {
return -1;
}
@@ -266,6 +228,7 @@ OF_getprop(int phandle, const char *prop
int
OF_getproplen(int phandle, const char *prop)
{
+ const void *fdt_data = fdtbus_get_data();
const char *name;
const void *val;
int off, len;
@@ -274,7 +237,7 @@ OF_getproplen(int phandle, const char *p
return -1;
}
- off = fdt_openfirm_get_offset(phandle);
+ off = fdtbus_phandle2offset(phandle);
if (off < 0) {
return -1;
}
@@ -324,6 +287,7 @@ OF_setprop(int phandle, const char *prop
int
OF_finddevice(const char *name)
{
+ const void *fdt_data = fdtbus_get_data();
int off;
if (fdt_data == NULL) {
@@ -335,19 +299,20 @@ OF_finddevice(const char *name)
return -1;
}
- return fdt_openfirm_get_phandle(off);
+ return fdtbus_offset2phandle(off);
}
int
OF_package_to_path(int phandle, char *buf, int buflen)
{
+ const void *fdt_data = fdtbus_get_data();
int off;
if (fdt_data == NULL) {
return -1;
}
- off = fdt_openfirm_get_offset(phandle);
+ off = fdtbus_phandle2offset(phandle);
if (off < 0) {
return -1;
}
Index: src/sys/dev/fdt/fdt_regulator.c
diff -u src/sys/dev/fdt/fdt_regulator.c:1.1 src/sys/dev/fdt/fdt_regulator.c:1.2
--- src/sys/dev/fdt/fdt_regulator.c:1.1 Wed Dec 16 12:03:44 2015
+++ src/sys/dev/fdt/fdt_regulator.c Wed Dec 16 12:17:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_regulator.c,v 1.1 2015/12/16 12:03:44 jmcneill Exp $ */
+/* $NetBSD: fdt_regulator.c,v 1.2 2015/12/16 12:17:45 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,15 +27,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_regulator.c,v 1.1 2015/12/16 12:03:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_regulator.c,v 1.2 2015/12/16 12:17:45 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/kmem.h>
#include <libfdt.h>
-#include <dev/ofw/openfirm.h>
-#include <dev/fdt/fdt_openfirm.h>
#include <dev/fdt/fdtvar.h>
struct fdtbus_regulator_controller {
Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.1 src/sys/dev/fdt/fdtvar.h:1.2
--- src/sys/dev/fdt/fdtvar.h:1.1 Sun Dec 13 17:30:40 2015
+++ src/sys/dev/fdt/fdtvar.h Wed Dec 16 12:17:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.1 2015/12/13 17:30:40 jmcneill Exp $ */
+/* $NetBSD: fdtvar.h,v 1.2 2015/12/16 12:17:45 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -87,29 +87,34 @@ struct fdtbus_regulator_controller_func
int (*enable)(device_t, bool);
};
-int fdtbus_register_interrupt_controller(device_t, int,
- const struct fdtbus_interrupt_controller_func *);
-int fdtbus_register_i2c_controller(device_t, int,
- const struct fdtbus_i2c_controller_func *);
-int fdtbus_register_gpio_controller(device_t, int,
- const struct fdtbus_gpio_controller_func *);
-int fdtbus_register_regulator_controller(device_t, int,
- const struct fdtbus_regulator_controller_func *);
-
-int fdtbus_get_reg(int, u_int, bus_addr_t *, bus_size_t *);
-int fdtbus_get_phandle(int, const char *);
-i2c_tag_t fdtbus_get_i2c_tag(int);
-void * fdtbus_intr_establish(int, u_int, int, int,
- int (*func)(void *), void *arg);
-void fdtbus_intr_disestablish(int, void *);
-bool fdtbus_intr_str(int, u_int, char *, size_t);
+int fdtbus_register_interrupt_controller(device_t, int,
+ const struct fdtbus_interrupt_controller_func *);
+int fdtbus_register_i2c_controller(device_t, int,
+ const struct fdtbus_i2c_controller_func *);
+int fdtbus_register_gpio_controller(device_t, int,
+ const struct fdtbus_gpio_controller_func *);
+int fdtbus_register_regulator_controller(device_t, int,
+ const struct fdtbus_regulator_controller_func *);
+
+int fdtbus_get_reg(int, u_int, bus_addr_t *, bus_size_t *);
+int fdtbus_get_phandle(int, const char *);
+i2c_tag_t fdtbus_get_i2c_tag(int);
+void * fdtbus_intr_establish(int, u_int, int, int,
+ int (*func)(void *), void *arg);
+void fdtbus_intr_disestablish(int, void *);
+bool fdtbus_intr_str(int, u_int, char *, size_t);
struct fdtbus_gpio_pin *fdtbus_gpio_acquire(int, const char *, int);
-void fdtbus_gpio_release(struct fdtbus_gpio_pin *);
-int fdtbus_gpio_read(struct fdtbus_gpio_pin *);
-void fdtbus_gpio_write(struct fdtbus_gpio_pin *, int);
+void fdtbus_gpio_release(struct fdtbus_gpio_pin *);
+int fdtbus_gpio_read(struct fdtbus_gpio_pin *);
+void fdtbus_gpio_write(struct fdtbus_gpio_pin *, int);
struct fdtbus_regulator *fdtbus_regulator_acquire(int, const char *);
-void fdtbus_regulator_release(struct fdtbus_regulator *);
-int fdtbus_regulator_enable(struct fdtbus_regulator *);
-int fdtbus_regulator_disable(struct fdtbus_regulator *);
+void fdtbus_regulator_release(struct fdtbus_regulator *);
+int fdtbus_regulator_enable(struct fdtbus_regulator *);
+int fdtbus_regulator_disable(struct fdtbus_regulator *);
+
+bool fdtbus_set_data(const void *);
+const void * fdtbus_get_data(void);
+int fdtbus_phandle2offset(int);
+int fdtbus_offset2phandle(int);
#endif /* _DEV_FDT_FDTVAR_H */
Index: src/sys/dev/fdt/fdt_subr.c
diff -u src/sys/dev/fdt/fdt_subr.c:1.2 src/sys/dev/fdt/fdt_subr.c:1.3
--- src/sys/dev/fdt/fdt_subr.c:1.2 Wed Dec 16 12:03:44 2015
+++ src/sys/dev/fdt/fdt_subr.c Wed Dec 16 12:17:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_subr.c,v 1.2 2015/12/16 12:03:44 jmcneill Exp $ */
+/* $NetBSD: fdt_subr.c,v 1.3 2015/12/16 12:17:45 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,17 +27,58 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.2 2015/12/16 12:03:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.3 2015/12/16 12:17:45 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/kmem.h>
#include <libfdt.h>
-#include <dev/ofw/openfirm.h>
-#include <dev/fdt/fdt_openfirm.h>
#include <dev/fdt/fdtvar.h>
+static const void *fdt_data;
+
+bool
+fdtbus_set_data(const void *data)
+{
+ KASSERT(fdt_data == NULL);
+ if (fdt_check_header(data) != 0) {
+ return false;
+ }
+ fdt_data = data;
+ return true;
+}
+
+const void *
+fdtbus_get_data(void)
+{
+ return fdt_data;
+}
+
+int
+fdtbus_offset2phandle(int offset)
+{
+ if (offset < 0)
+ return 0;
+
+ return offset + fdt_off_dt_struct(fdt_data);
+}
+
+int
+fdtbus_phandle2offset(int phandle)
+{
+ const int dtoff = fdt_off_dt_struct(fdt_data);
+
+ if (phandle == -1)
+ phandle = dtoff;
+
+ if (phandle < dtoff)
+ return -1;
+
+ return phandle - dtoff;
+}
+
+
static int
fdtbus_get_addr_cells(int phandle)
{
@@ -97,13 +138,12 @@ fdtbus_get_phandle(int phandle, const ch
phandle_ref = fdt32_to_cpu(buf[0]);
kmem_free(buf, len);
- const void *data = fdt_openfirm_get_data();
- const int off = fdt_node_offset_by_phandle(data, phandle_ref);
+ const int off = fdt_node_offset_by_phandle(fdt_data, phandle_ref);
if (off < 0) {
return -1;
}
- return fdt_openfirm_get_phandle(off);
+ return fdtbus_offset2phandle(off);
}
int
