Page MenuHomeFreeBSD
Files F175842957

D37900.id114633.diff
No OneTemporary
Actions

D37900.id114633.diff
View Options

diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c
--- a/sys/dev/asmc/asmc.c
+++ b/sys/dev/asmc/asmc.c
@@ -223,7 +223,13 @@
{
"MacBookPro5,1", "Apple SMC MacBook Pro Core 2 Duo (2008/2009)",
ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS,
- ASMC_MBP5_TEMPS, ASMC_MBP5_TEMPNAMES, ASMC_MBP5_TEMPDESCS
+ ASMC_MBP51_TEMPS, ASMC_MBP51_TEMPNAMES, ASMC_MBP51_TEMPDESCS
+ },
+
+ {
+ "MacBookPro5,5", "Apple SMC MacBook Pro Core 2 Duo (Mid 2009)",
+ ASMC_SMS_FUNCS, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS,
+ ASMC_MBP55_TEMPS, ASMC_MBP55_TEMPNAMES, ASMC_MBP55_TEMPDESCS
},
{
@@ -1397,10 +1403,10 @@
case ASMC_ALSL_INT2A:
/*
* This suppresses console and log messages for the ambient
- * light sensor for the only model known to generate this
- * interrupt.
+ * light sensor for models known to generate this interrupt.
*/
- if (strcmp(sc->sc_model->smc_model, "MacBookPro6,2") == 0)
+ if (strcmp(sc->sc_model->smc_model, "MacBookPro5,5") == 0 ||
+ strcmp(sc->sc_model->smc_model, "MacBookPro6,2") == 0)
break;
/* FALLTHROUGH */
default:
diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h
--- a/sys/dev/asmc/asmcvar.h
+++ b/sys/dev/asmc/asmcvar.h
@@ -209,13 +209,13 @@
"Unknown", "Unknown", \
"Wireless Module", }
-#define ASMC_MBP5_TEMPS { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", \
+#define ASMC_MBP51_TEMPS { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", \
"TC0F", "TC0P", "TG0D", "TG0F", "TG0H", \
"TG0P", "TG0T", "TG1H", "TN0D", "TN0P", \
"TTF0", "Th2H", "Tm0P", "Ts0P", "Ts0S", \
NULL }
-#define ASMC_MBP5_TEMPNAMES { "enclosure_bottom_0", "enclosure_bottom_1", \
+#define ASMC_MBP51_TEMPNAMES { "enclosure_bottom_0", "enclosure_bottom_1", \
"enclosure_bottom_2", "enclosure_bottom_3", \
"cpu_diode", "cpu", \
"cpu_pin", "gpu_diode", \
@@ -226,7 +226,7 @@
"heatsink_2", "memory_controller", \
"pci_express_slot_pin", "pci_express_slot_unk" }
-#define ASMC_MBP5_TEMPDESCS { "Enclosure Bottom 0", "Enclosure Bottom 1", \
+#define ASMC_MBP51_TEMPDESCS { "Enclosure Bottom 0", "Enclosure Bottom 1", \
"Enclosure Bottom 2", "Enclosure Bottom 3", \
"CPU Diode", "CPU ???", \
"CPU Pin", "GPU Diode", \
@@ -264,6 +264,31 @@
"Heat Sink 2", "Memory Controller", \
"Palm Rest", "Memory Proximity" }
+#define ASMC_MBP55_TEMPS { "TB0T", "TB1T", \
+ "TB2T", "TB3T", \
+ "TC0D", "TC0P", \
+ "TN0D", "TN0P", \
+ "TTF0", \
+ "Th0H", "Th1H", "ThFH", \
+ "Ts0P", "Ts0S", \
+ NULL }
+
+#define ASMC_MBP55_TEMPNAMES { "enclosure_bottom_0", "enclosure_bottom_1", \
+ "enclosure_bottom_2", "enclosure_bottom_3", \
+ "cpu_diode", "cpu_pin", \
+ "northbridge_diode", "northbridge_pin", \
+ "unknown", \
+ "heatsink_0", "heatsink_1", "heatsink_2", \
+ "pci_express_slot_pin", "pci_express_slot_unk" }
+
+#define ASMC_MBP55_TEMPDESCS { "Enclosure Bottom 0", "Enclosure Bottom 1", \
+ "Enclosure Bottom 2", "Enclosure Bottom 3", \
+ "CPU Diode", "CPU Pin", \
+ "Northbridge Diode", "Northbridge Pin", \
+ "Unknown", \
+ "Heatsink 0", "Heatsink 1", "Heatsink 2", \
+ "PCI Express Slot Pin", "PCI Express Slot (unk)" }
+
#define ASMC_MBP81_TEMPS { "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", \
"TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
"TCFC", "TCGC", "TCSA", "TM0S", "TMBS", \

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 14, 7:58 PM (4 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40816671
Default Alt Text
D37900.id114633.diff (3 KB)

Event Timeline