sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/: Remove g_ prefixes and _g suffixes from variables

Browse Source 
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>
This commit is contained in:
Patrick Georgi
2019-11-29 11:47:47 +01:00
parent ae64f22e8d
commit c9b13594eb
17 changed files with 301 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/drivers/vpd/vpd.c
View File

@@ -23,7 +23,7 @@ struct vpd_gets_arg {
int matched;
};
struct vpd_blob g_vpd_blob;
struct vpd_blob vpd_blob;
/*
* returns the size of data in a VPD 2.0 formatted fmap region, or 0.
@@ -85,10 +85,10 @@ static void vpd_get_blob(void)
if (ro_vpd_size == 0 && rw_vpd_size == 0)
return;
g_vpd_blob.ro_base = NULL;
g_vpd_blob.ro_size = 0;
g_vpd_blob.rw_base = NULL;
g_vpd_blob.rw_size = 0;
vpd_blob.ro_base = NULL;
vpd_blob.ro_size = 0;
vpd_blob.rw_base = NULL;
vpd_blob.rw_size = 0;
struct region_device vpd;
@@ -101,9 +101,9 @@ static void vpd_get_blob(void)
}
rdev_chain(&vpd, &vpd, GOOGLE_VPD_2_0_OFFSET,
region_device_sz(&vpd) - GOOGLE_VPD_2_0_OFFSET);
g_vpd_blob.ro_base = (uint8_t *)(rdev_mmap_full(&vpd) +
vpd_blob.ro_base = (uint8_t *)(rdev_mmap_full(&vpd) +
sizeof(struct google_vpd_info));
g_vpd_blob.ro_size = ro_vpd_size;
vpd_blob.ro_size = ro_vpd_size;
}
if (rw_vpd_size) {
if (fmap_locate_area_as_rdev("RW_VPD", &vpd)) {
@@ -114,19 +114,19 @@ static void vpd_get_blob(void)
}
rdev_chain(&vpd, &vpd, GOOGLE_VPD_2_0_OFFSET,
region_device_sz(&vpd) - GOOGLE_VPD_2_0_OFFSET);
g_vpd_blob.rw_base = (uint8_t *)(rdev_mmap_full(&vpd) +
vpd_blob.rw_base = (uint8_t *)(rdev_mmap_full(&vpd) +
sizeof(struct google_vpd_info));
g_vpd_blob.rw_size = rw_vpd_size;
vpd_blob.rw_size = rw_vpd_size;
}
g_vpd_blob.initialized = true;
vpd_blob.initialized = true;
}
const struct vpd_blob *vpd_load_blob(void)
{
if (g_vpd_blob.initialized == false)
if (vpd_blob.initialized == false)
vpd_get_blob();
return &g_vpd_blob;
return &vpd_blob;
}
static int vpd_gets_callback(const uint8_t *key, uint32_t key_len,