From 9a38b7afe0058620c09cf54b0bbc1c20f32a5e22 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Wed, 5 Apr 2017 11:58:17 +0300
Subject: [PATCH] cc3200/modmachine: Return frequency value directly, like
other ports.
---
cc3200/mods/modmachine.c | 5 +----
docs/library/machine.rst | 11 +----------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/cc3200/mods/modmachine.c b/cc3200/mods/modmachine.c
index 3c4e5a116..fd1485607 100644
--- a/cc3200/mods/modmachine.c
+++ b/cc3200/mods/modmachine.c
@@ -111,10 +111,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj, 0, 1, machine_info)
#endif
STATIC mp_obj_t machine_freq(void) {
- mp_obj_t tuple[1] = {
- mp_obj_new_int(HAL_FCPU_HZ),
- };
- return mp_obj_new_tuple(1, tuple);
+ return mp_obj_new_int(HAL_FCPU_HZ);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index c677bcbf0..1007f142f 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -52,16 +52,7 @@ Power related functions
.. function:: freq()
- .. only:: not port_wipy
-
- Returns CPU frequency in hertz.
-
- .. only:: port_wipy
-
- Returns a tuple of clock frequencies: ``(sysclk,)``
- These correspond to:
-
- - sysclk: frequency of the CPU
+ Returns CPU frequency in hertz.
.. function:: idle()
--
GitLab