Changeset f220e25 in mainline
- Timestamp:
- 2012-10-31T21:19:42Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a582dff
- Parents:
- 82d062d8 (diff), 508fff8 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/time/cmos-rtc/cmos-rtc.c
r82d062d8 rf220e25 100 100 static time_t uptime_get(void); 101 101 static bool is_battery_ok(rtc_t *rtc); 102 static int rtc_fun_online(ddf_fun_t *fun); 103 static int rtc_fun_offline(ddf_fun_t *fun); 102 104 103 105 static ddf_dev_ops_t rtc_dev_ops; … … 107 109 .dev_add = rtc_dev_add, 108 110 .dev_remove = rtc_dev_remove, 111 .fun_online = rtc_fun_online, 112 .fun_offline = rtc_fun_offline, 109 113 }; 110 114 … … 406 410 /* Try to normalize the content of the tm structure */ 407 411 time_t r = mktime(t); 408 409 rtc->boottime = r - uptime_get(); 412 int result; 413 414 if (r < 0) 415 result = EINVAL; 416 else { 417 rtc->boottime = r - uptime_get(); 418 result = EOK; 419 } 410 420 411 421 fibril_mutex_unlock(&rtc->mutex); 412 422 413 return r < 0 ? EINVAL : EOK;423 return result; 414 424 } 415 425 … … 638 648 fibril_mutex_unlock(&rtc->mutex); 639 649 650 rc = rtc_fun_offline(rtc->fun); 651 if (rc != EOK) { 652 ddf_msg(LVL_ERROR, "Failed to offline function"); 653 return rc; 654 } 655 640 656 rc = ddf_fun_unbind(rtc->fun); 641 657 if (rc != EOK) { … … 726 742 } 727 743 744 static int 745 rtc_fun_online(ddf_fun_t *fun) 746 { 747 ddf_msg(LVL_DEBUG, "rtc_fun_online()"); 748 return ddf_fun_online(fun); 749 } 750 751 static int 752 rtc_fun_offline(ddf_fun_t *fun) 753 { 754 ddf_msg(LVL_DEBUG, "rtc_fun_offline()"); 755 return ddf_fun_offline(fun); 756 } 757 728 758 int 729 759 main(int argc, char **argv)
Note:
See TracChangeset
for help on using the changeset viewer.