diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2012-08-16 20:39:42 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-16 20:51:02 +0400 |
| commit | 248ffdf7c95726a8dae76e25fdb037899c5b77fa (patch) | |
| tree | 339cbe37183da713ae6d761d1f7b0e4588aef4ba /drivers/misc/mei/mei_dev.h | |
| parent | c8df72920c9cd8e43899a5660ee54a46ac2588a6 (diff) | |
| download | linux-248ffdf7c95726a8dae76e25fdb037899c5b77fa.tar.xz | |
mei: wd: rename watchdog constants to be more descriptive
1. rename defines to more be descriptive
2. remove duplicated defines from interface.h
3. add common prefix MEI_
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/mei_dev.h')
| -rw-r--r-- | drivers/misc/mei/mei_dev.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index 35d0538a5974..64a4f17893e5 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h @@ -25,9 +25,14 @@ /* * watch dog definition */ -#define MEI_WATCHDOG_DATA_SIZE 16 -#define MEI_START_WD_DATA_SIZE 20 -#define MEI_WD_PARAMS_SIZE 4 +#define MEI_WD_HDR_SIZE 4 +#define MEI_WD_STOP_MSG_SIZE MEI_WD_HDR_SIZE +#define MEI_WD_START_MSG_SIZE (MEI_WD_HDR_SIZE + 16) + +#define MEI_WD_DEFAULT_TIMEOUT 120 /* seconds */ +#define MEI_WD_MIN_TIMEOUT 120 /* seconds */ +#define MEI_WD_MAX_TIMEOUT 65535 /* seconds */ + #define MEI_WD_STATE_INDEPENDENCE_MSG_SENT (1 << 0) #define MEI_RD_MSG_BUF_SIZE (128 * sizeof(u32)) @@ -248,7 +253,7 @@ struct mei_device { bool wd_stopped; bool wd_bypass; /* if false, don't refresh watchdog ME client */ u16 wd_timeout; /* seconds ((wd_data[1] << 8) + wd_data[0]) */ - unsigned char wd_data[MEI_START_WD_DATA_SIZE]; + unsigned char wd_data[MEI_WD_START_MSG_SIZE]; struct file *iamthif_file_object; |