summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/host/host_exe.lds6
-rw-r--r--include/host_command.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/core/host/host_exe.lds b/core/host/host_exe.lds
index 46a5097d67..40d1001661 100644
--- a/core/host/host_exe.lds
+++ b/core/host/host_exe.lds
@@ -9,17 +9,17 @@ SECTIONS {
*(.rodata.irqprio)
__irqprio_end = .;
- . = ALIGN(4);
+ . = ALIGN(8);
__cmds = .;
*(SORT(.rodata.cmds*))
__cmds_end = .;
- . = ALIGN(4);
+ . = ALIGN(8);
__hcmds = .;
*(.rodata.hcmds)
__hcmds_end = .;
- . = ALIGN(4);
+ . = ALIGN(8);
__hooks_init = .;
*(.rodata.HOOK_INIT)
__hooks_init_end = .;
diff --git a/include/host_command.h b/include/host_command.h
index 3afca62908..b7d70896ce 100644
--- a/include/host_command.h
+++ b/include/host_command.h
@@ -54,13 +54,13 @@ struct host_cmd_handler_args {
/* Host command */
struct host_command {
- /* Command code */
- int command;
/*
* Handler for the command. Args points to context for handler.
* Returns result status (EC_RES_*).
*/
int (*handler)(struct host_cmd_handler_args *args);
+ /* Command code */
+ int command;
/* Mask of supported versions */
int version_mask;
};
@@ -133,6 +133,6 @@ void host_command_received(struct host_cmd_handler_args *args);
#define DECLARE_HOST_COMMAND(command, routine, version_mask) \
const struct host_command __host_cmd_##command \
__attribute__((section(".rodata.hcmds"))) \
- = {command, routine, version_mask}
+ = {routine, command, version_mask}
#endif /* __CROS_EC_HOST_COMMAND_H */