diff options
Diffstat (limited to 'src/mpd-i2c-ctrl.c')
| -rw-r--r-- | src/mpd-i2c-ctrl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mpd-i2c-ctrl.c b/src/mpd-i2c-ctrl.c index cc7468a..139bcf4 100644 --- a/src/mpd-i2c-ctrl.c +++ b/src/mpd-i2c-ctrl.c @@ -49,7 +49,7 @@ int mcp23017_getintf(int fd); int mcp23017_waitzero(int fd); int mpd_send_cmd(int sd, const char *cmd); int mpd_playlist(int sd, const char *playlist); -int decode_key(int keycode); +int decode_key(uint16_t keycode); int handle_keypress(uint8_t key); int handle_inotify_event(int fd); @@ -172,9 +172,9 @@ int mpd_playlist(int sd, const char *playlist) return 0; } -int decode_key(int keycode) +int decode_key(uint16_t keycode) { - return (sizeof(int)*8)-__builtin_clz(keycode)-1; + return (sizeof(uint16_t)*8)-__builtin_clz(keycode)-1; } int handle_keypress(uint8_t key) @@ -249,7 +249,7 @@ static int parse_config(const char *file) xmlFree(key); continue; } - int val=strtol((char *)key, &err, 16); + long int val=strtol((char *)key, &err, 16); if ((!*err) && (val >= 0) && (val < 256)) { action = xmlGetProp(cur, (const xmlChar *)"action"); buttonlist_set(val, (char *)action); @@ -301,7 +301,7 @@ int main(int argc, char **argv) mcp23017_init(fd, MCP23017_ADDR); int key=mcp23017_getintf(fd); if (key > 0) { - int code=decode_key(key); + uint8_t code=decode_key(key); // printf("got key %02x => decoded = %04x\n", key, code); handle_keypress(code); mcp23017_waitzero(fd); /* wait until keys released, clr irq */ |