diff options
author | Patrick Georgi <pgeorgi@google.com> | 2019-11-29 11:47:47 +0100 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2019-12-02 10:44:38 +0000 |
commit | c9b13594eb8d425e54a126b5c10e3f6fbc41528b (patch) | |
tree | f120705f6eb4ddf6dd008e73bdbbd34ae17fbdc9 /src/cpu/x86/tsc | |
parent | ae64f22e8d5707ef715ad4bd01b6181653a3f9ca (diff) |
src/: Remove g_ prefixes and _g suffixes from variables
These were often used to distinguish CAR_GLOBAL variables that weren't
directly usable. Since we're getting rid of this special case, also get
rid of the marker.
This change was created using coccinelle and the following script:
@match@
type T;
identifier old =~ "^(g_.*|.*_g)$";
@@
old
@script:python global_marker@
old << match.old;
new;
@@
new = old
if old[0:2] == "g_":
new = new[2:]
if new[-2:] == "_g":
new = new[:-2]
coccinelle.new = new
@@
identifier match.old, global_marker.new;
@@
- old
+ new
@@
type T;
identifier match.old, global_marker.new;
@@
- T old;
+ T new;
@@
type T;
identifier match.old, global_marker.new;
@@
- T old
+ T new
= ...;
There were some manual fixups: Some code still uses the global/local
variable naming scheme, so keep g_* there, and some variable names
weren't completely rewritten.
Change-Id: I4936ff9780a0d3ed9b8b539772bc48887f8d5eed
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37358
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Diffstat (limited to 'src/cpu/x86/tsc')
-rw-r--r-- | src/cpu/x86/tsc/delay_tsc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c index fda8fe1b20..4a1f5c98be 100644 --- a/src/cpu/x86/tsc/delay_tsc.c +++ b/src/cpu/x86/tsc/delay_tsc.c @@ -48,7 +48,7 @@ static struct monotonic_counter { int initialized; struct mono_time time; uint64_t last_value; -} mono_counter_g; +} mono_counter; void timer_monotonic_get(struct mono_time *mt) { @@ -56,14 +56,14 @@ void timer_monotonic_get(struct mono_time *mt) uint64_t ticks_elapsed; unsigned long ticks_per_usec; - if (!mono_counter_g.initialized) { + if (!mono_counter.initialized) { init_timer(); - mono_counter_g.last_value = rdtscll(); - mono_counter_g.initialized = 1; + mono_counter.last_value = rdtscll(); + mono_counter.initialized = 1; } current_tick = rdtscll(); - ticks_elapsed = current_tick - mono_counter_g.last_value; + ticks_elapsed = current_tick - mono_counter.last_value; ticks_per_usec = tsc_freq_mhz(); /* Update current time and tick values only if a full tick occurred. */ @@ -71,11 +71,11 @@ void timer_monotonic_get(struct mono_time *mt) uint64_t usecs_elapsed; usecs_elapsed = ticks_elapsed / ticks_per_usec; - mono_time_add_usecs(&mono_counter_g.time, (long)usecs_elapsed); - mono_counter_g.last_value = current_tick; + mono_time_add_usecs(&mono_counter.time, (long)usecs_elapsed); + mono_counter.last_value = current_tick; } /* Save result. */ - *mt = mono_counter_g.time; + *mt = mono_counter.time; } #endif |