Make supervisor_get_raw_subticks a static function _get_raw_subticks.

eightycc · eightycc · commit b05e80e0b687 · 2025-05-07T11:01:17.000-07:00
diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c
@@ -85,7 +85,7 @@ void supervisor_tick(void) {
     background_callback_add(&tick_callback, supervisor_background_tick, NULL);
 }
 
-uint64_t supervisor_get_raw_subticks(void) {
+static uint64_t _get_raw_subticks(void) {
     uint64_t ticks;
     uint8_t subticks;
     ticks = port_get_raw_ticks(&subticks);
@@ -104,7 +104,7 @@ uint32_t supervisor_ticks_ms32() {
 }
 
 void mp_hal_delay_ms(mp_uint_t delay_ms) {
-    uint64_t start_subtick = supervisor_get_raw_subticks();
+    uint64_t start_subtick = _get_raw_subticks();
     // Convert delay from ms to subticks
     uint64_t delay_subticks = (delay_ms * (uint64_t)32768) / 1000;
     uint64_t end_subtick = start_subtick + delay_subticks;
@@ -119,15 +119,15 @@ void mp_hal_delay_ms(mp_uint_t delay_ms) {
             break;
         }
         // Recalculate remaining delay after running background tasks
-        remaining = end_subtick - supervisor_get_raw_subticks();
+        remaining = end_subtick - _get_raw_subticks();
         // If remaining delay is less than 1 tick, idle loop until end of delay
         int64_t remaining_ticks = remaining / 32;
         if (remaining_ticks > 0) {
             port_interrupt_after_ticks(remaining_ticks);
             // Idle until an interrupt happens.
             port_idle_until_interrupt();
         }
-        remaining = end_subtick - supervisor_get_raw_subticks();
+        remaining = end_subtick - _get_raw_subticks();
     }
 }
 
diff --git a/supervisor/shared/tick.h b/supervisor/shared/tick.h
@@ -33,13 +33,6 @@ extern uint32_t supervisor_ticks_ms32(void);
  */
 extern uint64_t supervisor_ticks_ms64(void);
 
-/** @brief Get 64-bit current time in subticks
- *
- * Time is returned as a 64-bit count of subticks where each subtick is 1/32768
- * of a second.
- */
-extern uint64_t supervisor_get_raw_subticks(void);
-
 extern void supervisor_enable_tick(void);
 extern void supervisor_disable_tick(void);
 

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ void supervisor_tick(void) {`
`85`	`85`	`background_callback_add(&tick_callback, supervisor_background_tick, NULL);`
`86`	`86`	`}`
`87`	`87`
`88`		`-uint64_t supervisor_get_raw_subticks(void) {`
	`88`	`+static uint64_t _get_raw_subticks(void) {`
`89`	`89`	`uint64_t ticks;`
`90`	`90`	`uint8_t subticks;`
`91`	`91`	`ticks = port_get_raw_ticks(&subticks);`
`@@ -104,7 +104,7 @@ uint32_t supervisor_ticks_ms32() {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`void mp_hal_delay_ms(mp_uint_t delay_ms) {`
`107`		`- uint64_t start_subtick = supervisor_get_raw_subticks();`
	`107`	`+ uint64_t start_subtick = _get_raw_subticks();`
`108`	`108`	`// Convert delay from ms to subticks`
`109`	`109`	`uint64_t delay_subticks = (delay_ms * (uint64_t)32768) / 1000;`
`110`	`110`	`uint64_t end_subtick = start_subtick + delay_subticks;`
`@@ -119,15 +119,15 @@ void mp_hal_delay_ms(mp_uint_t delay_ms) {`
`119`	`119`	`break;`
`120`	`120`	`}`
`121`	`121`	`// Recalculate remaining delay after running background tasks`
`122`		`- remaining = end_subtick - supervisor_get_raw_subticks();`
	`122`	`+ remaining = end_subtick - _get_raw_subticks();`
`123`	`123`	`// If remaining delay is less than 1 tick, idle loop until end of delay`
`124`	`124`	`int64_t remaining_ticks = remaining / 32;`
`125`	`125`	`if (remaining_ticks > 0) {`
`126`	`126`	`port_interrupt_after_ticks(remaining_ticks);`
`127`	`127`	`// Idle until an interrupt happens.`
`128`	`128`	`port_idle_until_interrupt();`
`129`	`129`	`}`
`130`		`- remaining = end_subtick - supervisor_get_raw_subticks();`
	`130`	`+ remaining = end_subtick - _get_raw_subticks();`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`