Changeset 231b3fd in mainline for uspace/lib/c/generic/io/console.c
- Timestamp:
- 2018-08-25T21:35:26Z (7 years ago)
- Parents:
- e2625b1a (diff), 3c45353 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - git-author:
- Jakub Jermář <jakub@…> (2018-08-25 21:35:26)
- git-committer:
- GitHub <noreply@…> (2018-08-25 21:35:26)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/io/console.c
re2625b1a r231b3fd 223 223 224 224 bool console_get_event_timeout(console_ctrl_t *ctrl, cons_event_t *event, 225 suseconds_t *timeout)226 { 227 struct time valt0;228 get timeofday(&t0, NULL);225 usec_t *timeout) 226 { 227 struct timespec t0; 228 getuptime(&t0); 229 229 230 230 if (ctrl->input_aid == 0) { … … 257 257 258 258 /* Update timeout */ 259 struct time valt1;260 get timeofday(&t1, NULL);261 *timeout -= tv_sub_diff(&t1, &t0);259 struct timespec t1; 260 getuptime(&t1); 261 *timeout -= NSEC2USEC(ts_sub_diff(&t1, &t0)); 262 262 263 263 return true;
Note:
See TracChangeset
for help on using the changeset viewer.