Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb38500_unique_dsme_msg_identifiers' into 'master'
Make dsme message type identifiers unique

See merge request mer-core/libiphb!1
  • Loading branch information
spiiroin committed Apr 4, 2018
2 parents 5db3ab7 + 6649493 commit 5522136
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion rpm/libiphb.spec
Expand Up @@ -11,7 +11,7 @@ Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(dsme)
BuildRequires: pkgconfig(dsme) >= 0.65.0
BuildRequires: pkgconfig(mce) >= 1.12.3

%description
Expand Down
12 changes: 12 additions & 0 deletions src/iphb_internal.h
Expand Up @@ -99,6 +99,18 @@ struct _iphb_req_t {


enum {
/* NOTE: dsme message types are defined in:
* - libdsme
* - libiphb
* - dsme
*
* When adding new message types
* 1) uniqueness of the identifiers must be
* ensured accross all these source trees
* 2) the dsmemsg_id_name() function in libdsme
* must be made aware of the new message type
*/

DSME_MSG_ENUM(DSM_MSGTYPE_WAIT, 0x00000600),
DSME_MSG_ENUM(DSM_MSGTYPE_WAKEUP, 0x00000601),
};
Expand Down

0 comments on commit 5522136

Please sign in to comment.