Changeset 2d1f7a21 in mainline
- Timestamp:
- 2012-04-21T14:23:11Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- cb7056a
- Parents:
- d37d500e (diff), d3a8e47 (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. - Files:
-
- 21 edited
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.common
rd37d500e r2d1f7a21 101 101 $(USPACE_PATH)/srv/bd/part/guid_part/g_part \ 102 102 $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \ 103 $(USPACE_PATH)/srv/clip /clip\103 $(USPACE_PATH)/srv/clipboard/clipboard \ 104 104 $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \ 105 105 $(USPACE_PATH)/srv/fs/fat/fat \ -
uspace/Makefile
rd37d500e r2d1f7a21 72 72 app/sysinfo \ 73 73 app/mkbd \ 74 srv/clip \74 srv/clipboard \ 75 75 srv/loc \ 76 76 srv/devman \ -
uspace/app/init/init.c
rd37d500e r2d1f7a21 315 315 console("hid/input", "hid/fb0"); 316 316 317 spawn("/srv/clip ");317 spawn("/srv/clipboard"); 318 318 spawn("/srv/remcons"); 319 319 -
uspace/drv/bus/usb/vhc/conndev.c
rd37d500e r2d1f7a21 69 69 70 70 if (data_request == 0) { 71 async_ wait_for(opening_request, NULL);71 async_forget(opening_request); 72 72 return; 73 73 } -
uspace/lib/c/generic/device/nic.c
rd37d500e r2d1f7a21 65 65 66 66 if (retval != EOK) { 67 async_ wait_for(req, NULL);67 async_forget(req); 68 68 return retval; 69 69 } … … 94 94 rc = async_connect_to_me(exch, 0, 0, 0, cfun, carg); 95 95 if (rc != EOK) { 96 async_ wait_for(req, NULL);96 async_forget(req); 97 97 return rc; 98 98 } -
uspace/lib/c/generic/devman.c
rd37d500e r2d1f7a21 188 188 189 189 if (retval != EOK) { 190 async_ wait_for(req, NULL);190 async_forget(req); 191 191 return retval; 192 192 } … … 226 226 if (retval != EOK) { 227 227 devman_exchange_end(exch); 228 async_ wait_for(req, NULL);228 async_forget(req); 229 229 return retval; 230 230 } … … 242 242 if (retval != EOK) { 243 243 devman_exchange_end(exch); 244 async_ wait_for(req2, NULL);245 async_ wait_for(req, NULL);244 async_forget(req2); 245 async_forget(req); 246 246 return retval; 247 247 } … … 250 250 if (retval != EOK) { 251 251 devman_exchange_end(exch); 252 async_ wait_for(req, NULL);252 async_forget(req); 253 253 return retval; 254 254 } … … 283 283 284 284 if (retval != EOK) { 285 async_ wait_for(req, NULL);285 async_forget(req); 286 286 return retval; 287 287 } … … 386 386 387 387 if (retval != EOK) { 388 async_ wait_for(req, NULL);388 async_forget(req); 389 389 return retval; 390 390 } … … 423 423 424 424 if (dretval != EOK) { 425 async_ wait_for(req, NULL);425 async_forget(req); 426 426 return dretval; 427 427 } … … 488 488 489 489 if (rc != EOK) { 490 async_ wait_for(req, NULL);490 async_forget(req); 491 491 return rc; 492 492 } -
uspace/lib/c/generic/inet.c
rd37d500e r2d1f7a21 120 120 121 121 if (rc != EOK) { 122 async_ wait_for(req, NULL);122 async_forget(req); 123 123 return rc; 124 124 } -
uspace/lib/c/generic/inetcfg.c
rd37d500e r2d1f7a21 51 51 52 52 if (rc != EOK) { 53 async_ wait_for(req, NULL);53 async_forget(req); 54 54 return rc; 55 55 } … … 146 146 147 147 if (retval != EOK) { 148 async_ wait_for(req, NULL);148 async_forget(req); 149 149 return retval; 150 150 } … … 183 183 184 184 if (dretval != EOK) { 185 async_ wait_for(req, NULL);185 async_forget(req); 186 186 return dretval; 187 187 } … … 216 216 217 217 if (retval != EOK) { 218 async_ wait_for(req, NULL);218 async_forget(req); 219 219 return retval; 220 220 } … … 261 261 262 262 if (dretval != EOK) { 263 async_ wait_for(req, NULL);263 async_forget(req); 264 264 return dretval; 265 265 } … … 294 294 295 295 if (retval != EOK) { 296 async_ wait_for(req, NULL);296 async_forget(req); 297 297 return retval; 298 298 } … … 331 331 332 332 if (dretval != EOK) { 333 async_ wait_for(req, NULL);333 async_forget(req); 334 334 return dretval; 335 335 } … … 364 364 365 365 if (retval != EOK) { 366 async_ wait_for(req, NULL);366 async_forget(req); 367 367 return retval; 368 368 } -
uspace/lib/c/generic/inetping.c
rd37d500e r2d1f7a21 88 88 89 89 if (retval != EOK) { 90 async_ wait_for(req, NULL);90 async_forget(req); 91 91 return retval; 92 92 } -
uspace/lib/c/generic/iplink.c
rd37d500e r2d1f7a21 94 94 95 95 if (rc != EOK) { 96 async_ wait_for(req, NULL);96 async_forget(req); 97 97 return rc; 98 98 } -
uspace/lib/c/generic/iplink_srv.c
rd37d500e r2d1f7a21 178 178 179 179 if (rc != EOK) { 180 async_ wait_for(req, NULL);180 async_forget(req); 181 181 return rc; 182 182 } -
uspace/lib/c/generic/loader.c
rd37d500e r2d1f7a21 101 101 102 102 if (rc != EOK) { 103 async_ wait_for(req, NULL);103 async_forget(req); 104 104 return (int) rc; 105 105 } … … 139 139 140 140 if (rc != EOK) { 141 async_ wait_for(req, NULL);141 async_forget(req); 142 142 return (int) rc; 143 143 } … … 177 177 178 178 if (rc != EOK) { 179 async_ wait_for(req, NULL);179 async_forget(req); 180 180 return (int) rc; 181 181 } … … 236 236 237 237 if (rc != EOK) { 238 async_ wait_for(req, NULL);238 async_forget(req); 239 239 return (int) rc; 240 240 } … … 281 281 282 282 if (rc != EOK) { 283 async_ wait_for(req, NULL);283 async_forget(req); 284 284 return (int) rc; 285 285 } -
uspace/lib/c/generic/loc.c
rd37d500e r2d1f7a21 246 246 247 247 if (retval != EOK) { 248 async_ wait_for(req, NULL);248 async_forget(req); 249 249 return retval; 250 250 } … … 285 285 286 286 if (retval != EOK) { 287 async_ wait_for(req, NULL);287 async_forget(req); 288 288 return retval; 289 289 } … … 352 352 353 353 if (retval != EOK) { 354 async_ wait_for(req, NULL);354 async_forget(req); 355 355 return retval; 356 356 } … … 401 401 402 402 if (dretval != EOK) { 403 async_ wait_for(req, NULL);403 async_forget(req); 404 404 return dretval; 405 405 } … … 471 471 472 472 if (retval != EOK) { 473 async_ wait_for(req, NULL);473 async_forget(req); 474 474 return retval; 475 475 } … … 520 520 521 521 if (retval != EOK) { 522 async_ wait_for(req, NULL);522 async_forget(req); 523 523 return retval; 524 524 } … … 683 683 684 684 if (rc != EOK) { 685 async_ wait_for(req, NULL);685 async_forget(req); 686 686 free(devs); 687 687 return 0; … … 732 732 733 733 if (rc != EOK) { 734 async_ wait_for(req, NULL);734 async_forget(req); 735 735 free(devs); 736 736 return 0; … … 760 760 761 761 if (rc != EOK) { 762 async_ wait_for(req, NULL);762 async_forget(req); 763 763 return rc; 764 764 } -
uspace/lib/drv/generic/remote_usbhc.c
rd37d500e r2d1f7a21 259 259 if (data_request == 0) { 260 260 // FIXME: How to let the other side know that we want to abort? 261 async_ wait_for(opening_request, NULL);261 async_forget(opening_request); 262 262 return ENOMEM; 263 263 } … … 308 308 const int ret = async_data_write_start(exch, data, size); 309 309 if (ret != EOK) { 310 async_ wait_for(opening_request, NULL);310 async_forget(opening_request); 311 311 return ret; 312 312 } -
uspace/lib/fs/libfs.c
rd37d500e r2d1f7a21 320 320 if (rc != EOK) { 321 321 async_exchange_end(exch); 322 async_ wait_for(req, NULL);322 async_forget(req); 323 323 return rc; 324 324 } … … 341 341 if (reg.plb_ro == (void *) -1) { 342 342 async_exchange_end(exch); 343 async_ wait_for(req, NULL);343 async_forget(req); 344 344 return ENOMEM; 345 345 } … … 348 348 349 349 if (rc) { 350 async_ wait_for(req, NULL);350 async_forget(req); 351 351 return rc; 352 352 } -
uspace/lib/nic/src/nic_ev.c
rd37d500e r2d1f7a21 54 54 55 55 if (retval != EOK) { 56 async_ wait_for(req, NULL);56 async_forget(req); 57 57 return retval; 58 58 } … … 86 86 87 87 if (retval != EOK) { 88 async_ wait_for(req, NULL);88 async_forget(req); 89 89 return retval; 90 90 } -
uspace/lib/usbhid/src/hidiface.c
rd37d500e r2d1f7a21 120 120 121 121 if (data_request == 0) { 122 async_ wait_for(opening_request, NULL);122 async_forget(opening_request); 123 123 free(buffer); 124 124 return ENOMEM; … … 206 206 207 207 if (data_request == 0) { 208 async_ wait_for(opening_request, NULL);208 async_forget(opening_request); 209 209 return ENOMEM; 210 210 } -
uspace/lib/usbvirt/src/ipc_hc.c
rd37d500e r2d1f7a21 80 80 if (rc != EOK) { 81 81 async_exchange_end(exch); 82 async_ wait_for(opening_request, NULL);82 async_forget(opening_request); 83 83 return rc; 84 84 } … … 91 91 92 92 if (data_request == 0) { 93 async_ wait_for(opening_request, NULL);93 async_forget(opening_request); 94 94 return ENOMEM; 95 95 } … … 153 153 if (rc != EOK) { 154 154 async_exchange_end(exch); 155 async_ wait_for(opening_request, NULL);155 async_forget(opening_request); 156 156 return rc; 157 157 } … … 161 161 if (rc != EOK) { 162 162 async_exchange_end(exch); 163 async_ wait_for(opening_request, NULL);163 async_forget(opening_request); 164 164 return rc; 165 165 } … … 226 226 227 227 if (data_request == 0) { 228 async_ wait_for(opening_request, NULL);228 async_forget(opening_request); 229 229 return ENOMEM; 230 230 } … … 301 301 302 302 if (rc != EOK) { 303 async_ wait_for(opening_request, NULL);303 async_forget(opening_request); 304 304 return rc; 305 305 } -
uspace/srv/clipboard/Makefile
rd37d500e r2d1f7a21 29 29 30 30 USPACE_PREFIX = ../.. 31 BINARY = clip 31 BINARY = clipboard 32 32 33 33 SOURCES = \ 34 clip .c34 clipboard.c 35 35 36 36 include $(USPACE_PREFIX)/Makefile.common -
uspace/srv/clipboard/clipboard.c
rd37d500e r2d1f7a21 37 37 #include <errno.h> 38 38 39 #define NAME "clip "39 #define NAME "clipboard" 40 40 41 41 static char *clip_data = NULL; -
uspace/srv/net/inet/inet.c
rd37d500e r2d1f7a21 364 364 365 365 if (rc != EOK) { 366 async_ wait_for(req, NULL);366 async_forget(req); 367 367 return rc; 368 368 } -
uspace/srv/net/inet/inetping.c
rd37d500e r2d1f7a21 88 88 89 89 if (rc != EOK) { 90 async_ wait_for(req, NULL);90 async_forget(req); 91 91 return rc; 92 92 } -
uspace/srv/vfs/vfs_ops.c
rd37d500e r2d1f7a21 137 137 138 138 if (rc != EOK) { 139 async_ wait_for(msg, NULL);139 async_forget(msg); 140 140 fibril_rwlock_write_unlock(&namespace_rwlock); 141 141 async_answer_0(rid, rc); … … 204 204 if (rc != EOK) { 205 205 vfs_exchange_release(exch); 206 async_ wait_for(msg, NULL);206 async_forget(msg); 207 207 208 208 /* Mount failed, drop reference to mp_node. */ … … 219 219 if (rc != EOK) { 220 220 vfs_exchange_release(exch); 221 async_ wait_for(msg, NULL);221 async_forget(msg); 222 222 223 223 /* Mount failed, drop reference to mp_node. */
Note:
See TracChangeset
for help on using the changeset viewer.