Changeset eb13ef8 in mainline for uspace/lib/c/generic/io/con_srv.c
- Timestamp:
- 2019-02-06T13:25:12Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- fafb8e5
- Parents:
- bb97118
- git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-02 14:04:02)
- git-committer:
- Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-06 13:25:12)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/io/con_srv.c
rbb97118 reb13ef8 44 44 static errno_t console_ev_encode(cons_event_t *event, ipc_call_t *icall) 45 45 { 46 IPC_SET_ARG1( *icall, event->type);46 IPC_SET_ARG1(icall, event->type); 47 47 48 48 switch (event->type) { 49 49 case CEV_KEY: 50 IPC_SET_ARG2( *icall, event->ev.key.type);51 IPC_SET_ARG3( *icall, event->ev.key.key);52 IPC_SET_ARG4( *icall, event->ev.key.mods);53 IPC_SET_ARG5( *icall, event->ev.key.c);50 IPC_SET_ARG2(icall, event->ev.key.type); 51 IPC_SET_ARG3(icall, event->ev.key.key); 52 IPC_SET_ARG4(icall, event->ev.key.mods); 53 IPC_SET_ARG5(icall, event->ev.key.c); 54 54 break; 55 55 case CEV_POS: 56 IPC_SET_ARG2( *icall, (event->ev.pos.pos_id << 16) | (event->ev.pos.type & 0xffff));57 IPC_SET_ARG3( *icall, event->ev.pos.btn_num);58 IPC_SET_ARG4( *icall, event->ev.pos.hpos);59 IPC_SET_ARG5( *icall, event->ev.pos.vpos);56 IPC_SET_ARG2(icall, (event->ev.pos.pos_id << 16) | (event->ev.pos.type & 0xffff)); 57 IPC_SET_ARG3(icall, event->ev.pos.btn_num); 58 IPC_SET_ARG4(icall, event->ev.pos.hpos); 59 IPC_SET_ARG5(icall, event->ev.pos.vpos); 60 60 break; 61 61 default: … … 158 158 sysarg_t row; 159 159 160 col = IPC_GET_ARG1( *icall);161 row = IPC_GET_ARG2( *icall);160 col = IPC_GET_ARG1(icall); 161 row = IPC_GET_ARG2(icall); 162 162 163 163 if (srv->srvs->ops->set_pos == NULL) { … … 218 218 console_style_t style; 219 219 220 style = IPC_GET_ARG1( *icall);220 style = IPC_GET_ARG1(icall); 221 221 222 222 if (srv->srvs->ops->set_style == NULL) { … … 235 235 console_color_attr_t flags; 236 236 237 bgcolor = IPC_GET_ARG1( *icall);238 fgcolor = IPC_GET_ARG2( *icall);239 flags = IPC_GET_ARG3( *icall);237 bgcolor = IPC_GET_ARG1(icall); 238 fgcolor = IPC_GET_ARG2(icall); 239 flags = IPC_GET_ARG3(icall); 240 240 241 241 if (srv->srvs->ops->set_color == NULL) { … … 253 253 pixel_t fgcolor; 254 254 255 bgcolor = IPC_GET_ARG1( *icall);256 fgcolor = IPC_GET_ARG2( *icall);255 bgcolor = IPC_GET_ARG1(icall); 256 fgcolor = IPC_GET_ARG2(icall); 257 257 258 258 if (srv->srvs->ops->set_rgb_color == NULL) { … … 269 269 bool show; 270 270 271 show = IPC_GET_ARG1( *icall);271 show = IPC_GET_ARG1(icall); 272 272 273 273 if (srv->srvs->ops->set_cursor_visibility == NULL) { … … 303 303 } 304 304 305 async_answer_5(icall, rc, IPC_GET_ARG1( result), IPC_GET_ARG2(result),306 IPC_GET_ARG3( result), IPC_GET_ARG4(result), IPC_GET_ARG5(result));305 async_answer_5(icall, rc, IPC_GET_ARG1(&result), IPC_GET_ARG2(&result), 306 IPC_GET_ARG3(&result), IPC_GET_ARG4(&result), IPC_GET_ARG5(&result)); 307 307 } 308 308 … … 364 364 break; 365 365 366 sysarg_t method = IPC_GET_IMETHOD( call);366 sysarg_t method = IPC_GET_IMETHOD(&call); 367 367 368 368 if (!method) {
Note:
See TracChangeset
for help on using the changeset viewer.