[CLI] Fixing ambiguous CPPC report: hardware vs firmware

cyring · CyrIng · commit 04eb58c8896e · 2022-11-22T10:03:31.000Z
diff --git a/corefreq-cli.c b/corefreq-cli.c
@@ -4107,9 +4107,10 @@ REASON_CODE SysInfoPerfMon(Window *win, CUINT width, CELL_FUNC OutFunc)
      if  ( (RO(Shm)->Proc.Features.Info.Vendor.CRC == CRC_AMD)
 	|| (RO(Shm)->Proc.Features.Info.Vendor.CRC == CRC_HYGON) )
      {
-      if ((bix |= RO(Shm)->Proc.Features.ACPI_CPPC) == 1)
+      if (RO(Shm)->Proc.Features.ACPI_CPPC == 1)
       {
-	GridHover( PUT( BOXKEY_FMW_CPPC, attrib[bix], width, 2,
+	GridHover( PUT( BOXKEY_FMW_CPPC,
+			attrib[RO(Shm)->Proc.Features.ACPI_CPPC], width, 2,
 			"%s%.*s%s       <%3s>", RSC(PERF_MON_CPPC).CODE(),
 			width - 19 - RSZ(PERF_MON_CPPC), hSpace,
 			RSC(PERF_LABEL_CPPC).CODE(), RSC(FMW).CODE() ),

Original file line number	Diff line number	Diff line change
`@@ -4107,9 +4107,10 @@ REASON_CODE SysInfoPerfMon(Window *win, CUINT width, CELL_FUNC OutFunc)`
`4107`	`4107`	`if ( (RO(Shm)->Proc.Features.Info.Vendor.CRC == CRC_AMD)`
`4108`	`4108`	`\|\| (RO(Shm)->Proc.Features.Info.Vendor.CRC == CRC_HYGON) )`
`4109`	`4109`	`{`
`4110`		`- if ((bix \|= RO(Shm)->Proc.Features.ACPI_CPPC) == 1)`
	`4110`	`+ if (RO(Shm)->Proc.Features.ACPI_CPPC == 1)`
`4111`	`4111`	`{`
`4112`		`- GridHover( PUT( BOXKEY_FMW_CPPC, attrib[bix], width, 2,`
	`4112`	`+ GridHover( PUT( BOXKEY_FMW_CPPC,`
	`4113`	`+ attrib[RO(Shm)->Proc.Features.ACPI_CPPC], width, 2,`
`4113`	`4114`	`"%s%.*s%s <%3s>", RSC(PERF_MON_CPPC).CODE(),`
`4114`	`4115`	`width - 19 - RSZ(PERF_MON_CPPC), hSpace,`
`4115`	`4116`	`RSC(PERF_LABEL_CPPC).CODE(), RSC(FMW).CODE() ),`