From owner-svn-src-all@freebsd.org Tue May 3 17:11:34 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD08DB2C0BE; Tue, 3 May 2016 17:11:34 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 818491936; Tue, 3 May 2016 17:11:34 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u43HBXDN012899; Tue, 3 May 2016 17:11:33 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u43HBXfS012897; Tue, 3 May 2016 17:11:33 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201605031711.u43HBXfS012897@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Tue, 3 May 2016 17:11:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298990 - head/sys/dev/asmc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2016 17:11:34 -0000 Author: adrian Date: Tue May 3 17:11:33 2016 New Revision: 298990 URL: https://svnweb.freebsd.org/changeset/base/298990 Log: [asmc] Add support for MacBookPro5,1 Tested by: Johannes Lundberg PR: kern/209179 Submitted by: Thomas Brierley Modified: head/sys/dev/asmc/asmc.c head/sys/dev/asmc/asmcvar.h Modified: head/sys/dev/asmc/asmc.c ============================================================================== --- head/sys/dev/asmc/asmc.c Tue May 3 17:07:18 2016 (r298989) +++ head/sys/dev/asmc/asmc.c Tue May 3 17:11:33 2016 (r298990) @@ -216,6 +216,12 @@ struct asmc_model asmc_models[] = { }, { + "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 + }, + + { "MacBookPro8,2", "Apple SMC MacBook Pro (early 2011)", ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS, ASMC_MBP8_TEMPS, ASMC_MBP8_TEMPNAMES, ASMC_MBP8_TEMPDESCS Modified: head/sys/dev/asmc/asmcvar.h ============================================================================== --- head/sys/dev/asmc/asmcvar.h Tue May 3 17:07:18 2016 (r298989) +++ head/sys/dev/asmc/asmcvar.h Tue May 3 17:11:33 2016 (r298990) @@ -188,6 +188,34 @@ struct asmc_softc { "Unknown", "Unknown", \ "Wireless Module", } +#define ASMC_MBP5_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", \ + "enclosure_bottom_2", "enclosure_bottom_3", \ + "cpu_diode", "cpu", \ + "cpu_pin", "gpu_diode", \ + "gpu", "gpu_heatsink", \ + "gpu_pin", "gpu_transistor", \ + "gpu_2_heatsink", "northbridge_diode", \ + "northbridge_pin", "unknown", \ + "heatsink_2", "memory_controller", \ + "pci_express_slot_pin", "pci_express_slot_unk" } + +#define ASMC_MBP5_TEMPDESCS { "Enclosure Bottom 0", "Enclosure Bottom 1", \ + "Enclosure Bottom 2", "Enclosure Bottom 3", \ + "CPU Diode", "CPU ???", \ + "CPU Pin", "GPU Diode", \ + "GPU ???", "GPU Heatsink", \ + "GPU Pin", "GPU Transistor", \ + "GPU 2 Heatsink", "Northbridge Diode", \ + "Northbridge Pin", "Unknown", \ + "Heatsink 2", "Memory Controller", \ + "PCI Express Slot Pin", "PCI Express Slot (unk)" } + #define ASMC_MBP8_TEMPS { "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", \ "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \ "TC3C", "TC4C", "TCFC", "TCGC", "TCSA", \