summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--debian/changelog6
-rw-r--r--debian/postinst2
-rw-r--r--debian/postrm2
-rw-r--r--debian/prerm2
-rwxr-xr-xdebian/rules2
-rw-r--r--usr/src/dkms_source_tree/applesmc.c10
-rw-r--r--usr/src/dkms_source_tree/dkms.conf2
8 files changed, 22 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 8c75829..64240b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
1NAME = applesmc 1NAME = applesmc
2VERSION = 0.13.1 2VERSION = 0.14.1
3SRC = usr/src 3SRC = usr/src
4 4
5TARBALL = $(NAME)-$(VERSION).dkms.tar.gz 5TARBALL = $(NAME)-$(VERSION).dkms.tar.gz
diff --git a/debian/changelog b/debian/changelog
index e1d970c..f3c0464 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1applesmc-dkms (0.14.1) unstable; urgency=low
2
3 * Add support for MacBook Air 2
4
5 -- Henrik Rydberg <rydberg@euromail.se> Sun, 30 Nov 2008 18:32:42 +0100
6
1applesmc-dkms (0.13.1) unstable; urgency=low 7applesmc-dkms (0.13.1) unstable; urgency=low
2 8
3 * Add autoinstaller directive 9 * Add autoinstaller directive
diff --git a/debian/postinst b/debian/postinst
index 5d31b17..6351864 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,7 +3,7 @@
3set -e 3set -e
4 4
5NAME=applesmc 5NAME=applesmc
6VERSION=0.13.1 6VERSION=0.14.1
7 7
8case "$1" in 8case "$1" in
9 configure) 9 configure)
diff --git a/debian/postrm b/debian/postrm
index fd37575..454faea 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3NAME=applesmc 3NAME=applesmc
4VERSION=0.13.1 4VERSION=0.14.1
5 5
6set -e 6set -e
7 7
diff --git a/debian/prerm b/debian/prerm
index 468aede..05315a4 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3NAME=applesmc 3NAME=applesmc
4VERSION=0.13.1 4VERSION=0.14.1
5 5
6set -e 6set -e
7 7
diff --git a/debian/rules b/debian/rules
index b11bcff..c829ec6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
5#export DH_VERBOSE=1 5#export DH_VERBOSE=1
6 6
7NAME=applesmc 7NAME=applesmc
8VERSION=0.13.1 8VERSION=0.14.1
9 9
10configure: configure-stamp 10configure: configure-stamp
11configure-stamp: 11configure-stamp:
diff --git a/usr/src/dkms_source_tree/applesmc.c b/usr/src/dkms_source_tree/applesmc.c
index dc71080..acd818f 100644
--- a/usr/src/dkms_source_tree/applesmc.c
+++ b/usr/src/dkms_source_tree/applesmc.c
@@ -131,6 +131,10 @@ static const char* temperature_sensors_sets[][36] = {
131/* Set 14: iMac 6,1 */ 131/* Set 14: iMac 6,1 */
132 { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P", 132 { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P",
133 "TO0P", "Tp0P", NULL }, 133 "TO0P", "Tp0P", NULL },
134/* Set 15: MacBook Air 2,1 */
135 { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TN0D", "TTF0",
136 "TV0P", "TVFP", "TW0P", "Th0P", "Tp0P", "Tp1P", "TpFP", "Ts0P",
137 "Ts0S", NULL },
134}; 138};
135 139
136/* List of keys used to read/write fan speeds */ 140/* List of keys used to read/write fan speeds */
@@ -1301,11 +1305,17 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
1301 { .accelerometer = 0, .light = 0, .temperature_set = 13 }, 1305 { .accelerometer = 0, .light = 0, .temperature_set = 13 },
1302/* iMac 6: light sensor only, temperature set 14 */ 1306/* iMac 6: light sensor only, temperature set 14 */
1303 { .accelerometer = 0, .light = 0, .temperature_set = 14 }, 1307 { .accelerometer = 0, .light = 0, .temperature_set = 14 },
1308/* MacBook Air 2,1: accelerometer, backlight and temperature set 15 */
1309 { .accelerometer = 1, .light = 1, .temperature_set = 15 },
1304}; 1310};
1305 1311
1306/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". 1312/* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
1307 * So we need to put "Apple MacBook Pro" before "Apple MacBook". */ 1313 * So we need to put "Apple MacBook Pro" before "Apple MacBook". */
1308static __initdata struct dmi_system_id applesmc_whitelist[] = { 1314static __initdata struct dmi_system_id applesmc_whitelist[] = {
1315 { applesmc_dmi_match, "Apple MacBook Air 2", {
1316 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1317 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir2") },
1318 &applesmc_dmi_data[15]},
1309 { applesmc_dmi_match, "Apple MacBook Air", { 1319 { applesmc_dmi_match, "Apple MacBook Air", {
1310 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), 1320 DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
1311 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, 1321 DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf
index 325fe0d..06934cf 100644
--- a/usr/src/dkms_source_tree/dkms.conf
+++ b/usr/src/dkms_source_tree/dkms.conf
@@ -1,5 +1,5 @@
1NAME=applesmc 1NAME=applesmc
2VERSION=0.13.1 2VERSION=0.14.1
3PACKAGE_NAME="$NAME" 3PACKAGE_NAME="$NAME"
4PACKAGE_VERSION="$VERSION" 4PACKAGE_VERSION="$VERSION"
5MAKE[0]="make -C ${kernel_source_dir} 5MAKE[0]="make -C ${kernel_source_dir}