From owner-svn-src-all@FreeBSD.ORG Sat Jul 5 21:34:38 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 307C79B7; Sat, 5 Jul 2014 21:34:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 04BC42F8C; Sat, 5 Jul 2014 21:34:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s65LYbjh085508; Sat, 5 Jul 2014 21:34:37 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s65LYbj1085505; Sat, 5 Jul 2014 21:34:37 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201407052134.s65LYbj1085505@svn.freebsd.org> From: Gavin Atkinson Date: Sat, 5 Jul 2014 21:34:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268303 - 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.18 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: Sat, 05 Jul 2014 21:34:38 -0000 Author: gavin Date: Sat Jul 5 21:34:37 2014 New Revision: 268303 URL: http://svnweb.freebsd.org/changeset/base/268303 Log: Add support to asmc(4) for Macmini 3,1. PR: 190195 Submitted by: fbsdbugs2 sentry.org MFC after: 1 week Relnotes: yes 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 Sat Jul 5 21:18:33 2014 (r268302) +++ head/sys/dev/asmc/asmc.c Sat Jul 5 21:34:37 2014 (r268303) @@ -206,6 +206,15 @@ struct asmc_model asmc_models[] = { ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS }, + /* The Mac Mini 3,1 has no SMS */ + { + "Macmini3,1", "Apple SMC Mac Mini 3,1", + NULL, NULL, NULL, + ASMC_FAN_FUNCS, + NULL, NULL, NULL, + ASMC_MM31_TEMPS, ASMC_MM31_TEMPNAMES, ASMC_MM31_TEMPDESCS + }, + /* Idem for the MacPro */ { "MacPro2", "Apple SMC Mac Pro (8-core)", Modified: head/sys/dev/asmc/asmcvar.h ============================================================================== --- head/sys/dev/asmc/asmcvar.h Sat Jul 5 21:18:33 2014 (r268302) +++ head/sys/dev/asmc/asmcvar.h Sat Jul 5 21:34:37 2014 (r268303) @@ -180,6 +180,25 @@ struct asmc_softc { #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \ "Northbridge Point 2" } +#define ASMC_MM31_TEMPS { "TC0D", "TC0H", \ + "TC0P", "TH0P", \ + "TN0D", "TN0P", \ + "TW0P", NULL } + +#define ASMC_MM31_TEMPNAMES { "cpu0_die", "cpu0_heatsink", \ + "cpu0_proximity", "hdd_bay", \ + "northbridge_die", \ + "northbridge_proximity", \ + "wireless_module", } + +#define ASMC_MM31_TEMPDESCS { "CPU0 Die Core Temperature", \ + "CPU0 Heatsink Temperature", \ + "CPU0 Proximity Temperature", \ + "HDD Bay Temperature", \ + "Northbridge Die Core Temperature", \ + "Northbridge Proximity Temperature", \ + "Wireless Module Temperature", } + #define ASMC_MP_TEMPS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \