From nobody Wed May 04 15:33:49 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 07CCF1AB57F3; Wed, 4 May 2022 15:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ktgpj6pQfz3vyP; Wed, 4 May 2022 15:33:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651678430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVOqJ56tm6bAIje5Wr/m4uDLdUcNHT67EbBqyVGs8EM=; b=SosxXMyRSyTs/+2n4fi7L5DLQ1K5fd8gTBmLvuBk3wf+3CkULFXYgl/irmrQoyuJ8NHVCf z0Vp4TmYJ8cap5VAkvEgSa7wRdRGHf6jvMzUX3Ld7tu+XhaJeWe+gxfvsoU4+JFre3RnIN XCuucM/ABlM7tX9R5gBCD3Uy/dDSHAyRUEA77QsW8NhH4UnVZKme4JDPdpgNtVaIDtREiE HJEO/GAYP78JxHN31HsixJu+E0xwX3J9vpsDF1yDy53cwTRknWfN1c94B8S5rGWoPL/Zc4 Rz/qnGbnBfVguc9mI0kaXisYcGoZRsxw8LTQCoxI6rwSY85+/heSMYZcJbkGDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C978B1592B; Wed, 4 May 2022 15:33:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 244FXn6q046223; Wed, 4 May 2022 15:33:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244FXnMQ046222; Wed, 4 May 2022 15:33:49 GMT (envelope-from git) Date: Wed, 4 May 2022 15:33:49 GMT Message-Id: <202205041533.244FXnMQ046222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 308340cce2f0 - main - asmc: Add support for MacBook Air 4,1 and 4,2 (2011) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 308340cce2f02f06855f3ed355a2936fbc5c16bf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651678430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVOqJ56tm6bAIje5Wr/m4uDLdUcNHT67EbBqyVGs8EM=; b=X1uUeIOEOMp402MKx2nd+Sds9oXEZ+Go8UmxFYWXGvVcTggW45gDWDh+0QZS9+NlOZ7tZg to77DPj2qBl3Ra4jUabGwzcsOEKrcnmIRqrQv2FC3Y2S2JzNwCCzc34ZfH5/XgngVnkmuK TNnyzqNo2va7/He42wO/U4v9T7y0IxhjtBfzR11zds3aFk0XnO7gsIjOKamXo7aCdwi+48 FvKI2IXt8KQHwPcv9qAMzuJxsK9vCXEXL/8vFnFxboTDRoGjpyv5H/zX9NN6+KVHGWVp38 of7eCzQ6p55f6TWGGc7FMV2ftzTSLSP2We1jXkGDdBaBr8pL8NM29v4lB/W+zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651678430; a=rsa-sha256; cv=none; b=YBewVM2HYzqtEnOG9cb01OBe/jz5GGLAU0kpD64vAD19sbmtjJRDPEUg5sdXm9P8fI1eqS XI6rWutBOLm2Ojp+Btb++i4zofXtznj3Eze2Afa91xzNISPnDa1KkluTzIkHTAcnGT3LSA fLfH1AQlgX7Kf6q+m/Ir0CNz0CgNMe4MVlHoufEvz+15cWRvh89bXSIENitXnw/WtkrR7P XAwbkauejwxk84dXSMhouWEZjxbhzF9qGWVbYcVJ8IeO2z87z3hK0IVWa+XfOvIQpvuDJZ a91iBEGd4SWFHL8Lq1BMRba4cTGCEPj7h8XI/QMGBSY+u8WZMvz6+w1bN882Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=308340cce2f02f06855f3ed355a2936fbc5c16bf commit 308340cce2f02f06855f3ed355a2936fbc5c16bf Author: Mark Johnston AuthorDate: 2022-05-04 14:33:40 +0000 Commit: Mark Johnston CommitDate: 2022-05-04 15:30:47 +0000 asmc: Add support for MacBook Air 4,1 and 4,2 (2011) PR: 218574 Submitted by: NapoleonWils0n Submitted by: John Hay MFC after: 2 weeks --- sys/dev/asmc/asmc.c | 16 ++++++++++++++++ sys/dev/asmc/asmcvar.h | 24 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 24d29ebeb2e0..b8884f7f6d64 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -340,6 +340,22 @@ struct asmc_model asmc_models[] = { ASMC_MBA3_TEMPS, ASMC_MBA3_TEMPNAMES, ASMC_MBA3_TEMPDESCS }, + { + "MacBookAir4,1", "Apple SMC Macbook Air 11-inch (Mid 2011)", + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS2, + ASMC_LIGHT_FUNCS, + ASMC_MBA4_TEMPS, ASMC_MBA4_TEMPNAMES, ASMC_MBA4_TEMPDESCS + }, + + { + "MacBookAir4,2", "Apple SMC Macbook Air 13-inch (Mid 2011)", + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS2, + ASMC_LIGHT_FUNCS, + ASMC_MBA4_TEMPS, ASMC_MBA4_TEMPNAMES, ASMC_MBA4_TEMPDESCS + }, + { "MacBookAir5,1", "Apple SMC MacBook Air 11-inch (Mid 2012)", ASMC_SMS_FUNCS_DISABLED, diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index d30961c84472..0c5714f97806 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -594,6 +594,30 @@ struct asmc_softc { #define ASMC_MBA3_TEMPDESCS { "Enclosure Bottom", "TB1T", "TB2T", \ "TC0D", "TC0E", "TC0P" } +#define ASMC_MBA4_TEMPS { "TB0T", "TB1T", "TB2T", "TC0C", \ + "TC0D", "TC0E", "TC0F", "TC0P", \ + "TC1C", "TC2C", "TCGC", "TCSA", \ + "TH0F", "TH0J", "TH0O", "TH0o", \ + "TM0P", "TPCD", "Ta0P", "Th1H", \ + "Tm0P", "Tm1P", "Ts0P", "Ts0S", \ + NULL } + +#define ASMC_MBA4_TEMPNAMES { "TB0T", "TB1T", "TB2T", "TC0C", \ + "TC0D", "TC0E", "TC0F", "TC0P", \ + "TC1C", "TC2C", "TCGC", "TCSA", \ + "TH0F", "TH0J", "TH0O", "TH0o", \ + "TM0P", "TPCD", "Ta0P", "Th1H", \ + "Tm0P", "Tm1P", "Ts0P", "Ts0S", \ + NULL } + +#define ASMC_MBA4_TEMPDESCS { "TB0T", "TB1T", "TB2T", "TC0C", \ + "TC0D", "TC0E", "TC0F", "TC0P", \ + "TC1C", "TC2C", "TCGC", "TCSA", \ + "TH0F", "TH0J", "TH0O", "TH0o", \ + "TM0P", "TPCD", "Ta0P", "Th1H", \ + "Tm0P", "Tm1P", "Ts0P", "Ts0S", \ + NULL } + #define ASMC_MBA5_TEMPS { "TB0T", "TB1T", "TB2T", "TC0C", \ "TC0D", "TC0E", "TC0F", "TC0P", \ "TC1C", "TC2C", "TCGC", "TCSA", \