Attachment #243679 for bug #272787

View | Details | Raw Unified | Return to bug 272787
Collapse All | Expand All

Lines 257-262 Link Here

(-)asmc.c.mm6-2.mbp10-1 (+15 lines)
257	},	257	},
258		258
259	{	259	{
		260	"MacBookPro10,1", "Apple SMC MacBook Pro (early 2013, 15-inch)",
		261	ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS,
		262	ASMC_MBP101_TEMPS, ASMC_MBP101_TEMPNAMES, ASMC_MBP101_TEMPDESCS
		263	},
		264
		265	{
260	"MacBookPro11,2", "Apple SMC MacBook Pro Retina Core i7 (2013/2014)",	266	"MacBookPro11,2", "Apple SMC MacBook Pro Retina Core i7 (2013/2014)",
261	ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS,	267	ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS,
262	ASMC_MBP112_TEMPS, ASMC_MBP112_TEMPNAMES, ASMC_MBP112_TEMPDESCS	268	ASMC_MBP112_TEMPS, ASMC_MBP112_TEMPNAMES, ASMC_MBP112_TEMPDESCS
Lines 331-336 Link Here
331	ASMC_FAN_FUNCS2,	337	ASMC_FAN_FUNCS2,
332	NULL, NULL, NULL,	338	NULL, NULL, NULL,
333	ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS	339	ASMC_MM52_TEMPS, ASMC_MM52_TEMPNAMES, ASMC_MM52_TEMPDESCS
		340	},
		341
		342	/* The Mac Mini 6,2 has no SMS */
		343	{
		344	"Macmini6,2", "Apple SMC Mac Mini 6,2",
		345	NULL, NULL, NULL,
		346	ASMC_FAN_FUNCS2,
		347	NULL, NULL, NULL,
		348	ASMC_MM62_TEMPS, ASMC_MM62_TEMPNAMES, ASMC_MM62_TEMPDESCS
334	},	349	},
335		350
336	/* The Mac Mini 7,1 has no SMS */	351	/* The Mac Mini 7,1 has no SMS */




				  "GPU Die", "Memory Bank A1", "Memory Module A1", \
				  "PCH Die" }

#define ASMC_MBP101_TEMPS	{ "TB0T", "TB1T", "TB2T", "TC0E", "TC0F", \
				  "TC0P", "TC1C", "TC2C", "TC3C", "TC4C", \
				  "TG0D", "TG0P", "TG1D", "TG1F", "TG1d", \
				  "TH0A", "TH0B", "TH0V", "TH0a", "TH0b", \
				  "TH0c", "TH0x", "TM0P", "TM0S", "TMBS", \
				  "TP0P", "TPCD", "TS0D", "TS0P", "TS1D", \
				  "TS1P", "TW0P", "Ta0P", "TaSP", "Th1H", \
				  "Th2H", "Ts0P", "Ts0S", "Ts1S", NULL }

#define ASMC_MBP101_TEMPNAMES { "TB0T", "TB1T", "TB2T", "TC0E", "TC0F", \
				  "TC0P", "TC1C", "TC2C", "TC3C", "TC4C", \
				  "TG0D", "TG0P", "TG1D", "TG1F", "TG1d", \
				  "TH0A", "TH0B", "TH0V", "TH0a", "TH0b", \
				  "TH0c", "TH0x", "TM0P", "TM0S", "TMBS", \
				  "TP0P", "TPCD", "TS0D", "TS0P", "TS1D", \
				  "TS1P", "TW0P", "Ta0P", "TaSP", "Th1H", \
				  "Th2H", "Ts0P", "Ts0S", "Ts1S" }

#define ASMC_MBP101_TEMPDESCS	{ "TB0T", "TB1T", "TB2T", "TC0E", "TC0F", \
				  "TC0P", "TC1C", "TC2C", "TC3C", "TC4C", \
				  "TG0D", "TG0P", "TG1D", "TG1F", "TG1d", \
				  "TH0A", "TH0B", "TH0V", "TH0a", "TH0b", \
				  "TH0c", "TH0x", "TM0P", "TM0S", "TMBS", \
				  "TP0P", "TPCD", "TS0D", "TS0P", "TS1D", \
				  "TS1P", "TW0P", "Ta0P", "TaSP", "Th1H", \
				  "Th2H", "Ts0P", "Ts0S", "Ts1S" }

#define ASMC_MBP112_TEMPS	{ "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \
				  "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \
				  "TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \

				  "Platform Controller Hub Die Temperature", \
				  "Power Supply Temperature", \
				  "Wireless Module Proximity Temperature", }

#define ASMC_MM62_TEMPS	{ "TA0P", "TA0p", "TA1P", "TA1p", "TC0C", \
				  "TC0D", "TC0E", "TC0F", "TC0G", "TC0J", \
				  "TC0P", "TC0c", "TC0d", "TC0p", "TC1C", \
				  "TC1c", "TC2C", "TC2c", "TC3C", "TC3c", \
				  "TCFC", "TCGC", "TCGc", "TCPG", "TCSC", \
				  "TCSc", "TCTD", "TCXC", "TCXc", "TCXr", \
				  "TH0A", "TH0B", "TH0C", "TH0F", "TH0O", \
				  "TH0X", "TH0a", "TH0b", "TH0c", "TH0o", \
				  "TH1A", "TH1B", "TH1C", "TH1F", "TH1O", \
				  "TH1X", "TH1a", "TH1b", "TH1c", "TH1o", \
				  "TI0P", "TI0p", "TI1P", "TI1p", "TM0P", \
				  "TM0S", "TM0p", "TMBS", "TP0P", "TP0p", \
				  "TPCD", "TPCd", "TW0P", "TW0p", "Tp0C", \
				  "Ts0G", "Ts0S", NULL }

#define ASMC_MM62_TEMPNAMES	{ "TA0P", "TA0p", "TA1P", "TA1p", "TC0C", \
				  "TC0D", "TC0E", "TC0F", "TC0G", "TC0J", \
				  "TC0P", "TC0c", "TC0d", "TC0p", "TC1C", \
				  "TC1c", "TC2C", "TC2c", "TC3C", "TC3c", \
				  "TCFC", "TCGC", "TCGc", "TCPG", "TCSC", \
				  "TCSc", "TCTD", "TCXC", "TCXc", "TCXr", \
				  "TH0A", "TH0B", "TH0C", "TH0F", "TH0O", \
				  "TH0X", "TH0a", "TH0b", "TH0c", "TH0o", \
				  "TH1A", "TH1B", "TH1C", "TH1F", "TH1O", \
				  "TH1X", "TH1a", "TH1b", "TH1c", "TH1o", \
				  "TI0P", "TI0p", "TI1P", "TI1p", "TM0P", \
				  "TM0S", "TM0p", "TMBS", "TP0P", "TP0p", \
				  "TPCD", "TPCd", "TW0P", "TW0p", "Tp0C", \
				  "Ts0G", "Ts0S", }

#define ASMC_MM62_TEMPDESCS	{ "TA0P", "TA0p", "TA1P", "TA1p", "TC0C", \
				  "TC0D", "TC0E", "TC0F", "TC0G", "TC0J", \
				  "TC0P", "TC0c", "TC0d", "TC0p", "TC1C", \
				  "TC1c", "TC2C", "TC2c", "TC3C", "TC3c", \
				  "TCFC", "TCGC", "TCGc", "TCPG", "TCSC", \
				  "TCSc", "TCTD", "TCXC", "TCXc", "TCXr", \
				  "TH0A", "TH0B", "TH0C", "TH0F", "TH0O", \
				  "TH0X", "TH0a", "TH0b", "TH0c", "TH0o", \
				  "TH1A", "TH1B", "TH1C", "TH1F", "TH1O", \
				  "TH1X", "TH1a", "TH1b", "TH1c", "TH1o", \
				  "TI0P", "TI0p", "TI1P", "TI1p", "TM0P", \
				  "TM0S", "TM0p", "TMBS", "TP0P", "TP0p", \
				  "TPCD", "TPCd", "TW0P", "TW0p", "Tp0C", \
				  "Ts0G", "Ts0S", }

#define ASMC_MM71_TEMPS		{ "TA0p", "TA1p", \
				  "TA2p", "TC0c", \

Return to bug 272787

Lines 353-358 Link Here

(-)asmcvar.h.mm6-2.mbp10-1 (+72 lines)
353	"GPU Die", "Memory Bank A1", "Memory Module A1", \	353	"GPU Die", "Memory Bank A1", "Memory Module A1", \
354	"PCH Die" }	354	"PCH Die" }
355		355
		356	#define ASMC_MBP101_TEMPS { "TB0T", "TB1T", "TB2T", "TC0E", "TC0F", \
		357	"TC0P", "TC1C", "TC2C", "TC3C", "TC4C", \
		358	"TG0D", "TG0P", "TG1D", "TG1F", "TG1d", \
		359	"TH0A", "TH0B", "TH0V", "TH0a", "TH0b", \
		360	"TH0c", "TH0x", "TM0P", "TM0S", "TMBS", \
		361	"TP0P", "TPCD", "TS0D", "TS0P", "TS1D", \
		362	"TS1P", "TW0P", "Ta0P", "TaSP", "Th1H", \
		363	"Th2H", "Ts0P", "Ts0S", "Ts1S", NULL }
		364
		365	#define ASMC_MBP101_TEMPNAMES { "TB0T", "TB1T", "TB2T", "TC0E", "TC0F", \
		366	"TC0P", "TC1C", "TC2C", "TC3C", "TC4C", \
		367	"TG0D", "TG0P", "TG1D", "TG1F", "TG1d", \
		368	"TH0A", "TH0B", "TH0V", "TH0a", "TH0b", \
		369	"TH0c", "TH0x", "TM0P", "TM0S", "TMBS", \
		370	"TP0P", "TPCD", "TS0D", "TS0P", "TS1D", \
		371	"TS1P", "TW0P", "Ta0P", "TaSP", "Th1H", \
		372	"Th2H", "Ts0P", "Ts0S", "Ts1S" }
		373
		374	#define ASMC_MBP101_TEMPDESCS { "TB0T", "TB1T", "TB2T", "TC0E", "TC0F", \
		375	"TC0P", "TC1C", "TC2C", "TC3C", "TC4C", \
		376	"TG0D", "TG0P", "TG1D", "TG1F", "TG1d", \
		377	"TH0A", "TH0B", "TH0V", "TH0a", "TH0b", \
		378	"TH0c", "TH0x", "TM0P", "TM0S", "TMBS", \
		379	"TP0P", "TPCD", "TS0D", "TS0P", "TS1D", \
		380	"TS1P", "TW0P", "Ta0P", "TaSP", "Th1H", \
		381	"Th2H", "Ts0P", "Ts0S", "Ts1S" }
		382
356	#define ASMC_MBP112_TEMPS { "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \	383	#define ASMC_MBP112_TEMPS { "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \
357	"TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \	384	"TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \
358	"TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \	385	"TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \
Lines 506-511 Link Here
506	"Platform Controller Hub Die Temperature", \	533	"Platform Controller Hub Die Temperature", \
507	"Power Supply Temperature", \	534	"Power Supply Temperature", \
508	"Wireless Module Proximity Temperature", }	535	"Wireless Module Proximity Temperature", }
		536
		537	#define ASMC_MM62_TEMPS { "TA0P", "TA0p", "TA1P", "TA1p", "TC0C", \
		538	"TC0D", "TC0E", "TC0F", "TC0G", "TC0J", \
		539	"TC0P", "TC0c", "TC0d", "TC0p", "TC1C", \
		540	"TC1c", "TC2C", "TC2c", "TC3C", "TC3c", \
		541	"TCFC", "TCGC", "TCGc", "TCPG", "TCSC", \
		542	"TCSc", "TCTD", "TCXC", "TCXc", "TCXr", \
		543	"TH0A", "TH0B", "TH0C", "TH0F", "TH0O", \
		544	"TH0X", "TH0a", "TH0b", "TH0c", "TH0o", \
		545	"TH1A", "TH1B", "TH1C", "TH1F", "TH1O", \
		546	"TH1X", "TH1a", "TH1b", "TH1c", "TH1o", \
		547	"TI0P", "TI0p", "TI1P", "TI1p", "TM0P", \
		548	"TM0S", "TM0p", "TMBS", "TP0P", "TP0p", \
		549	"TPCD", "TPCd", "TW0P", "TW0p", "Tp0C", \
		550	"Ts0G", "Ts0S", NULL }
		551
		552	#define ASMC_MM62_TEMPNAMES { "TA0P", "TA0p", "TA1P", "TA1p", "TC0C", \
		553	"TC0D", "TC0E", "TC0F", "TC0G", "TC0J", \
		554	"TC0P", "TC0c", "TC0d", "TC0p", "TC1C", \
		555	"TC1c", "TC2C", "TC2c", "TC3C", "TC3c", \
		556	"TCFC", "TCGC", "TCGc", "TCPG", "TCSC", \
		557	"TCSc", "TCTD", "TCXC", "TCXc", "TCXr", \
		558	"TH0A", "TH0B", "TH0C", "TH0F", "TH0O", \
		559	"TH0X", "TH0a", "TH0b", "TH0c", "TH0o", \
		560	"TH1A", "TH1B", "TH1C", "TH1F", "TH1O", \
		561	"TH1X", "TH1a", "TH1b", "TH1c", "TH1o", \
		562	"TI0P", "TI0p", "TI1P", "TI1p", "TM0P", \
		563	"TM0S", "TM0p", "TMBS", "TP0P", "TP0p", \
		564	"TPCD", "TPCd", "TW0P", "TW0p", "Tp0C", \
		565	"Ts0G", "Ts0S", }
		566
		567	#define ASMC_MM62_TEMPDESCS { "TA0P", "TA0p", "TA1P", "TA1p", "TC0C", \
		568	"TC0D", "TC0E", "TC0F", "TC0G", "TC0J", \
		569	"TC0P", "TC0c", "TC0d", "TC0p", "TC1C", \
		570	"TC1c", "TC2C", "TC2c", "TC3C", "TC3c", \
		571	"TCFC", "TCGC", "TCGc", "TCPG", "TCSC", \
		572	"TCSc", "TCTD", "TCXC", "TCXc", "TCXr", \
		573	"TH0A", "TH0B", "TH0C", "TH0F", "TH0O", \
		574	"TH0X", "TH0a", "TH0b", "TH0c", "TH0o", \
		575	"TH1A", "TH1B", "TH1C", "TH1F", "TH1O", \
		576	"TH1X", "TH1a", "TH1b", "TH1c", "TH1o", \
		577	"TI0P", "TI0p", "TI1P", "TI1p", "TM0P", \
		578	"TM0S", "TM0p", "TMBS", "TP0P", "TP0p", \
		579	"TPCD", "TPCd", "TW0P", "TW0p", "Tp0C", \
		580	"Ts0G", "Ts0S", }
509		581
510	#define ASMC_MM71_TEMPS { "TA0p", "TA1p", \	582	#define ASMC_MM71_TEMPS { "TA0p", "TA1p", \
511	"TA2p", "TC0c", \	583	"TA2p", "TC0c", \