Remove unused hardware_rosc functions

Also allow setting PICO_ALLOW_EXAMPLE_KEYS as a property, and allow it for test/ directory

Author: will-v-pi

src/rp2_common/hardware_rosc/include/hardware/rosc.h

@@ -26,23 +26,6 @@ extern "C" {
  * more accurate than the ring oscillator.
  */
 
-/*! \brief  Set frequency of the Ring Oscillator
- *  \ingroup hardware_rosc
- *
- * \param code The drive strengths. See the datasheet for information on this value.
- */
-void rosc_set_freq(uint32_t code);
-
-/*! \brief  Set range of the Ring Oscillator
- *  \ingroup hardware_rosc
- *
- * Frequency range. Frequencies will vary with Process, Voltage & Temperature (PVT).
- * Clock output will not glitch when changing the range up one step at a time.
- *
- * \param range 0x01 Low, 0x02 Medium, 0x03 High, 0x04 Too High.
- */
-void rosc_set_range(uint range);
-
 /*! \brief  Disable the Ring Oscillator
  *  \ingroup hardware_rosc
  *
@@ -67,29 +50,6 @@ void rosc_set_dormant(void);
 */
 void rosc_restart(void);
 
-/*! \brief  Get the next ROSC freq code
- *  \ingroup hardware_rosc
- * 
- * Given a ROSC freq code, return the next-numerically-higher code.
- * Top result bit is set when called on maximum ROSC code.
- *
- * \param code The current ROSC freq code.
- * \return The next ROSC freq code.
- */
-uint32_t next_rosc_code(uint32_t code);
-
-/*! \brief  Set the frequency of the Ring Oscillator within a range
- *  \ingroup hardware_rosc
- *
- * This function will set the frequency of the Ring Oscillator to the first frequency within the range.
- * This will only be accurate if clk_ref is currently running from an accurate source (eg the XOSC).
- *
- * \param low_mhz The bottom of the range to search for.
- * \param high_mhz The top of the range to search for.
- * \return The frequency of the Ring Oscillator within the range in MHz, or 0 if no frequency within the range is found.
- */
-uint rosc_find_freq_mhz(uint32_t low_mhz, uint32_t high_mhz);
-
 /*! \brief  Measure the frequency of the Ring Oscillator
  *  \ingroup hardware_rosc
  *
@@ -99,25 +59,6 @@ uint rosc_find_freq_mhz(uint32_t low_mhz, uint32_t high_mhz);
  */
 uint rosc_measure_freq_khz(void);
 
-/*! \brief  Set the output divider of the Ring Oscillator
- *  \ingroup hardware_rosc
- *
- * \if rp2040_specific
- * div = 0 divides by 32
- * div = 1-31 divides by div
- * any other value sets div=31
- * \endif
- *
- * \if rp2350_specific
- * div = 0 divides by 128
- * div = 1-127 divides by div
- * any other value sets div=128
- * \endif
- *
- * \param div The output divider.
- */
-void rosc_set_div(uint32_t div);
-
 inline static void rosc_clear_bad_write(void) {
     hw_clear_bits(&rosc_hw->status, ROSC_STATUS_BADWRITE_BITS);
 }

src/rp2_common/hardware_rosc/rosc.c

@@ -10,48 +10,11 @@
 #include "hardware/clocks.h"
 #include "hardware/rosc.h"
 
-// Given a ROSC delay stage code, return the next-numerically-higher code.
-// Top result bit is set when called on maximum ROSC code.
-uint32_t next_rosc_code(uint32_t code) {
-    return ((code | 0x08888888u) + 1u) & 0xf7777777u;
-}
-
-uint rosc_find_freq_mhz(uint32_t low_mhz, uint32_t high_mhz) {
-    // TODO: This could be a lot better
-    rosc_set_div(1);
-    for (uint32_t code = 0; code <= 0x77777777u; code = next_rosc_code(code)) {
-        rosc_set_freq(code);
-        uint rosc_mhz = frequency_count_khz(CLOCKS_FC0_SRC_VALUE_ROSC_CLKSRC) / 1000;
-        if ((rosc_mhz >= low_mhz) && (rosc_mhz <= high_mhz)) {
-            return rosc_mhz;
-        }
-    }
-    return 0;
-}
 
 uint rosc_measure_freq_khz(void) {
     return frequency_count_khz(CLOCKS_FC0_SRC_VALUE_ROSC_CLKSRC);
 }
 
-void rosc_set_div(uint32_t div) {
-#if PICO_RP2040
-    assert(div <= 31);
-#else
-    assert(div <= 127);
-#endif
-    rosc_write(&rosc_hw->div, ROSC_DIV_VALUE_PASS + div);
-}
-
-void rosc_set_freq(uint32_t code) {
-    rosc_write(&rosc_hw->freqa, (ROSC_FREQA_PASSWD_VALUE_PASS << ROSC_FREQA_PASSWD_LSB) | (code & 0xffffu));
-    rosc_write(&rosc_hw->freqb, (ROSC_FREQB_PASSWD_VALUE_PASS << ROSC_FREQB_PASSWD_LSB) | (code >> 16u));
-}
-
-void rosc_set_range(uint range) {
-    // Range should use enumvals from the headers and thus have the password correct
-    rosc_write(&rosc_hw->ctrl, (ROSC_CTRL_ENABLE_VALUE_ENABLE << ROSC_CTRL_ENABLE_LSB) | range);
-}
-
 void rosc_disable(void) {
     uint32_t tmp = rosc_hw->ctrl;
     tmp &= (~ROSC_CTRL_ENABLE_BITS);

test/CMakeLists.txt

@@ -1,5 +1,7 @@
 add_subdirectory(pico_test)
 
+set_directory_properties(PROPERTIES PICO_ALLOW_EXAMPLE_KEYS 1)
+
 add_subdirectory(pico_stdlib_test)
 add_subdirectory(pico_stdio_test)
 add_subdirectory(pico_time_test)

tools/CMakeLists.txt

@@ -107,6 +107,12 @@ define_property(TARGET
     BRIEF_DOCS "Ensure a load map is added"
     FULL_DOCS "Ensure a load map is added"
 )
+define_property(TARGET
+    PROPERTY PICO_ALLOW_EXAMPLE_KEYS
+    INHERITED
+    BRIEF_DOCS "Allow use of example keys"
+    FULL_DOCS "Allow use of example keys"
+)
 
 # Check pioasm is installed, or build it if not installed
 function(pico_init_pioasm)
@@ -648,6 +654,10 @@ function(picotool_postprocess_binary TARGET)
         PICOTOOL_PROCESSING_CONFIGURED true
     )
 
+    if (NOT DEFINED PICO_ALLOW_EXAMPLE_KEYS)
+        get_target_property(PICO_ALLOW_EXAMPLE_KEYS ${TARGET} PICO_ALLOW_EXAMPLE_KEYS)
+    endif()
+
     # PICO_CMAKE_CONFIG: PICO_ALLOW_EXAMPLE_KEYS, Don't raise a warning when using default signing/encryption keys, type=bool, default=0, group=build
     if (NOT PICO_ALLOW_EXAMPLE_KEYS)
         picotool_check_default_keys(${TARGET})