Changeset 215e375 in mainline for uspace/lib/libc
- Timestamp:
- 2007-12-31T17:23:20Z (18 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- f57f8ea
- Parents:
- 27d293a
- Location:
- uspace/lib/libc
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/libc/generic/ipc.c
r27d293a r215e375 678 678 * @return Zero on success or a negative error code from errno.h. 679 679 */ 680 int ipc_share_in_s end(int phoneid, void *dst, size_t size, ipcarg_t arg,680 int ipc_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg, 681 681 int *flags) 682 682 { … … 728 728 * @return Zero on success or a value from @ref errno.h on failure. 729 729 */ 730 int ipc_share_in_ deliver(ipc_callid_t callid, void *src, int flags)730 int ipc_share_in_finalize(ipc_callid_t callid, void *src, int flags) 731 731 { 732 732 return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) flags); … … 741 741 * @return Zero on success or a negative error code from errno.h. 742 742 */ 743 int ipc_share_out_s end(int phoneid, void *src, int flags)743 int ipc_share_out_start(int phoneid, void *src, int flags) 744 744 { 745 745 return ipc_call_sync_3_0(phoneid, IPC_M_SHARE_OUT, (ipcarg_t) src, 0, … … 788 788 * @return Zero on success or a value from @ref errno.h on failure. 789 789 */ 790 int ipc_share_out_ deliver(ipc_callid_t callid, void *dst)790 int ipc_share_out_finalize(ipc_callid_t callid, void *dst) 791 791 { 792 792 return ipc_answer_1(callid, EOK, (ipcarg_t) dst); … … 802 802 * @return Zero on success or a negative error code from errno.h. 803 803 */ 804 int ipc_data_read_s end(int phoneid, void *dst, size_t size)804 int ipc_data_read_start(int phoneid, void *dst, size_t size) 805 805 { 806 806 return ipc_call_sync_2_0(phoneid, IPC_M_DATA_READ, (ipcarg_t) dst, … … 848 848 * @return Zero on success or a value from @ref errno.h on failure. 849 849 */ 850 int ipc_data_read_ deliver(ipc_callid_t callid, void *src, size_t size)850 int ipc_data_read_finalize(ipc_callid_t callid, void *src, size_t size) 851 851 { 852 852 return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) size); … … 861 861 * @return Zero on success or a negative error code from errno.h. 862 862 */ 863 int ipc_data_write_s end(int phoneid, void *src, size_t size)863 int ipc_data_write_start(int phoneid, void *src, size_t size) 864 864 { 865 865 return ipc_call_sync_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src, … … 906 906 * @return Zero on success or a value from @ref errno.h on failure. 907 907 */ 908 int ipc_data_write_ deliver(ipc_callid_t callid, void *dst, size_t size)908 int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size) 909 909 { 910 910 return ipc_answer_2(callid, EOK, (ipcarg_t) dst, (ipcarg_t) size); -
uspace/lib/libc/generic/time.c
r27d293a r215e375 142 142 mapping = as_get_mappable_page(PAGE_SIZE); 143 143 /* Get the mapping of kernel clock */ 144 res = ipc_share_in_s end_1_1(PHONE_NS, mapping, PAGE_SIZE,144 res = ipc_share_in_start_1_1(PHONE_NS, mapping, PAGE_SIZE, 145 145 SERVICE_MEM_REALTIME, &rights); 146 146 if (res) { -
uspace/lib/libc/generic/vfs.c
r27d293a r215e375 74 74 } 75 75 req = async_send_1(vfs_phone, VFS_MOUNT, dev_handle, NULL); 76 rc = ipc_data_write_s end(vfs_phone, (void *)fs_name, strlen(fs_name));76 rc = ipc_data_write_start(vfs_phone, (void *)fs_name, strlen(fs_name)); 77 77 if (rc != EOK) { 78 78 async_wait_for(req, NULL); … … 81 81 return (int) rc; 82 82 } 83 rc = ipc_data_write_s end(vfs_phone, (void *)mp, strlen(mp));83 rc = ipc_data_write_start(vfs_phone, (void *)mp, strlen(mp)); 84 84 if (rc != EOK) { 85 85 async_wait_for(req, NULL); … … 113 113 } 114 114 req = async_send_2(vfs_phone, VFS_OPEN, oflag, 0, &answer); 115 rc = ipc_data_write_s end(vfs_phone, name, strlen(name));115 rc = ipc_data_write_start(vfs_phone, name, strlen(name)); 116 116 if (rc != EOK) { 117 117 async_wait_for(req, NULL); … … 144 144 } 145 145 req = async_send_1(vfs_phone, VFS_READ, fildes, &answer); 146 if (ipc_data_read_s end(vfs_phone, (void *)buf, nbyte) != EOK) {146 if (ipc_data_read_start(vfs_phone, (void *)buf, nbyte) != EOK) { 147 147 async_wait_for(req, NULL); 148 148 async_serialize_end(); … … 174 174 } 175 175 req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer); 176 if (ipc_data_write_s end(vfs_phone, (void *)buf, nbyte) != EOK) {176 if (ipc_data_write_start(vfs_phone, (void *)buf, nbyte) != EOK) { 177 177 async_wait_for(req, NULL); 178 178 async_serialize_end(); -
uspace/lib/libc/include/ipc/ipc.h
r27d293a r215e375 264 264 265 265 /* 266 * User-friendly wrappers for ipc_share_in_s end().267 */ 268 #define ipc_share_in_s end_0_0(phoneid, dst, size) \269 ipc_share_in_s end((phoneid), (dst), (size), 0, NULL)270 #define ipc_share_in_s end_0_1(phoneid, dst, size, flags) \271 ipc_share_in_s end((phoneid), (dst), (size), 0, (flags))272 #define ipc_share_in_s end_1_0(phoneid, dst, size, arg) \273 ipc_share_in_s end((phoneid), (dst), (size), (arg), NULL)274 #define ipc_share_in_s end_1_1(phoneid, dst, size, arg, flags) \275 ipc_share_in_s end((phoneid), (dst), (size), (arg), (flags))276 277 extern int ipc_share_in_s end(int phoneid, void *dst, size_t size, ipcarg_t arg,266 * User-friendly wrappers for ipc_share_in_start(). 267 */ 268 #define ipc_share_in_start_0_0(phoneid, dst, size) \ 269 ipc_share_in_start((phoneid), (dst), (size), 0, NULL) 270 #define ipc_share_in_start_0_1(phoneid, dst, size, flags) \ 271 ipc_share_in_start((phoneid), (dst), (size), 0, (flags)) 272 #define ipc_share_in_start_1_0(phoneid, dst, size, arg) \ 273 ipc_share_in_start((phoneid), (dst), (size), (arg), NULL) 274 #define ipc_share_in_start_1_1(phoneid, dst, size, arg, flags) \ 275 ipc_share_in_start((phoneid), (dst), (size), (arg), (flags)) 276 277 extern int ipc_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg, 278 278 int *flags); 279 279 extern int ipc_share_in_receive(ipc_callid_t *callid, size_t *size); 280 extern int ipc_share_in_ deliver(ipc_callid_t callid, void *src, int flags);281 extern int ipc_share_out_s end(int phoneid, void *src, int flags);280 extern int ipc_share_in_finalize(ipc_callid_t callid, void *src, int flags); 281 extern int ipc_share_out_start(int phoneid, void *src, int flags); 282 282 extern int ipc_share_out_receive(ipc_callid_t *callid, size_t *size, int *flags); 283 extern int ipc_share_out_ deliver(ipc_callid_t callid, void *dst);284 extern int ipc_data_read_s end(int phoneid, void *dst, size_t size);283 extern int ipc_share_out_finalize(ipc_callid_t callid, void *dst); 284 extern int ipc_data_read_start(int phoneid, void *dst, size_t size); 285 285 extern int ipc_data_read_receive(ipc_callid_t *callid, size_t *size); 286 extern int ipc_data_read_ deliver(ipc_callid_t callid, void *src, size_t size);287 extern int ipc_data_write_s end(int phoneid, void *src, size_t size);286 extern int ipc_data_read_finalize(ipc_callid_t callid, void *src, size_t size); 287 extern int ipc_data_write_start(int phoneid, void *src, size_t size); 288 288 extern int ipc_data_write_receive(ipc_callid_t *callid, size_t *size); 289 extern int ipc_data_write_ deliver(ipc_callid_t callid, void *dst, size_t size);289 extern int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size); 290 290 291 291 #endif
Note:
See TracChangeset
for help on using the changeset viewer.