1 files changed, 14 insertions, 17 deletions

diff --git a/include/host_command.h b/include/host_command.h
index 78157231ca..6fdbc639e9 100644
--- a/include/host_command.h
+++ b/include/host_command.h
@@ -122,6 +122,16 @@ struct host_command {
 	int version_mask;
 };
 
+#ifdef CONFIG_HOST_EVENT64
+typedef uint64_t host_event_t;
+#define HOST_EVENT_CPRINTS(str, e)	CPRINTS("%s 0x%016lx", str, e)
+#define HOST_EVENT_CCPRINTF(str, e)	ccprintf("%s 0x%016lx\n", str, e)
+#else
+typedef uint32_t host_event_t;
+#define HOST_EVENT_CPRINTS(str, e)	CPRINTS("%s 0x%08x", str, e)
+#define HOST_EVENT_CCPRINTF(str, e)	ccprintf("%s 0x%08x\n", str, e)
+#endif
+
 /**
  * Return a pointer to the memory-mapped buffer.
  *
@@ -146,21 +156,11 @@ uint16_t host_command_process(struct host_cmd_handler_args *args);
 
 #ifdef CONFIG_HOSTCMD_EVENTS
 /**
- * Set one or more host event bits.
- *
- * @param mask          Event bits to set (use EC_HOST_EVENT_MASK()).
- */
-void host_set_events(uint32_t mask);
-
-/**
  * Set a single host event.
  *
  * @param event         Event to set (EC_HOST_EVENT_*).
  */
-static inline void host_set_single_event(int event)
-{
-	host_set_events(EC_HOST_EVENT_MASK(event));
-}
+void host_set_single_event(enum host_event_code event);
 
 /**
  * Clear one or more host event bits.
@@ -168,12 +168,12 @@ static inline void host_set_single_event(int event)
  * @param mask          Event bits to clear (use EC_HOST_EVENT_MASK()).
  *                      Write 1 to a bit to clear it.
  */
-void host_clear_events(uint32_t mask);
+void host_clear_events(host_event_t mask);
 
 /**
  * Return the raw event state.
  */
-uint32_t host_get_events(void);
+host_event_t host_get_events(void);
 
 /**
  * Check a single host event.
@@ -181,10 +181,7 @@ uint32_t host_get_events(void);
  * @param event		Event to check
  * @return true if <event> is set or false otherwise
  */
-static inline int host_is_event_set(enum host_event_code event)
-{
-	return host_get_events() & EC_HOST_EVENT_MASK(event);
-}
+int host_is_event_set(enum host_event_code event);
 #endif
 
 /**