supervisor: rename some locals for clarity

jepler · jepler · commit 9fd10322fedc · 2020-07-20T08:45:31.000-05:00
It's perfectly OK for these variables with static linkage to have the
same name, but it's inconvenient for humans like me.
diff --git a/supervisor/shared/tick.c b/supervisor/shared/tick.c
@@ -66,7 +66,7 @@
 
 static volatile uint64_t PLACE_IN_DTCM_BSS(background_ticks);
 
-static background_callback_t callback;
+static background_callback_t tick_callback;
 
 volatile uint64_t last_finished_tick = 0;
 
@@ -119,7 +119,7 @@ void supervisor_tick(void) {
         #endif
     }
 #endif
-    background_callback_add(&callback, supervisor_background_tasks, NULL);
+    background_callback_add(&tick_callback, supervisor_background_tasks, NULL);
 }
 
 uint64_t supervisor_ticks_ms64() {
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
@@ -64,8 +64,8 @@ void usb_init(void) {
     tusb_init();
 
 #if MICROPY_KBD_EXCEPTION
-    // Set Ctrl+C as wanted char, tud_cdc_rx_wanted_cb() callback will be invoked when Ctrl+C is received
-    // This callback always got invoked regardless of mp_interrupt_char value since we only set it once here
+    // Set Ctrl+C as wanted char, tud_cdc_rx_wanted_cb() usb_callback will be invoked when Ctrl+C is received
+    // This usb_callback always got invoked regardless of mp_interrupt_char value since we only set it once here
     tud_cdc_set_wanted_char(CHAR_CTRL_C);
 #endif
 
@@ -83,14 +83,14 @@ void usb_background(void) {
     }
 }
 
-static background_callback_t callback;
+static background_callback_t usb_callback;
 static void usb_background_do(void* unused) {
     usb_background();
 }
 
 void usb_irq_handler(void) {
     tud_int_handler(0);
-    background_callback_add(&callback, usb_background_do, NULL);
+    background_callback_add(&usb_callback, usb_background_do, NULL);
 }
 
 //--------------------------------------------------------------------+

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`
`67`	`67`	`static volatile uint64_t PLACE_IN_DTCM_BSS(background_ticks);`
`68`	`68`
`69`		`-static background_callback_t callback;`
	`69`	`+static background_callback_t tick_callback;`
`70`	`70`
`71`	`71`	`volatile uint64_t last_finished_tick = 0;`
`72`	`72`
`@@ -119,7 +119,7 @@ void supervisor_tick(void) {`
`119`	`119`	`#endif`
`120`	`120`	`}`
`121`	`121`	`#endif`
`122`		`- background_callback_add(&callback, supervisor_background_tasks, NULL);`
	`122`	`+ background_callback_add(&tick_callback, supervisor_background_tasks, NULL);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`uint64_t supervisor_ticks_ms64() {`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ void usb_init(void) {`
`64`	`64`	`tusb_init();`
`65`	`65`
`66`	`66`	`#if MICROPY_KBD_EXCEPTION`
`67`		`- // Set Ctrl+C as wanted char, tud_cdc_rx_wanted_cb() callback will be invoked when Ctrl+C is received`
`68`		`- // This callback always got invoked regardless of mp_interrupt_char value since we only set it once here`
	`67`	`+ // Set Ctrl+C as wanted char, tud_cdc_rx_wanted_cb() usb_callback will be invoked when Ctrl+C is received`
	`68`	`+ // This usb_callback always got invoked regardless of mp_interrupt_char value since we only set it once here`
`69`	`69`	`tud_cdc_set_wanted_char(CHAR_CTRL_C);`
`70`	`70`	`#endif`
`71`	`71`
`@@ -83,14 +83,14 @@ void usb_background(void) {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`-static background_callback_t callback;`
	`86`	`+static background_callback_t usb_callback;`
`87`	`87`	`static void usb_background_do(void* unused) {`
`88`	`88`	`usb_background();`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`void usb_irq_handler(void) {`
`92`	`92`	`tud_int_handler(0);`
`93`		`- background_callback_add(&callback, usb_background_do, NULL);`
	`93`	`+ background_callback_add(&usb_callback, usb_background_do, NULL);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`//--------------------------------------------------------------------+`