aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/thinkpad_acpi.h
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2007-04-21 10:08:28 -0400
committerLen Brown <len.brown@intel.com>2007-04-21 23:30:33 -0400
commitefa27145df34eacf2569bd45f68dbe00003d3616 (patch)
treea50ac1ccf1036096d7b66523a03beb48405bb308 /drivers/misc/thinkpad_acpi.h
parent1def7115f0277ce9d2a54efd0ae187aa88d5c7fa (diff)
ACPI: thinkpad-acpi: rename thinkpad constants
Rename all IBMACPI_ constants, now that we are not called ibm-acpi anymore. Driver-specific constants are now prefixed TPACPI_, ThinkPad firmware specific ones are now prefixed TP_CMOS_, TP_ACPI_, or TP_EC_. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc/thinkpad_acpi.h')
-rw-r--r--drivers/misc/thinkpad_acpi.h64
1 files changed, 31 insertions, 33 deletions
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index 8b2fd1a1a8a1..02a297e0525f 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -256,29 +256,27 @@ enum { /* Fan control constants */
256 fan_rpm_offset = 0x84, /* EC register 0x84: LSB, 0x85 MSB (RPM) 256 fan_rpm_offset = 0x84, /* EC register 0x84: LSB, 0x85 MSB (RPM)
257 * 0x84 must be read before 0x85 */ 257 * 0x84 must be read before 0x85 */
258 258
259 IBMACPI_FAN_EC_DISENGAGED = 0x40, /* EC mode: tachometer 259 TP_EC_FAN_FULLSPEED = 0x40, /* EC fan mode: full speed */
260 * disengaged */ 260 TP_EC_FAN_AUTO = 0x80, /* EC fan mode: auto fan control */
261 IBMACPI_FAN_EC_AUTO = 0x80, /* EC mode: auto fan
262 * control */
263}; 261};
264 262
265enum fan_status_access_mode { 263enum fan_status_access_mode {
266 IBMACPI_FAN_NONE = 0, /* No fan status or control */ 264 TPACPI_FAN_NONE = 0, /* No fan status or control */
267 IBMACPI_FAN_RD_ACPI_GFAN, /* Use ACPI GFAN */ 265 TPACPI_FAN_RD_ACPI_GFAN, /* Use ACPI GFAN */
268 IBMACPI_FAN_RD_TPEC, /* Use ACPI EC regs 0x2f, 0x84-0x85 */ 266 TPACPI_FAN_RD_TPEC, /* Use ACPI EC regs 0x2f, 0x84-0x85 */
269}; 267};
270 268
271enum fan_control_access_mode { 269enum fan_control_access_mode {
272 IBMACPI_FAN_WR_NONE = 0, /* No fan control */ 270 TPACPI_FAN_WR_NONE = 0, /* No fan control */
273 IBMACPI_FAN_WR_ACPI_SFAN, /* Use ACPI SFAN */ 271 TPACPI_FAN_WR_ACPI_SFAN, /* Use ACPI SFAN */
274 IBMACPI_FAN_WR_TPEC, /* Use ACPI EC reg 0x2f */ 272 TPACPI_FAN_WR_TPEC, /* Use ACPI EC reg 0x2f */
275 IBMACPI_FAN_WR_ACPI_FANS, /* Use ACPI FANS and EC reg 0x2f */ 273 TPACPI_FAN_WR_ACPI_FANS, /* Use ACPI FANS and EC reg 0x2f */
276}; 274};
277 275
278enum fan_control_commands { 276enum fan_control_commands {
279 IBMACPI_FAN_CMD_SPEED = 0x0001, /* speed command */ 277 TPACPI_FAN_CMD_SPEED = 0x0001, /* speed command */
280 IBMACPI_FAN_CMD_LEVEL = 0x0002, /* level command */ 278 TPACPI_FAN_CMD_LEVEL = 0x0002, /* level command */
281 IBMACPI_FAN_CMD_ENABLE = 0x0004, /* enable/disable cmd, 279 TPACPI_FAN_CMD_ENABLE = 0x0004, /* enable/disable cmd,
282 * and also watchdog cmd */ 280 * and also watchdog cmd */
283}; 281};
284 282
@@ -333,16 +331,16 @@ static int hotkey_write(char *buf);
333 */ 331 */
334 332
335enum led_access_mode { 333enum led_access_mode {
336 IBMACPI_LED_NONE = 0, 334 TPACPI_LED_NONE = 0,
337 IBMACPI_LED_570, /* 570 */ 335 TPACPI_LED_570, /* 570 */
338 IBMACPI_LED_OLD, /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20-21 */ 336 TPACPI_LED_OLD, /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20-21 */
339 IBMACPI_LED_NEW, /* all others */ 337 TPACPI_LED_NEW, /* all others */
340}; 338};
341 339
342enum { /* For IBMACPI_LED_OLD */ 340enum { /* For TPACPI_LED_OLD */
343 IBMACPI_LED_EC_HLCL = 0x0c, /* EC reg to get led to power on */ 341 TPACPI_LED_EC_HLCL = 0x0c, /* EC reg to get led to power on */
344 IBMACPI_LED_EC_HLBL = 0x0d, /* EC reg to blink a lit led */ 342 TPACPI_LED_EC_HLBL = 0x0d, /* EC reg to blink a lit led */
345 IBMACPI_LED_EC_HLMS = 0x0e, /* EC reg to select led to command */ 343 TPACPI_LED_EC_HLMS = 0x0e, /* EC reg to select led to command */
346}; 344};
347 345
348static enum led_access_mode led_supported; 346static enum led_access_mode led_supported;
@@ -370,16 +368,16 @@ static int light_write(char *buf);
370 */ 368 */
371 369
372enum thermal_access_mode { 370enum thermal_access_mode {
373 IBMACPI_THERMAL_NONE = 0, /* No thermal support */ 371 TPACPI_THERMAL_NONE = 0, /* No thermal support */
374 IBMACPI_THERMAL_ACPI_TMP07, /* Use ACPI TMP0-7 */ 372 TPACPI_THERMAL_ACPI_TMP07, /* Use ACPI TMP0-7 */
375 IBMACPI_THERMAL_ACPI_UPDT, /* Use ACPI TMP0-7 with UPDT */ 373 TPACPI_THERMAL_ACPI_UPDT, /* Use ACPI TMP0-7 with UPDT */
376 IBMACPI_THERMAL_TPEC_8, /* Use ACPI EC regs, 8 sensors */ 374 TPACPI_THERMAL_TPEC_8, /* Use ACPI EC regs, 8 sensors */
377 IBMACPI_THERMAL_TPEC_16, /* Use ACPI EC regs, 16 sensors */ 375 TPACPI_THERMAL_TPEC_16, /* Use ACPI EC regs, 16 sensors */
378}; 376};
379 377
380#define IBMACPI_MAX_THERMAL_SENSORS 16 /* Max thermal sensors supported */ 378#define TPACPI_MAX_THERMAL_SENSORS 16 /* Max thermal sensors supported */
381struct ibm_thermal_sensors_struct { 379struct ibm_thermal_sensors_struct {
382 s32 temp[IBMACPI_MAX_THERMAL_SENSORS]; 380 s32 temp[TPACPI_MAX_THERMAL_SENSORS];
383}; 381};
384 382
385static int thermal_init(void); 383static int thermal_init(void);
@@ -392,10 +390,10 @@ static int thermal_read(char *p);
392 */ 390 */
393 391
394enum video_access_mode { 392enum video_access_mode {
395 IBMACPI_VIDEO_NONE = 0, 393 TPACPI_VIDEO_NONE = 0,
396 IBMACPI_VIDEO_570, /* 570 */ 394 TPACPI_VIDEO_570, /* 570 */
397 IBMACPI_VIDEO_770, /* 600e/x, 770e, 770x */ 395 TPACPI_VIDEO_770, /* 600e/x, 770e, 770x */
398 IBMACPI_VIDEO_NEW, /* all others */ 396 TPACPI_VIDEO_NEW, /* all others */
399}; 397};
400 398
401static enum video_access_mode video_supported; 399static enum video_access_mode video_supported;