Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2659 → Rev 2660

/trunk/uspace/srv/devmap/devmap.c
202,7 → 202,7
/*
* Get driver name
*/
if (!ipc_data_receive(&callid, NULL, &name_size)) {
if (!ipc_data_write_receive(&callid, NULL, &name_size)) {
printf("Unexpected request.\n");
free(driver);
ipc_answer_0(callid, EREFUSED);
233,7 → 233,7
/*
* Send confirmation to sender and get data into buffer.
*/
if (EOK != ipc_data_deliver(callid, driver->name, name_size)) {
if (EOK != ipc_data_write_deliver(callid, driver->name, name_size)) {
printf("Cannot read driver name.\n");
free(driver->name);
free(driver);
368,7 → 368,7
}
/* Get device name */
if (!ipc_data_receive(&callid, NULL, &size)) {
if (!ipc_data_write_receive(&callid, NULL, &size)) {
free(device);
printf("Cannot read device name.\n");
ipc_answer_0(iid, EREFUSED);
394,7 → 394,7
return;
}
ipc_data_deliver(callid, device->name, size);
ipc_data_write_deliver(callid, device->name, size);
device->name[size] = 0;
 
list_initialize(&(device->devices));
489,7 → 489,7
* Wait for incoming message with device name (but do not
* read the name itself until the buffer is allocated).
*/
if (!ipc_data_receive(&callid, NULL, &name_size)) {
if (!ipc_data_write_receive(&callid, NULL, &name_size)) {
ipc_answer_0(callid, EREFUSED);
ipc_answer_0(iid, EREFUSED);
return;
513,7 → 513,7
/*
* Send confirmation to sender and get data into buffer.
*/
if (EOK != (retval = ipc_data_deliver(callid, name, name_size))) {
if (EOK != (retval = ipc_data_write_deliver(callid, name, name_size))) {
ipc_answer_0(iid, EREFUSED);
return;
}
566,7 → 566,7
we have no channel from DEVMAP to client ->
sending must be initiated by client
 
int rc = ipc_data_send(phone, device->name, name_size);
int rc = ipc_data_write_send(phone, device->name, name_size);
if (rc != EOK) {
async_wait_for(req, NULL);
return rc;