diff options
author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-05-16 22:01:43 +0000 |
---|---|---|
committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-05-16 22:01:43 +0000 |
commit | b7a63fb85cd07072afa8e91201882f5a9c432e55 (patch) | |
tree | 47e3717519df1d7ce47286e22f711907ca9d62fc /sys/dev/ofw | |
parent | a68dd336d5b121f161468847e1c9ebb7eb8b3d4f (diff) | |
download | FreeBSD-src-b7a63fb85cd07072afa8e91201882f5a9c432e55.zip FreeBSD-src-b7a63fb85cd07072afa8e91201882f5a9c432e55.tar.gz |
Pull OF_quiesce() out of the MI Open Firmware layer and entirely into
PPC ofw_machdep.c, in recognition of its state as a machine specific hack.
Requested by: marius
Diffstat (limited to 'sys/dev/ofw')
-rw-r--r-- | sys/dev/ofw/ofw_if.m | 7 | ||||
-rw-r--r-- | sys/dev/ofw/ofw_standard.c | 19 | ||||
-rw-r--r-- | sys/dev/ofw/openfirm.c | 9 | ||||
-rw-r--r-- | sys/dev/ofw/openfirm.h | 1 |
4 files changed, 0 insertions, 36 deletions
diff --git a/sys/dev/ofw/ofw_if.m b/sys/dev/ofw/ofw_if.m index d2d323b..902f071 100644 --- a/sys/dev/ofw/ofw_if.m +++ b/sys/dev/ofw/ofw_if.m @@ -340,13 +340,6 @@ METHOD void release { # Commands for returning control to the firmware /** - * @brief Turn off firmware background activities - */ -METHOD void quiesce { - ofw_t _ofw; -}; - -/** * @brief Temporarily return control to firmware. */ METHOD void enter { diff --git a/sys/dev/ofw/ofw_standard.c b/sys/dev/ofw/ofw_standard.c index 5eecf77..e521fa0 100644 --- a/sys/dev/ofw/ofw_standard.c +++ b/sys/dev/ofw/ofw_standard.c @@ -105,7 +105,6 @@ static ssize_t ofw_std_write(ofw_t ofw, ihandle_t instance, const void *addr, static int ofw_std_seek(ofw_t ofw, ihandle_t instance, uint64_t pos); static caddr_t ofw_std_claim(ofw_t ofw, void *virt, size_t size, u_int align); static void ofw_std_release(ofw_t ofw, void *virt, size_t size); -static void ofw_std_quiesce(ofw_t ofw); static void ofw_std_enter(ofw_t ofw); static void ofw_std_exit(ofw_t ofw); @@ -134,7 +133,6 @@ static ofw_method_t ofw_std_methods[] = { OFWMETHOD(ofw_seek, ofw_std_seek), OFWMETHOD(ofw_claim, ofw_std_claim), OFWMETHOD(ofw_release, ofw_std_release), - OFWMETHOD(ofw_quiesce, ofw_std_quiesce), OFWMETHOD(ofw_enter, ofw_std_enter), OFWMETHOD(ofw_exit, ofw_std_exit), @@ -732,23 +730,6 @@ ofw_std_release(ofw_t ofw, void *virt, size_t size) * Control transfer functions */ -/* Turn off OF background tasks */ -static void -ofw_std_quiesce(ofw_t ofw) -{ - struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - } args = { - (cell_t)"quiesce", - 0, - 0, - }; - - openfirmware(&args); -} - /* Suspend and drop back to the Open Firmware interface. */ static void ofw_std_enter(ofw_t ofw) diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c index a560e93..17cda68 100644 --- a/sys/dev/ofw/openfirm.c +++ b/sys/dev/ofw/openfirm.c @@ -409,15 +409,6 @@ OF_release(void *virt, size_t size) * Control transfer functions */ -/* Turn off OF background tasks */ -void -OF_quiesce() -{ - - OFW_QUIESCE(ofw_obj); -} - - /* Suspend and drop back to the Open Firmware interface. */ void OF_enter() diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h index 08cbaf3..10e8aad 100644 --- a/sys/dev/ofw/openfirm.h +++ b/sys/dev/ofw/openfirm.h @@ -133,7 +133,6 @@ void *OF_claim(void *virtrequest, size_t size, u_int align); void OF_release(void *virt, size_t size); /* Control transfer functions */ -void OF_quiesce(void); void OF_enter(void); void OF_exit(void) __attribute__((noreturn)); |