The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=308340cce2f02f06855f3ed355a2936fbc5c16bf

commit 308340cce2f02f06855f3ed355a2936fbc5c16bf
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2022-05-04 14:33:40 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
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 <t43invisible...@gmail.com>
    Submitted by:   John Hay <j...@sanren.ac.za>
    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", \

Reply via email to