Deleted Added
full compact
asmcvar.h (268303) asmcvar.h (271975)
1/*-
2 * Copyright (c) 2007, 2008 Rui Paulo <rpaulo@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
20 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
22 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
23 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
24 * POSSIBILITY OF SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2007, 2008 Rui Paulo <rpaulo@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
20 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
22 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
23 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
24 * POSSIBILITY OF SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/dev/asmc/asmcvar.h 268303 2014-07-05 21:34:37Z gavin $
26 * $FreeBSD: head/sys/dev/asmc/asmcvar.h 271975 2014-09-22 16:20:38Z rpaulo $
27 *
28 */
29
27 *
28 */
29
30#define ASMC_MAXFANS 2
30#define ASMC_MAXFANS 6
31
32struct asmc_softc {
33 device_t sc_dev;
34 struct mtx sc_mtx;
35 int sc_nfan;
36 int16_t sms_rest_x;
37 int16_t sms_rest_y;
38 int16_t sms_rest_z;

--- 39 unchanged lines hidden (view full) ---

78/* Number of keys */
79#define ASMC_NKEYS "#KEY" /* RO; 4 bytes */
80
81/*
82 * Fan control via SMC.
83 */
84#define ASMC_KEY_FANCOUNT "FNum" /* RO; 1 byte */
85#define ASMC_KEY_FANMANUAL "FS! " /* RW; 2 bytes */
31
32struct asmc_softc {
33 device_t sc_dev;
34 struct mtx sc_mtx;
35 int sc_nfan;
36 int16_t sms_rest_x;
37 int16_t sms_rest_y;
38 int16_t sms_rest_z;

--- 39 unchanged lines hidden (view full) ---

78/* Number of keys */
79#define ASMC_NKEYS "#KEY" /* RO; 4 bytes */
80
81/*
82 * Fan control via SMC.
83 */
84#define ASMC_KEY_FANCOUNT "FNum" /* RO; 1 byte */
85#define ASMC_KEY_FANMANUAL "FS! " /* RW; 2 bytes */
86#define ASMC_KEY_FANID "F%dID" /* RO; 16 bytes */
86#define ASMC_KEY_FANSPEED "F%dAc" /* RO; 2 bytes */
87#define ASMC_KEY_FANMINSPEED "F%dMn" /* RO; 2 bytes */
88#define ASMC_KEY_FANMAXSPEED "F%dMx" /* RO; 2 bytes */
89#define ASMC_KEY_FANSAFESPEED "F%dSf" /* RO; 2 bytes */
90#define ASMC_KEY_FANTARGETSPEED "F%dTg" /* RW; 2 bytes */
91
92/*
93 * Sudden Motion Sensor (SMS).

--- 33 unchanged lines hidden (view full) ---

127/*
128 * Temperatures.
129 *
130 * First for MacBook, second for MacBook Pro, third for Intel Mac Mini,
131 * fourth the Mac Pro 8-core and finally the MacBook Air.
132 *
133 */
134/* maximum array size for temperatures including the last NULL */
87#define ASMC_KEY_FANSPEED "F%dAc" /* RO; 2 bytes */
88#define ASMC_KEY_FANMINSPEED "F%dMn" /* RO; 2 bytes */
89#define ASMC_KEY_FANMAXSPEED "F%dMx" /* RO; 2 bytes */
90#define ASMC_KEY_FANSAFESPEED "F%dSf" /* RO; 2 bytes */
91#define ASMC_KEY_FANTARGETSPEED "F%dTg" /* RW; 2 bytes */
92
93/*
94 * Sudden Motion Sensor (SMS).

--- 33 unchanged lines hidden (view full) ---

128/*
129 * Temperatures.
130 *
131 * First for MacBook, second for MacBook Pro, third for Intel Mac Mini,
132 * fourth the Mac Pro 8-core and finally the MacBook Air.
133 *
134 */
135/* maximum array size for temperatures including the last NULL */
135#define ASMC_TEMP_MAX 36
136#define ASMC_TEMP_MAX 80
136#define ASMC_MB_TEMPS { "TB0T", "TN0P", "TN1P", "Th0H", "Th1H", \
137 "TM0P", NULL }
138#define ASMC_MB_TEMPNAMES { "enclosure", "northbridge1", \
139 "northbridge2", "heatsink1", \
140 "heatsink2", "memory", }
141#define ASMC_MB_TEMPDESCS { "Enclosure Bottomside", \
142 "Northbridge Point 1", \
143 "Northbridge Point 2", "Heatsink 1", \

--- 26 unchanged lines hidden (view full) ---

170 "Main Heatsink 3", \
171 "Memory Controller", \
172 "Graphics Chip Heatsink", \
173 "Graphics Chip Diode", \
174 "CPU Temperature Diode", "CPU Point 2", \
175 "Unknown", "Unknown", \
176 "Wireless Module", }
177
137#define ASMC_MB_TEMPS { "TB0T", "TN0P", "TN1P", "Th0H", "Th1H", \
138 "TM0P", NULL }
139#define ASMC_MB_TEMPNAMES { "enclosure", "northbridge1", \
140 "northbridge2", "heatsink1", \
141 "heatsink2", "memory", }
142#define ASMC_MB_TEMPDESCS { "Enclosure Bottomside", \
143 "Northbridge Point 1", \
144 "Northbridge Point 2", "Heatsink 1", \

--- 26 unchanged lines hidden (view full) ---

171 "Main Heatsink 3", \
172 "Memory Controller", \
173 "Graphics Chip Heatsink", \
174 "Graphics Chip Diode", \
175 "CPU Temperature Diode", "CPU Point 2", \
176 "Unknown", "Unknown", \
177 "Wireless Module", }
178
179#define ASMC_MBP8_TEMPS { "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", \
180 "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
181 "TC3C", "TC4C", "TCFC", "TCGC", "TCSA", \
182 "TCTD", "TG0D", "TG0P", "THSP", "TM0S", \
183 "TMBS", "TP0P", "TPCD", "TW0P", "Th1H", \
184 "Th2H", "Tm0P", "Ts0P", "Ts0S", NULL }
185
186#define ASMC_MBP8_TEMPNAMES { "enclosure", "TB1T", "TB2T", "TC0C", "TC0D", \
187 "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
188 "TC3C", "TC4C", "TCFC", "TCGC", "TCSA", \
189 "TCTD", "graphics", "TG0P", "THSP", "TM0S", \
190 "TMBS", "TP0P", "TPCD", "wireless", "Th1H", \
191 "Th2H", "memory", "Ts0P", "Ts0S" }
192
193#define ASMC_MBP8_TEMPDESCS { "Enclosure Bottomside", "TB1T", "TB2T", "TC0C", "TC0D", \
194 "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
195 "TC3C", "TC4C", "TCFC", "TCGC", "TCSA", \
196 "TCTD", "TG0D", "TG0P", "THSP", "TM0S", \
197 "TMBS", "TP0P", "TPCD", "TW0P", "Th1H", \
198 "Th2H", "Tm0P", "Ts0P", "Ts0S" }
199
200#define ASMC_MBP11_TEMPS { "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \
201 "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \
202 "TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \
203 "TCXC", "TG0D", "TG0P", "TG1D", "TG1F", \
204 "TG1d", "TH0A", "TH0B", "TH0F", "TH0R", \
205 "TH0V", "TH0a", "TH0b", "TH0c", "TM0P", \
206 "TM0S", "TP0P", "TPCD", "TW0P", "Ta0P", \
207 "TaSP", "Th1H", "Th2H", "Ts0P", "Ts0S", \
208 "Ts1S", NULL }
209
210#define ASMC_MBP11_TEMPNAMES { "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \
211 "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \
212 "TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \
213 "TCXC", "TG0D", "TG0P", "TG1D", "TG1F", \
214 "TG1d", "TH0A", "TH0B", "TH0F", "TH0R", \
215 "TH0V", "TH0a", "TH0b", "TH0c", "TM0P", \
216 "TM0S", "TP0P", "TPCD", "TW0P", "Ta0P", \
217 "TaSP", "Th1H", "Th2H", "Ts0P", "Ts0S", \
218 "Ts1S" }
219
220#define ASMC_MBP11_TEMPDESCS { "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \
221 "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \
222 "TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \
223 "TCXC", "TG0D", "TG0P", "TG1D", "TG1F", \
224 "TG1d", "TH0A", "TH0B", "TH0F", "TH0R", \
225 "TH0V", "TH0a", "TH0b", "TH0c", "TM0P", \
226 "TM0S", "TP0P", "TPCD", "TW0P", "Ta0P", \
227 "TaSP", "Th1H", "Th2H", "Ts0P", "Ts0S", \
228 "Ts1S" }
229
178#define ASMC_MM_TEMPS { "TN0P", "TN1P", NULL }
179#define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" }
180#define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \
181 "Northbridge Point 2" }
182
183#define ASMC_MM31_TEMPS { "TC0D", "TC0H", \
184 "TC0P", "TH0P", \
185 "TN0D", "TN0P", \

--- 23 unchanged lines hidden (view full) ---

209 NULL }
210
211#define ASMC_MP_TEMPNAMES { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \
212 "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \
213 "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \
214 "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \
215 "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \
216 "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \
230#define ASMC_MM_TEMPS { "TN0P", "TN1P", NULL }
231#define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" }
232#define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \
233 "Northbridge Point 2" }
234
235#define ASMC_MM31_TEMPS { "TC0D", "TC0H", \
236 "TC0P", "TH0P", \
237 "TN0D", "TN0P", \

--- 23 unchanged lines hidden (view full) ---

261 NULL }
262
263#define ASMC_MP_TEMPNAMES { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \
264 "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \
265 "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \
266 "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \
267 "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \
268 "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \
217 "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \
218 NULL }
269 "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", }
219
220#define ASMC_MP_TEMPDESCS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \
221 "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \
222 "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \
223 "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \
224 "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \
225 "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \
270
271#define ASMC_MP_TEMPDESCS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \
272 "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \
273 "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \
274 "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \
275 "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \
276 "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \
226 "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \
277 "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", }
278
279#define ASMC_MP5_TEMPS { "TA0P", "TCAC", "TCAD", "TCAG", "TCAH", \
280 "TCAS", "TCBC", "TCBD", "TCBG", "TCBH", \
281 "TCBS", "TH1F", "TH1P", "TH1V", "TH2F", \
282 "TH2P", "TH2V", "TH3F", "TH3P", "TH3V", \
283 "TH4F", "TH4P", "TH4V", "THPS", "THTG", \
284 "TM1P", "TM2P", "TM2V", "TM3P", "TM3V", \
285 "TM4P", "TM5P", "TM6P", "TM6V", "TM7P", \
286 "TM7V", "TM8P", "TM8V", "TM9V", "TMA1", \
287 "TMA2", "TMA3", "TMA4", "TMB1", "TMB2", \
288 "TMB3", "TMB4", "TMHS", "TMLS", "TMPS", \
289 "TMPV", "TMTG", "TN0D", "TN0H", "TNTG", \
290 "Te1F", "Te1P", "Te1S", "Te2F", "Te2S", \
291 "Te3F", "Te3S", "Te4F", "Te4S", "Te5F", \
292 "Te5S", "TeGG", "TeGP", "TeRG", "TeRP", \
293 "TeRV", "Tp0C", "Tp1C", "TpPS", "TpTG", \
227 NULL }
228
294 NULL }
295
296#define ASMC_MP5_TEMPNAMES { "ambient", "TCAC", "TCAD", "TCAG", "TCAH", \
297 "TCAS", "TCBC", "TCBD", "TCBG", "TCBH", \
298 "TCBS", "TH1F", "TH1P", "TH1V", "TH2F", \
299 "TH2P", "TH2V", "TH3F", "TH3P", "TH3V", \
300 "TH4F", "TH4P", "TH4V", "THPS", "THTG", \
301 "TM1P", "TM2P", "TM2V", "TM3P", "TM3V", \
302 "TM4P", "TM5P", "TM6P", "TM6V", "TM7P", \
303 "TM7V", "TM8P", "TM8V", "TM9V", "ram_a1", \
304 "ram_a2", "ram_a3", "ram_a4", "ram_b1", "ram_b2", \
305 "ram_b3", "ram_b4", "TMHS", "TMLS", "TMPS", \
306 "TMPV", "TMTG", "TN0D", "TN0H", "TNTG", \
307 "Te1F", "Te1P", "Te1S", "Te2F", "Te2S", \
308 "Te3F", "Te3S", "Te4F", "Te4S", "Te5F", \
309 "Te5S", "TeGG", "TeGP", "TeRG", "TeRP", \
310 "TeRV", "Tp0C", "Tp1C", "TpPS", "TpTG", }
311
312#define ASMC_MP5_TEMPDESCS { "TA0P", "TCAC", "TCAD", "TCAG", "TCAH", \
313 "TCAS", "TCBC", "TCBD", "TCBG", "TCBH", \
314 "TCBS", "TH1F", "TH1P", "TH1V", "TH2F", \
315 "TH2P", "TH2V", "TH3F", "TH3P", "TH3V", \
316 "TH4F", "TH4P", "TH4V", "THPS", "THTG", \
317 "TM1P", "TM2P", "TM2V", "TM3P", "TM3V", \
318 "TM4P", "TM5P", "TM6P", "TM6V", "TM7P", \
319 "TM7V", "TM8P", "TM8V", "TM9V", "TMA1", \
320 "TMA2", "TMA3", "TMA4", "TMB1", "TMB2", \
321 "TMB3", "TMB4", "TMHS", "TMLS", "TMPS", \
322 "TMPV", "TMTG", "TN0D", "TN0H", "TNTG", \
323 "Te1F", "Te1P", "Te1S", "Te2F", "Te2S", \
324 "Te3F", "Te3S", "Te4F", "Te4S", "Te5F", \
325 "Te5S", "TeGG", "TeGP", "TeRG", "TeRP", \
326 "TeRV", "Tp0C", "Tp1C", "TpPS", "TpTG", }
327
229#define ASMC_MBA_TEMPS { "TB0T", NULL }
230#define ASMC_MBA_TEMPNAMES { "enclosure" }
231#define ASMC_MBA_TEMPDESCS { "Enclosure Bottom" }
328#define ASMC_MBA_TEMPS { "TB0T", NULL }
329#define ASMC_MBA_TEMPNAMES { "enclosure" }
330#define ASMC_MBA_TEMPDESCS { "Enclosure Bottom" }
331
332#define ASMC_MBA3_TEMPS { "TB0T", "TB1T", "TB2T", \
333 "TC0D", "TC0E", "TC0P", NULL }
334
335#define ASMC_MBA3_TEMPNAMES { "enclosure", "TB1T", "TB2T", \
336 "TC0D", "TC0E", "TC0P" }
337
338#define ASMC_MBA3_TEMPDESCS { "Enclosure Bottom", "TB1T", "TB2T", \
339 "TC0D", "TC0E", "TC0P" }