aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--include/cpuinfo.h4
-rw-r--r--src/arm/linux/chipset.c36
-rw-r--r--src/arm/uarch.c4
-rw-r--r--test/mock/nexus9.cc4
-rw-r--r--test/mock/pixel-c.cc4
-rw-r--r--test/name/proc-cpuinfo-hardware.cc56
-rw-r--r--test/name/ro-board-platform.cc6
-rw-r--r--test/name/ro-product-board.cc8
-rw-r--r--tools/cpu-info.c2
10 files changed, 63 insertions, 63 deletions
diff --git a/README.md b/README.md
index 0dd0e34..e435c8f 100644
--- a/README.md
+++ b/README.md
@@ -127,7 +127,7 @@ pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpu_set);
- [ ] Other x86 cores (DM&P, RDC, Transmeta, Cyrix, Rise)
- [x] ARM-designed ARM cores (up to Cortex-A17, Cortex-75)
- [x] Qualcomm-designed ARM cores (up to Kryo and Kryo-280)
- - [x] nVidia-designed ARM cores (Denver)
+ - [x] Nvidia-designed ARM cores (Denver)
- [x] Samsung-designed ARM cores (Mongoose)
- [x] Intel-designed ARM cores (XScale up to 3rd-gen)
- [ ] Apple-designed ARM cores (up to Hurricane)
diff --git a/include/cpuinfo.h b/include/cpuinfo.h
index 44503eb..ac12492 100644
--- a/include/cpuinfo.h
+++ b/include/cpuinfo.h
@@ -144,7 +144,7 @@ enum cpuinfo_vendor {
cpuinfo_vendor_apple = 5,
/** Samsung Electronics Co., Ltd. Vendir if ARM64 processor microarchitectures. */
cpuinfo_vendor_samsung = 6,
- /** nVidia Corporation. Vendor of ARM64-compatible processor microarchitectures. */
+ /** Nvidia Corporation. Vendor of ARM64-compatible processor microarchitectures. */
cpuinfo_vendor_nvidia = 7,
/** MIPS Technologies, Inc. Vendor of MIPS processor microarchitectures. */
cpuinfo_vendor_mips = 8,
@@ -377,7 +377,7 @@ enum cpuinfo_uarch {
/** Qualcomm Kryo. */
cpuinfo_uarch_kryo = 0x00400102,
- /** nVidia Denver. */
+ /** Nvidia Denver. */
cpuinfo_uarch_denver = 0x00500100,
/** Samsung Mongoose. */
diff --git a/src/arm/linux/chipset.c b/src/arm/linux/chipset.c
index d46fab2..6481058 100644
--- a/src/arm/linux/chipset.c
+++ b/src/arm/linux/chipset.c
@@ -1546,13 +1546,13 @@ static bool match_tcc(
}
/*
- * Compares ro.board.platform string to nVidia Tegra signatures ("tegra" and "tegra3")
+ * Compares ro.board.platform string to Nvidia Tegra signatures ("tegra" and "tegra3")
* This check has effect on how /proc/cpuinfo Hardware string is interpreted.
*
* @param start - start of the ro.board.platform string to check.
* @param end - end of the ro.board.platform string to check.
*
- * @returns true if the string matches an nVidia Tegra signature, and false otherwise
+ * @returns true if the string matches an Nvidia Tegra signature, and false otherwise
*/
static bool is_tegra(const char* start, const char* end) {
/* Expect 5 ("tegra") or 6 ("tegra3") symbols */
@@ -1695,7 +1695,7 @@ static const struct special_map_entry special_hardware_map_entries[] = {
static const struct special_map_entry tegra_hardware_map_entries[] = {
{
- /* "cardhu" (nVidia Cardhu developer tablet) -> Tegra T30 */
+ /* "cardhu" (Nvidia Cardhu developer tablet) -> Tegra T30 */
.platform = "cardhu",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 30,
@@ -1764,31 +1764,31 @@ static const struct special_map_entry tegra_hardware_map_entries[] = {
.model = 114,
},
{
- /* "tn8" (nVidia Shield Tablet K1) -> Tegra T124 */
+ /* "tn8" (Nvidia Shield Tablet K1) -> Tegra T124 */
.platform = "tn8",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 124,
},
{
- /* "roth" (nVidia Shield Portable) -> Tegra T114 */
+ /* "roth" (Nvidia Shield Portable) -> Tegra T114 */
.platform = "roth",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 114,
},
{
- /* "foster_e" (nVidia Shield TV, Flash) -> Tegra T210 */
+ /* "foster_e" (Nvidia Shield TV, Flash) -> Tegra T210 */
.platform = "foster_e",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 210,
},
{
- /* "foster_e_hdd" (nVidia Shield TV, HDD) -> Tegra T210 */
+ /* "foster_e_hdd" (Nvidia Shield TV, HDD) -> Tegra T210 */
.platform = "foster_e_hdd",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 210,
},
{
- /* "darcy" (nVidia Shield TV 2017) -> Tegra T210 */
+ /* "darcy" (Nvidia Shield TV 2017) -> Tegra T210 */
.platform = "darcy",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 210,
@@ -2038,7 +2038,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
if (is_tegra) {
/*
- * nVidia Tegra-specific path: compare /proc/cpuinfo Hardware string to
+ * Nvidia Tegra-specific path: compare /proc/cpuinfo Hardware string to
* tabulated Hardware values for popular chipsets/devices with Tegra chipsets.
* This path is only used when ro.board.platform indicates a Tegra chipset
* (albeit does not indicate which exactly Tegra chipset).
@@ -2048,7 +2048,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
tegra_hardware_map_entries[i].platform[hardware_length] == 0)
{
cpuinfo_log_debug(
- "found /proc/cpuinfo Hardware string \"%.*s\" in nVidia Tegra chipset table",
+ "found /proc/cpuinfo Hardware string \"%.*s\" in Nvidia Tegra chipset table",
(int) hardware_length, hardware);
/* Create chipset name from entry */
return (struct cpuinfo_arm_chipset) {
@@ -2276,7 +2276,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
.model = 3168,
},
{
- /* "g2mv" (LG G2 mini LTE) -> nVidia Tegra SL460N */
+ /* "g2mv" (LG G2 mini LTE) -> Nvidia Tegra SL460N */
.platform = "g2mv",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_sl,
.model = 460,
@@ -2301,20 +2301,20 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
.model = 4460,
},
{
- /* "grouper" (Asus Nexus 7 2012) -> nVidia Tegra T30L */
+ /* "grouper" (Asus Nexus 7 2012) -> Nvidia Tegra T30L */
.platform = "grouper",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 30,
.suffix = 'L',
},
{
- /* "flounder" (HTC Nexus 9) -> nVidia Tegra T132 */
+ /* "flounder" (HTC Nexus 9) -> Nvidia Tegra T132 */
.platform = "flounder",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 132,
},
{
- /* "dragon" (Google Pixel C) -> nVidia Tegra T210 */
+ /* "dragon" (Google Pixel C) -> Nvidia Tegra T210 */
.platform = "dragon",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 210,
@@ -2570,19 +2570,19 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_ha
.model = 1,
},
{
- /* "tegra132" -> nVidia Tegra T132 */
+ /* "tegra132" -> Nvidia Tegra T132 */
.platform = "tegra132",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 132,
},
{
- /* "tegra210_dragon" -> nVidia Tegra T210 */
+ /* "tegra210_dragon" -> Nvidia Tegra T210 */
.platform = "tegra210_dragon",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 210,
},
{
- /* "tegra4" -> nVidia Tegra T114 */
+ /* "tegra4" -> Nvidia Tegra T114 */
.platform = "tegra4",
.series = cpuinfo_arm_chipset_series_nvidia_tegra_t,
.model = 114,
@@ -3066,7 +3066,7 @@ static const char* chipset_vendor_string[cpuinfo_arm_chipset_vendor_max] = {
[cpuinfo_arm_chipset_vendor_marvell] = "Marvell",
[cpuinfo_arm_chipset_vendor_mstar] = "MStar",
[cpuinfo_arm_chipset_vendor_novathor] = "NovaThor",
- [cpuinfo_arm_chipset_vendor_nvidia] = "nVidia",
+ [cpuinfo_arm_chipset_vendor_nvidia] = "Nvidia",
[cpuinfo_arm_chipset_vendor_pinecone] = "Pinecone",
[cpuinfo_arm_chipset_vendor_renesas] = "Renesas",
[cpuinfo_arm_chipset_vendor_rockchip] = "Rockchip",
diff --git a/src/arm/uarch.c b/src/arm/uarch.c
index 38ed7ff..d04ed52 100644
--- a/src/arm/uarch.c
+++ b/src/arm/uarch.c
@@ -124,14 +124,14 @@ void cpuinfo_arm_decode_vendor_uarch(
break;
case 0x003:
/*
- * nVidia Denver 2.
+ * Nvidia Denver 2.
* Few details are known about Denver 2, and known details are no different that Denver 1,
* so consider them the same microarchitecture.
*/
*uarch = cpuinfo_uarch_denver;
break;
default:
- cpuinfo_log_warning("unknown nVidia CPU part 0x%03"PRIx32" ignored", midr_get_part(midr));
+ cpuinfo_log_warning("unknown Nvidia CPU part 0x%03"PRIx32" ignored", midr_get_part(midr));
}
break;
case 'Q':
diff --git a/test/mock/nexus9.cc b/test/mock/nexus9.cc
index abdfec7..422293c 100644
--- a/test/mock/nexus9.cc
+++ b/test/mock/nexus9.cc
@@ -122,7 +122,7 @@ TEST(PACKAGES, count) {
TEST(PACKAGES, name) {
for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
- ASSERT_EQ("nVidia Tegra T132",
+ ASSERT_EQ("Nvidia Tegra T132",
std::string(cpuinfo_get_package(i)->name,
strnlen(cpuinfo_get_package(i)->name, CPUINFO_PACKAGE_NAME_MAX)));
}
@@ -476,4 +476,4 @@ int main(int argc, char* argv[]) {
cpuinfo_initialize();
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
-} \ No newline at end of file
+}
diff --git a/test/mock/pixel-c.cc b/test/mock/pixel-c.cc
index 28cf7f9..2faa49d 100644
--- a/test/mock/pixel-c.cc
+++ b/test/mock/pixel-c.cc
@@ -122,7 +122,7 @@ TEST(PACKAGES, count) {
TEST(PACKAGES, name) {
for (uint32_t i = 0; i < cpuinfo_get_packages_count(); i++) {
- ASSERT_EQ("nVidia Tegra T210",
+ ASSERT_EQ("Nvidia Tegra T210",
std::string(cpuinfo_get_package(i)->name,
strnlen(cpuinfo_get_package(i)->name, CPUINFO_PACKAGE_NAME_MAX)));
}
@@ -476,4 +476,4 @@ int main(int argc, char* argv[]) {
cpuinfo_initialize();
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
-} \ No newline at end of file
+}
diff --git a/test/name/proc-cpuinfo-hardware.cc b/test/name/proc-cpuinfo-hardware.cc
index 81731c2..4ac8f66 100644
--- a/test/name/proc-cpuinfo-hardware.cc
+++ b/test/name/proc-cpuinfo-hardware.cc
@@ -636,61 +636,61 @@ TEST(PROC_CPUINFO_HARDWARE, mstar) {
}
TEST(PROC_CPUINFO_HARDWARE, nvidia) {
- EXPECT_EQ("nVidia Tegra AP20H",
+ EXPECT_EQ("Nvidia Tegra AP20H",
parse_proc_cpuinfo_hardware_tegra("picasso"));
- EXPECT_EQ("nVidia Tegra AP20H",
+ EXPECT_EQ("Nvidia Tegra AP20H",
parse_proc_cpuinfo_hardware_tegra("picasso_e"));
- EXPECT_EQ("nVidia Tegra AP20H",
+ EXPECT_EQ("Nvidia Tegra AP20H",
parse_proc_cpuinfo_hardware_tegra("stingray"));
- EXPECT_EQ("nVidia Tegra AP33",
+ EXPECT_EQ("Nvidia Tegra AP33",
parse_proc_cpuinfo_hardware_tegra("endeavoru"));
- EXPECT_EQ("nVidia Tegra AP33",
+ EXPECT_EQ("Nvidia Tegra AP33",
parse_proc_cpuinfo_hardware_tegra("x3"));
- EXPECT_EQ("nVidia Tegra SL460N",
+ EXPECT_EQ("Nvidia Tegra SL460N",
parse_proc_cpuinfo_hardware_tegra("Ceres"));
- EXPECT_EQ("nVidia Tegra T114",
+ EXPECT_EQ("Nvidia Tegra T114",
parse_proc_cpuinfo_hardware_tegra("macallan"));
- EXPECT_EQ("nVidia Tegra T114",
+ EXPECT_EQ("Nvidia Tegra T114",
parse_proc_cpuinfo_hardware_tegra("mozart"));
- EXPECT_EQ("nVidia Tegra T114",
+ EXPECT_EQ("Nvidia Tegra T114",
parse_proc_cpuinfo_hardware_tegra("tostab12BA"));
- EXPECT_EQ("nVidia Tegra T124",
+ EXPECT_EQ("Nvidia Tegra T124",
parse_proc_cpuinfo_hardware_tegra("mocha"));
- EXPECT_EQ("nVidia Tegra T124",
+ EXPECT_EQ("Nvidia Tegra T124",
parse_proc_cpuinfo_hardware_tegra("tn8"));
- EXPECT_EQ("nVidia Tegra T20",
+ EXPECT_EQ("Nvidia Tegra T20",
parse_proc_cpuinfo_hardware_tegra("nbx03"));
- EXPECT_EQ("nVidia Tegra T20",
+ EXPECT_EQ("Nvidia Tegra T20",
parse_proc_cpuinfo_hardware_tegra("p3"));
- EXPECT_EQ("nVidia Tegra T20",
+ EXPECT_EQ("Nvidia Tegra T20",
parse_proc_cpuinfo_hardware_tegra("ventana"));
- EXPECT_EQ("nVidia Tegra T30",
+ EXPECT_EQ("Nvidia Tegra T30",
parse_proc_cpuinfo_hardware_tegra("cardhu"));
- EXPECT_EQ("nVidia Tegra T30",
+ EXPECT_EQ("Nvidia Tegra T30",
parse_proc_cpuinfo_hardware_tegra("chagall"));
- EXPECT_EQ("nVidia Tegra T30",
+ EXPECT_EQ("Nvidia Tegra T30",
parse_proc_cpuinfo_hardware_tegra("picasso_m"));
- EXPECT_EQ("nVidia Tegra T30",
+ EXPECT_EQ("Nvidia Tegra T30",
parse_proc_cpuinfo_hardware_tegra("picasso_mf"));
- EXPECT_EQ("nVidia Tegra T30L",
+ EXPECT_EQ("Nvidia Tegra T30L",
parse_proc_cpuinfo_hardware_tegra("BIRCH"));
- EXPECT_EQ("nVidia Tegra T30L",
+ EXPECT_EQ("Nvidia Tegra T30L",
parse_proc_cpuinfo_hardware_tegra("NS_14T004"));
- EXPECT_EQ("nVidia Tegra T30L",
+ EXPECT_EQ("Nvidia Tegra T30L",
parse_proc_cpuinfo_hardware_tegra("avalon"));
- EXPECT_EQ("nVidia Tegra T30L",
+ EXPECT_EQ("Nvidia Tegra T30L",
parse_proc_cpuinfo_hardware_tegra("picasso_e2"));
- EXPECT_EQ("nVidia Tegra T30L",
+ EXPECT_EQ("Nvidia Tegra T30L",
parse_proc_cpuinfo_hardware_tegra("tostab12BL"));
- EXPECT_EQ("nVidia Tegra T30L",
+ EXPECT_EQ("Nvidia Tegra T30L",
parse_proc_cpuinfo_hardware_tegra("txs03"));
- EXPECT_EQ("nVidia Tegra T33",
+ EXPECT_EQ("Nvidia Tegra T33",
parse_proc_cpuinfo_hardware_tegra("bobsleigh"));
- EXPECT_EQ("nVidia Tegra T33",
+ EXPECT_EQ("Nvidia Tegra T33",
parse_proc_cpuinfo_hardware_tegra("enrc2b"));
- EXPECT_EQ("nVidia Tegra T33",
+ EXPECT_EQ("Nvidia Tegra T33",
parse_proc_cpuinfo_hardware_tegra("evitareul"));
- EXPECT_EQ("nVidia Tegra T33",
+ EXPECT_EQ("Nvidia Tegra T33",
parse_proc_cpuinfo_hardware_tegra("tegra_fjdev103"));
}
diff --git a/test/name/ro-board-platform.cc b/test/name/ro-board-platform.cc
index d68512b..7b0ad99 100644
--- a/test/name/ro-board-platform.cc
+++ b/test/name/ro-board-platform.cc
@@ -231,11 +231,11 @@ TEST(RO_BOARD_PLATFORM, novathor) {
}
TEST(RO_BOARD_PLATFORM, nvidia) {
- EXPECT_EQ("nVidia Tegra T114",
+ EXPECT_EQ("Nvidia Tegra T114",
parse_ro_board_platform("tegra4"));
- EXPECT_EQ("nVidia Tegra T132",
+ EXPECT_EQ("Nvidia Tegra T132",
parse_ro_board_platform("tegra132"));
- EXPECT_EQ("nVidia Tegra T210",
+ EXPECT_EQ("Nvidia Tegra T210",
parse_ro_board_platform("tegra210_dragon"));
}
diff --git a/test/name/ro-product-board.cc b/test/name/ro-product-board.cc
index de87a54..cb9e9bc 100644
--- a/test/name/ro-product-board.cc
+++ b/test/name/ro-product-board.cc
@@ -395,13 +395,13 @@ TEST(RO_PRODUCT_BOARD, marvell_pxa) {
}
TEST(RO_PRODUCT_BOARD, nvidia) {
- EXPECT_EQ("nVidia Tegra SL460N",
+ EXPECT_EQ("Nvidia Tegra SL460N",
parse_ro_product_board("g2mv"));
- EXPECT_EQ("nVidia Tegra T132",
+ EXPECT_EQ("Nvidia Tegra T132",
parse_ro_product_board("flounder"));
- EXPECT_EQ("nVidia Tegra T210",
+ EXPECT_EQ("Nvidia Tegra T210",
parse_ro_product_board("dragon"));
- EXPECT_EQ("nVidia Tegra T30L",
+ EXPECT_EQ("Nvidia Tegra T30L",
parse_ro_product_board("grouper"));
}
diff --git a/tools/cpu-info.c b/tools/cpu-info.c
index e6c2703..5d4002f 100644
--- a/tools/cpu-info.c
+++ b/tools/cpu-info.c
@@ -22,7 +22,7 @@ static const char* vendor_to_string(enum cpuinfo_vendor vendor) {
case cpuinfo_vendor_samsung:
return "Samsung";
case cpuinfo_vendor_nvidia:
- return "nVidia";
+ return "Nvidia";
case cpuinfo_vendor_mips:
return "MIPS";
case cpuinfo_vendor_ibm:
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 07:44:56 +0000