Changeset 1a23f6e in mainline for uspace/srv


Ignore:
Timestamp:
2012-05-04T10:41:44Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
af42a2b
Parents:
6efb4d2 (diff), d21e935c (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

Location:
uspace/srv
Files:
8 edited
3 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/clipboard/Makefile

    r6efb4d2 r1a23f6e  
    2929
    3030USPACE_PREFIX = ../..
    31 BINARY = clip
     31BINARY = clipboard
    3232
    3333SOURCES = \
    34         clip.c
     34        clipboard.c
    3535
    3636include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/clipboard/clipboard.c

    r6efb4d2 r1a23f6e  
    3737#include <errno.h>
    3838
    39 #define NAME  "clip"
     39#define NAME  "clipboard"
    4040
    4141static char *clip_data = NULL;

  • uspace/srv/hid/input/port/chardev.c

    r6efb4d2 r1a23f6e  
    6363/** List of devices to try connecting to. */
    6464static const char *in_devs[] = {
    65         "char/s3c24ser"
     65        "char/s3c24xx_uart"
    6666};
    6767

  • uspace/srv/hid/s3c24xx_ts/Makefile

    r6efb4d2 r1a23f6e  
    2929USPACE_PREFIX = ../../..
    3030
    31 # Need to use short name because of FAT 8+3 limit
    32 BINARY = s3c24ts
     31BINARY = s3c24xx_ts
    3332
    3433SOURCES = \

  • uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

    r6efb4d2 r1a23f6e  
    5252#include "s3c24xx_ts.h"
    5353
    54 #define NAME       "s3c24ser"
     54#define NAME       "s3c24xx_ts"
    5555#define NAMESPACE  "hid"
    5656

  • uspace/srv/net/inet/inet.c

    r6efb4d2 r1a23f6e  
    364364
    365365        if (rc != EOK) {
    366                 async_wait_for(req, NULL);
     366                async_forget(req);
    367367                return rc;
    368368        }

  • uspace/srv/net/inet/inetping.c

    r6efb4d2 r1a23f6e  
    8888
    8989        if (rc != EOK) {
    90                 async_wait_for(req, NULL);
     90                async_forget(req);
    9191                return rc;
    9292        }

  • uspace/srv/net/tcp/sock.c

    r6efb4d2 r1a23f6e  
    4242#include <ipc/services.h>
    4343#include <ipc/socket.h>
    44 #include <net/modules.h>
    4544#include <net/socket.h>
    4645#include <ns.h>
    … …  
    8988        socket = (tcp_sockdata_t *)sock_core->specific_data;
    9089        (void)socket;
     90
     91        /* XXX We need to initiate connection cleanup here */
    9192}
    9293
    … …  
    142143        sock->sock_core = sock_core;
    143144
    144         refresh_answer(&answer, NULL);
    145145        SOCKET_SET_SOCKET_ID(answer, sock_id);
    146146
    147147        SOCKET_SET_DATA_FRAGMENT_SIZE(answer, FRAGMENT_SIZE);
    148148        SOCKET_SET_HEADER_SIZE(answer, sizeof(tcp_header_t));
    149         answer_call(callid, EOK, &answer, 3);
     149       
     150        async_answer_3(callid, EOK, IPC_GET_ARG1(answer),
     151            IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
    150152}
    151153
    … …  
    466468        assert(asock_core != NULL);
    467469
    468         refresh_answer(&answer, NULL);
    469 
    470470        SOCKET_SET_DATA_FRAGMENT_SIZE(answer, FRAGMENT_SIZE);
    471471        SOCKET_SET_SOCKET_ID(answer, asock_id);
    472472        SOCKET_SET_ADDRESS_LENGTH(answer, sizeof(struct sockaddr_in));
    473 
    474         answer_call(callid, asock_core->socket_id, &answer, 3);
    475 
     473       
     474        async_answer_3(callid, asock_core->socket_id,
     475            IPC_GET_ARG1(answer), IPC_GET_ARG2(answer),
     476            IPC_GET_ARG3(answer));
     477       
    476478        /* Push one fragment notification to client's queue */
    477479        log_msg(LVL_DEBUG, "tcp_sock_accept(): notify data\n");
    … …  
    557559        }
    558560
    559         refresh_answer(&answer, NULL);
     561        IPC_SET_ARG1(answer, 0);
    560562        SOCKET_SET_DATA_FRAGMENT_SIZE(answer, FRAGMENT_SIZE);
    561         answer_call(callid, EOK, &answer, 2);
     563        async_answer_2(callid, EOK, IPC_GET_ARG1(answer),
     564            IPC_GET_ARG2(answer));
    562565        fibril_mutex_unlock(&socket->lock);
    563566}
    … …  
    677680
    678681        SOCKET_SET_READ_DATA_LENGTH(answer, length);
    679         answer_call(callid, EOK, &answer, 1);
    680 
     682        async_answer_1(callid, EOK, IPC_GET_ARG1(answer));
     683       
    681684        /* Push one fragment notification to client's queue */
    682685        tcp_sock_notify_data(sock_core);
    … …  
    835838                }
    836839        }
     840
     841        /* Clean up */
     842        log_msg(LVL_DEBUG, "tcp_sock_connection: Clean up");
     843        async_hangup(client.sess);
     844        socket_cores_release(NULL, &client.sockets, &gsock, tcp_free_sock_data);
    837845}
    838846

  • uspace/srv/net/udp/sock.c

    r6efb4d2 r1a23f6e  
    4343#include <ipc/services.h>
    4444#include <ipc/socket.h>
    45 #include <net/modules.h>
    4645#include <net/socket.h>
    4746#include <ns.h>
    … …  
    8584
    8685        socket = (udp_sockdata_t *)sock_core->specific_data;
    87         (void)socket;
     86        assert(socket->assoc != NULL);
     87        udp_uc_destroy(socket->assoc);
    8888}
    8989
    … …  
    133133        assert(sock_core != NULL);
    134134        sock->sock_core = sock_core;
    135 
    136 
    137         refresh_answer(&answer, NULL);
     135       
    138136        SOCKET_SET_SOCKET_ID(answer, sock_id);
    139137
    140138        SOCKET_SET_DATA_FRAGMENT_SIZE(answer, FRAGMENT_SIZE);
    141139        SOCKET_SET_HEADER_SIZE(answer, sizeof(udp_header_t));
    142         answer_call(callid, EOK, &answer, 3);
     140        async_answer_3(callid, EOK, IPC_GET_ARG1(answer),
     141            IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
    143142}
    144143
    … …  
    368367                }
    369368        }
    370 
    371         refresh_answer(&answer, NULL);
     369       
     370        IPC_SET_ARG1(answer, 0);
    372371        SOCKET_SET_DATA_FRAGMENT_SIZE(answer, FRAGMENT_SIZE);
    373         answer_call(callid, EOK, &answer, 2);
     372        async_answer_2(callid, EOK, IPC_GET_ARG1(answer),
     373            IPC_GET_ARG2(answer));
    374374        fibril_mutex_unlock(&socket->lock);
     375       
    375376out:
    376377        if (addr != NULL)
    … …  
    485486
    486487        log_msg(LVL_DEBUG, "read_data_length <- %zu", length);
     488        IPC_SET_ARG2(answer, 0);
    487489        SOCKET_SET_READ_DATA_LENGTH(answer, length);
    488490        SOCKET_SET_ADDRESS_LENGTH(answer, sizeof(addr));
    489         answer_call(callid, EOK, &answer, 3);
    490 
     491        async_answer_3(callid, EOK, IPC_GET_ARG1(answer),
     492            IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
     493       
    491494        /* Push one fragment notification to client's queue */
    492495        udp_sock_notify_data(sock_core);
    … …  
    512515        socket = (udp_sockdata_t *)sock_core->specific_data;
    513516        fibril_mutex_lock(&socket->lock);
    514 
    515         assert(socket->assoc != NULL);
    516         udp_uc_destroy(socket->assoc);
    517517
    518518        rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,
    … …  
    599599                }
    600600        }
     601
     602        /* Clean up */
     603        log_msg(LVL_DEBUG, "udp_sock_connection: Clean up");
     604        async_hangup(client.sess);
     605        socket_cores_release(NULL, &client.sockets, &gsock, udp_free_sock_data);
    601606}
    602607

  • uspace/srv/vfs/vfs_ops.c

    r6efb4d2 r1a23f6e  
    137137                       
    138138                        if (rc != EOK) {
    139                                 async_wait_for(msg, NULL);
     139                                async_forget(msg);
    140140                                fibril_rwlock_write_unlock(&namespace_rwlock);
    141141                                async_answer_0(rid, rc);
    … …  
    204204        if (rc != EOK) {
    205205                vfs_exchange_release(exch);
    206                 async_wait_for(msg, NULL);
     206                async_forget(msg);
    207207               
    208208                /* Mount failed, drop reference to mp_node. */
    … …  
    219219        if (rc != EOK) {
    220220                vfs_exchange_release(exch);
    221                 async_wait_for(msg, NULL);
     221                async_forget(msg);
    222222               
    223223                /* Mount failed, drop reference to mp_node. */
Note: See TracChangeset for help on using the changeset viewer.