Version 1.85 RC

Makefile

@@ -217,4 +217,3 @@ help:
 	"|         CORE_COUNT=1024 NO_FOOTER=1 NO_UPPER=1                |\n"\
 	"|         clean all                                             |\n"\
 	"o---------------------------------------------------------------o"
-

amdmsr.h

@@ -1421,4 +1421,3 @@ typedef union
 		VID		: 32-24;	/*	Voltage ID	*/
 	};
 } AMD_17_CORE_VID;
-

bitasm.h

@@ -943,4 +943,3 @@ static void (*UBENCH_RDCOUNTER)(unsigned int) = UBENCH_RDCOUNTER_VOID;
 #define UBENCH_SETUP(withTSCP , withPMC)	/* UBENCH_SETUP()	*/
 
 #endif /* UBENCH == 1 */
-

corefreq-api.h

@@ -1509,4 +1509,3 @@ typedef struct
 #ifndef PCI_DEVICE_ID_AMD_19H_VERMEER_DF_F3
 	#define PCI_DEVICE_ID_AMD_19H_VERMEER_DF_F3	0x1653	/* Vermeer */
 #endif
-

corefreq-cli-extra.c

@@ -215,4 +215,3 @@ void ISO_8859_To_Unicode(unsigned char *pIn, unsigned char *pOut)
 	}
 	(*pOut) = '\0';
 }
-

corefreq-cli-extra.h

@@ -28,4 +28,3 @@ extern void json_string(struct json_state *state, char * value) ;
 extern void json_literal(struct json_state *state, char * format, ...) ;
 
 extern void ISO_8859_To_Unicode(unsigned char*, unsigned char*) ;
-

corefreq-cli-json.c

@@ -1878,4 +1878,3 @@ void JsonSysInfo(SHM_STRUCT *Shm, CELL_FUNC OutFunc)
 
 	json_end_object(&s);
 }
-

corefreq-cli.c

@@ -3452,7 +3452,7 @@ void TjMax_Update(TGrid *grid, DATA_TYPE data)
 	memcpy(&grid->cell.item[pos], item, 6);
 }
 
-void TDP_Update(TGrid *grid, DATA_TYPE data)
+void TDP_State(TGrid *grid, DATA_TYPE data)
 {
 	const enum PWR_DOMAIN pw = (enum PWR_DOMAIN) data.sint[0];
 	const unsigned int bix = Shm->Proc.Power.Domain[pw].Feature[PL1].Enable
@@ -3463,7 +3463,7 @@ void TDP_Update(TGrid *grid, DATA_TYPE data)
 		(char *)(bix ? RSC(ENABLE).CODE() : RSC(DISABLE).CODE()) );
 }
 
-void PWR_Update(TGrid *grid, unsigned short value)
+void PCT_Update(TGrid *grid, unsigned short value)
 {
 	const signed int pos = grid->cell.length - 9;
 	char item[6+1];
@@ -3472,18 +3472,32 @@ void PWR_Update(TGrid *grid, unsigned short value)
 	memcpy(&grid->cell.item[pos], item, 5);
 }
 
+void TDP_Update(TGrid *grid, DATA_TYPE data)
+{
+	UNUSED(data);
+
+	PCT_Update(grid, Shm->Proc.Power.TDP);
+}
+
 void PL1_Update(TGrid *grid, DATA_TYPE data)
 {
 	const enum PWR_DOMAIN pw = (enum PWR_DOMAIN) data.sint[0];
 
-	PWR_Update(grid, Shm->Proc.Power.Domain[pw].PL1);
+	PCT_Update(grid, Shm->Proc.Power.Domain[pw].PL1);
 }
 
 void PL2_Update(TGrid *grid, DATA_TYPE data)
 {
 	const enum PWR_DOMAIN pw = (enum PWR_DOMAIN) data.sint[0];
 
-	PWR_Update(grid, Shm->Proc.Power.Domain[pw].PL2);
+	PCT_Update(grid, Shm->Proc.Power.Domain[pw].PL2);
+}
+
+void TDC_Update(TGrid *grid, DATA_TYPE data)
+{
+	UNUSED(data);
+
+	PCT_Update(grid, Shm->Proc.Power.TDC);
 }
 
 REASON_CODE SysInfoPwrThermal(Window *win, CUINT width, CELL_FUNC OutFunc)
@@ -3664,10 +3678,11 @@ REASON_CODE SysInfoPwrThermal(Window *win, CUINT width, CELL_FUNC OutFunc)
 		RSC(POWER_LABEL_HTC).CODE(), TM[bix] );
     }
     if (Shm->Proc.Power.TDP > 0) {
-	PUT(	SCANKEY_NULL, attrib[5], width, 2,
+	GridCall( PUT(	SCANKEY_NULL, attrib[5], width, 2,
 			"%s%.*s%s   [%5u W]", RSC(POWER_THERMAL_TDP).CODE(),
 			width - 18 - RSZ(POWER_THERMAL_TDP), hSpace,
-		RSC(POWER_LABEL_TDP).CODE(), Shm->Proc.Power.TDP );
+			RSC(POWER_LABEL_TDP).CODE(), Shm->Proc.Power.TDP ),
+		TDP_Update );
     } else {
 	PUT(	SCANKEY_NULL, attrib[0], width, 2,
 		"%s%.*s%s   [%7s]", RSC(POWER_THERMAL_TDP).CODE(),
@@ -3726,7 +3741,7 @@ REASON_CODE SysInfoPwrThermal(Window *win, CUINT width, CELL_FUNC OutFunc)
 				 - label[pw].size,
 				hSpace, label[pw].code,
 				bix ? RSC(ENABLE).CODE():RSC(DISABLE).CODE() ),
-			TDP_Update, pw );
+			TDP_State, pw );
 
 	    if (Shm->Proc.Power.Domain[pw].PL1 > 0) {
 		GridCall( PUT(	(BOXKEY_TDP_OR | pw), attrib[5], width, 3,
@@ -3802,10 +3817,11 @@ REASON_CODE SysInfoPwrThermal(Window *win, CUINT width, CELL_FUNC OutFunc)
 		RSC(POWER_LABEL_EDC).CODE(), POWERED(0) );
     }
     if (Shm->Proc.Power.TDC > 0) {
-	PUT(	SCANKEY_NULL, attrib[5], width, 2,
+	GridCall( PUT(	SCANKEY_NULL, attrib[5], width, 2,
 			"%s%.*s%s   [%5u A]", RSC(POWER_THERMAL_TDC).CODE(),
 			width - 18 - RSZ(POWER_THERMAL_TDC), hSpace,
-		RSC(POWER_LABEL_TDC).CODE(), Shm->Proc.Power.TDC );
+			RSC(POWER_LABEL_TDC).CODE(), Shm->Proc.Power.TDC ),
+		TDC_Update );
     } else {
 	PUT(	SCANKEY_NULL, attrib[0], width, 2,
 		"%s%.*s%s   [%7s]", RSC(POWER_THERMAL_TDC).CODE(),

corefreq-cli.h

@@ -500,4 +500,3 @@ struct RECORDER_ST {
 		Select,
 		Ratios[];
 };
-

corefreq-ui.c

@@ -2218,4 +2218,3 @@ __typeof__ (errno) LoadGeometries(char *cfgFQN)
     }
 	return (rc);
 }
-

corefreq-ui.h

@@ -907,4 +907,3 @@ extern __typeof__ (errno) LoadGeometries(char*) ;
 #else
   #define UI_Draw_uBenchmark(layer) {}
 #endif /* UBENCH */
-

corefreq.h

@@ -738,4 +738,3 @@ typedef struct {
 	time(&now);							\
 	now - ref;							\
 })
-

corefreqd.service

@@ -14,4 +14,3 @@ SuccessExitStatus=SIGQUIT SIGUSR1 SIGTERM
 
 [Install]
 WantedBy=multi-user.target
-

corefreqm.h

@@ -68,4 +68,3 @@ void CallWith_RDTSC_No_RDPMC(	SHM_STRUCT*,
 #define CRC32_EXP	0x44f9d7bc
 
 #define CONIC_ERROR	1e-07
-

intelmsr.h

@@ -3088,4 +3088,3 @@ typedef union
 		ReservedBits2	: 32-20;
 	};
 } SKL_CAPID_C;	/* §3.41 CAPID0_C Capabilities C Register		*/
-

scripter.sh

@@ -32,4 +32,3 @@ else
 	echo "$0: missing arguments"
 fi
 #
-