Ignore:
Timestamp:
2011-04-15T19:38:07Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9dd730d1
Parents:
6b9e85b (diff), b2fb47f (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.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hw/bus/cuda_adb/cuda_adb.c

    r6b9e85b r8b655705  
    209209
    210210        if (dev_addr < 0) {
    211                 ipc_answer_0(iid, EINVAL);
     211                async_answer_0(iid, EINVAL);
    212212                return;
    213213        }
    214214
    215215        /* Answer the IPC_M_CONNECT_ME_TO call. */
    216         ipc_answer_0(iid, EOK);
     216        async_answer_0(iid, EOK);
    217217
    218218        while (1) {
     
    222222                case IPC_M_PHONE_HUNGUP:
    223223                        /* The other side has hung up. */
    224                         ipc_answer_0(callid, EOK);
     224                        async_answer_0(callid, EOK);
    225225                        return;
    226226                case IPC_M_CONNECT_TO_ME:
     
    245245                        break;
    246246                }
    247                 ipc_answer_0(callid, retval);
     247                async_answer_0(callid, retval);
    248248        }
    249249}
     
    276276        cuda_irq_code.cmds[0].addr = (void *) &((cuda_t *) instance->cuda_kernel)->ifr;
    277277        async_set_interrupt_received(cuda_irq_handler);
    278         ipc_register_irq(10, device_assign_devno(), 0, &cuda_irq_code);
     278        register_irq(10, device_assign_devno(), 0, &cuda_irq_code);
    279279
    280280        /* Enable SR interrupt. */
     
    367367static void cuda_irq_rcv_end(void *buf, size_t *len)
    368368{
    369         uint8_t data, b;
    370 
     369        uint8_t b;
     370       
    371371        b = pio_read_8(&dev->b);
    372         data = pio_read_8(&dev->sr);
    373 
     372        pio_read_8(&dev->sr);
     373       
    374374        if ((b & TREQ) == 0) {
    375375                instance->xstate = cx_receive;
     
    379379                cuda_send_start();
    380380        }
    381 
    382         memcpy(buf, instance->rcv_buf, instance->bidx);
    383         *len = instance->bidx;
     381       
     382        memcpy(buf, instance->rcv_buf, instance->bidx);
     383        *len = instance->bidx;
    384384        instance->bidx = 0;
    385385}
Note: See TracChangeset for help on using the changeset viewer.