Ignore:
Timestamp:
2011-07-20T15:26:21Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
efcebe1
Parents:
25bef0ff (diff), a701812 (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/char/s3c24xx_uart/s3c24xx_uart.c

    r25bef0ff r6a44ee4  
    4242#include <ipc/char.h>
    4343#include <async.h>
     44#include <async_obsolete.h>
    4445#include <unistd.h>
    4546#include <stdio.h>
     
    4849#include <errno.h>
    4950#include <inttypes.h>
    50 
    5151#include "s3c24xx_uart.h"
     52
     53// FIXME: remove this header
     54#include <kernel/ipc/ipc_methods.h>
    5255
    5356#define NAME "s3c24ser"
     
    6871static s3c24xx_uart_t *uart;
    6972
    70 static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall);
     73static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall,
     74    void *arg);
    7175static void s3c24xx_uart_irq_handler(ipc_callid_t iid, ipc_call_t *call);
    7276static int s3c24xx_uart_init(s3c24xx_uart_t *uart);
     
    110114
    111115/** Character device connection handler. */
    112 static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall)
     116static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall,
     117    void *arg)
    113118{
    114119        ipc_callid_t callid;
     
    123128                callid = async_get_call(&call);
    124129                method = IPC_GET_IMETHOD(call);
    125                 switch (method) {
    126                 case IPC_M_PHONE_HUNGUP:
     130               
     131                if (!method) {
    127132                        /* The other side has hung up. */
    128133                        async_answer_0(callid, EOK);
    129134                        return;
     135                }
     136               
     137                switch (method) {
    130138                case IPC_M_CONNECT_TO_ME:
    131139                        printf(NAME ": creating callback connection\n");
     
    156164
    157165                if (uart->client_phone != -1) {
    158                         async_msg_1(uart->client_phone, CHAR_NOTIF_BYTE,
     166                        async_obsolete_msg_1(uart->client_phone, CHAR_NOTIF_BYTE,
    159167                            data);
    160168                }
Note: See TracChangeset for help on using the changeset viewer.