You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/11/14 00:11:32 UTC
[GitHub] wes3 closed pull request #1503: hw/mcu/nordic: Add hfxo
request/release API
wes3 closed pull request #1503: hw/mcu/nordic: Add hfxo request/release API
URL: https://github.com/apache/mynewt-core/pull/1503
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/mcu/nordic/nrf51xxx/include/mcu/nrf51_clock.h b/hw/mcu/nordic/nrf51xxx/include/mcu/nrf51_clock.h
new file mode 100644
index 0000000000..5be22b063f
--- /dev/null
+++ b/hw/mcu/nordic/nrf51xxx/include/mcu/nrf51_clock.h
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_NRF51_CLOCK_
+#define H_NRF51_CLOCK_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/**
+ * Request HFXO clock be turned on. Note that each request must have a
+ * corresponding release.
+ *
+ * @return int 0: hfxo was already on. 1: hfxo was turned on.
+ */
+int nrf51_clock_hfxo_request(void);
+
+/**
+ * Release the HFXO; caller no longer needs the HFXO to be turned on. Each call
+ * to release should have been preceeded by a corresponding call to request the
+ * HFXO
+ *
+ *
+ * @return int 0: HFXO not stopped by this call (others using it) 1: HFXO
+ * stopped.
+ */
+int nrf51_clock_hfxo_release(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_NRF51_CLOCK_ */
+
diff --git a/hw/mcu/nordic/nrf51xxx/src/nrf51_clock.c b/hw/mcu/nordic/nrf51xxx/src/nrf51_clock.c
new file mode 100644
index 0000000000..0c6fcc5ca9
--- /dev/null
+++ b/hw/mcu/nordic/nrf51xxx/src/nrf51_clock.c
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#include <assert.h>
+#include "mcu/nrf51_hal.h"
+
+static uint8_t nrf51_clock_hfxo_refcnt;
+
+/**
+ * Request HFXO clock be turned on. Note that each request must have a
+ * corresponding release.
+ *
+ * @return int 0: hfxo was already on. 1: hfxo was turned on.
+ */
+int
+nrf51_clock_hfxo_request(void)
+{
+ int started;
+ uint32_t ctx;
+
+ started = 0;
+ __HAL_DISABLE_INTERRUPTS(ctx);
+ assert(nrf51_clock_hfxo_refcnt < 0xff);
+ if (nrf51_clock_hfxo_refcnt == 0) {
+ NRF_CLOCK->TASKS_HFCLKSTART = 1;
+ started = 1;
+ }
+ ++nrf51_clock_hfxo_refcnt;
+ __HAL_ENABLE_INTERRUPTS(ctx);
+
+ return started;
+}
+
+/**
+ * Release the HFXO. This means that the caller no longer needs the HFXO to be
+ * turned on. Each call to release should have been preceeded by a corresponding
+ * call to request the HFXO
+ *
+ *
+ * @return int 0: HFXO not stopped by this call (others using it) 1: HFXO
+ * stopped.
+ */
+int
+nrf51_clock_hfxo_release(void)
+{
+ int stopped;
+ uint32_t ctx;
+
+ stopped = 0;
+ __HAL_DISABLE_INTERRUPTS(ctx);
+ assert(nrf51_clock_hfxo_refcnt != 0);
+ --nrf51_clock_hfxo_refcnt;
+ if (nrf51_clock_hfxo_refcnt == 0) {
+ NRF_CLOCK->TASKS_HFCLKSTOP = 1;
+ stopped = 1;
+ }
+ __HAL_ENABLE_INTERRUPTS(ctx);
+
+ return stopped;
+}
diff --git a/hw/mcu/nordic/nrf52xxx-compat/include/mcu/nrf52_clock.h b/hw/mcu/nordic/nrf52xxx-compat/include/mcu/nrf52_clock.h
new file mode 100644
index 0000000000..d86aa98bf2
--- /dev/null
+++ b/hw/mcu/nordic/nrf52xxx-compat/include/mcu/nrf52_clock.h
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_NRF52_CLOCK_
+#define H_NRF52_CLOCK_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/**
+ * Request HFXO clock be turned on. Note that each request must have a
+ * corresponding release.
+ *
+ * @return int 0: hfxo was already on. 1: hfxo was turned on.
+ */
+int nrf52_clock_hfxo_request(void);
+
+/**
+ * Release the HFXO; caller no longer needs the HFXO to be turned on. Each call
+ * to release should have been preceeded by a corresponding call to request the
+ * HFXO
+ *
+ *
+ * @return int 0: HFXO not stopped by this call (others using it) 1: HFXO
+ * stopped.
+ */
+int nrf52_clock_hfxo_release(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_NRF52_CLOCK_ */
diff --git a/hw/mcu/nordic/nrf52xxx-compat/src/nrf52_clock.c b/hw/mcu/nordic/nrf52xxx-compat/src/nrf52_clock.c
new file mode 100644
index 0000000000..9bdd0ac8d3
--- /dev/null
+++ b/hw/mcu/nordic/nrf52xxx-compat/src/nrf52_clock.c
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#include <assert.h>
+#include "mcu/nrf52_hal.h"
+
+static uint8_t nrf52_clock_hfxo_refcnt;
+
+/**
+ * Request HFXO clock be turned on. Note that each request must have a
+ * corresponding release.
+ *
+ * @return int 0: hfxo was already on. 1: hfxo was turned on.
+ */
+int
+nrf52_clock_hfxo_request(void)
+{
+ int started;
+ uint32_t ctx;
+
+ started = 0;
+ __HAL_DISABLE_INTERRUPTS(ctx);
+ assert(nrf52_clock_hfxo_refcnt < 0xff);
+ if (nrf52_clock_hfxo_refcnt == 0) {
+ NRF_CLOCK->TASKS_HFCLKSTART = 1;
+ started = 1;
+ }
+ ++nrf52_clock_hfxo_refcnt;
+ __HAL_ENABLE_INTERRUPTS(ctx);
+
+ return started;
+}
+
+/**
+ * Release the HFXO. This means that the caller no longer needs the HFXO to be
+ * turned on. Each call to release should have been preceeded by a corresponding
+ * call to request the HFXO
+ *
+ *
+ * @return int 0: HFXO not stopped by this call (others using it) 1: HFXO
+ * stopped.
+ */
+int
+nrf52_clock_hfxo_release(void)
+{
+ int stopped;
+ uint32_t ctx;
+
+ stopped = 0;
+ __HAL_DISABLE_INTERRUPTS(ctx);
+ assert(nrf52_clock_hfxo_refcnt != 0);
+ --nrf52_clock_hfxo_refcnt;
+ if (nrf52_clock_hfxo_refcnt == 0) {
+ NRF_CLOCK->TASKS_HFCLKSTOP = 1;
+ stopped = 1;
+ }
+ __HAL_ENABLE_INTERRUPTS(ctx);
+
+ return stopped;
+}
diff --git a/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_clock.h b/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_clock.h
new file mode 100644
index 0000000000..d86aa98bf2
--- /dev/null
+++ b/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_clock.h
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_NRF52_CLOCK_
+#define H_NRF52_CLOCK_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/**
+ * Request HFXO clock be turned on. Note that each request must have a
+ * corresponding release.
+ *
+ * @return int 0: hfxo was already on. 1: hfxo was turned on.
+ */
+int nrf52_clock_hfxo_request(void);
+
+/**
+ * Release the HFXO; caller no longer needs the HFXO to be turned on. Each call
+ * to release should have been preceeded by a corresponding call to request the
+ * HFXO
+ *
+ *
+ * @return int 0: HFXO not stopped by this call (others using it) 1: HFXO
+ * stopped.
+ */
+int nrf52_clock_hfxo_release(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_NRF52_CLOCK_ */
diff --git a/hw/mcu/nordic/nrf52xxx/src/nrf52_clock.c b/hw/mcu/nordic/nrf52xxx/src/nrf52_clock.c
new file mode 100644
index 0000000000..9bdd0ac8d3
--- /dev/null
+++ b/hw/mcu/nordic/nrf52xxx/src/nrf52_clock.c
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#include <assert.h>
+#include "mcu/nrf52_hal.h"
+
+static uint8_t nrf52_clock_hfxo_refcnt;
+
+/**
+ * Request HFXO clock be turned on. Note that each request must have a
+ * corresponding release.
+ *
+ * @return int 0: hfxo was already on. 1: hfxo was turned on.
+ */
+int
+nrf52_clock_hfxo_request(void)
+{
+ int started;
+ uint32_t ctx;
+
+ started = 0;
+ __HAL_DISABLE_INTERRUPTS(ctx);
+ assert(nrf52_clock_hfxo_refcnt < 0xff);
+ if (nrf52_clock_hfxo_refcnt == 0) {
+ NRF_CLOCK->TASKS_HFCLKSTART = 1;
+ started = 1;
+ }
+ ++nrf52_clock_hfxo_refcnt;
+ __HAL_ENABLE_INTERRUPTS(ctx);
+
+ return started;
+}
+
+/**
+ * Release the HFXO. This means that the caller no longer needs the HFXO to be
+ * turned on. Each call to release should have been preceeded by a corresponding
+ * call to request the HFXO
+ *
+ *
+ * @return int 0: HFXO not stopped by this call (others using it) 1: HFXO
+ * stopped.
+ */
+int
+nrf52_clock_hfxo_release(void)
+{
+ int stopped;
+ uint32_t ctx;
+
+ stopped = 0;
+ __HAL_DISABLE_INTERRUPTS(ctx);
+ assert(nrf52_clock_hfxo_refcnt != 0);
+ --nrf52_clock_hfxo_refcnt;
+ if (nrf52_clock_hfxo_refcnt == 0) {
+ NRF_CLOCK->TASKS_HFCLKSTOP = 1;
+ stopped = 1;
+ }
+ __HAL_ENABLE_INTERRUPTS(ctx);
+
+ return stopped;
+}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services