Changeset 6773ff3 in mainline for uspace


Ignore:
Timestamp:
2012-04-23T14:57:42Z (14 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ee3b6150
Parents:
728d771 (diff), 6aae539d (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 with mainline

Location:
uspace
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/init/init.c

    r728d771 r6773ff3  
    302302        spawn("/srv/obio");
    303303        srv_start("/srv/cuda_adb");
    304         srv_start("/srv/s3c24ser");
    305         srv_start("/srv/s3c24ts");
     304        srv_start("/srv/s3c24xx_uart");
     305        srv_start("/srv/s3c24xx_ts");
    306306       
    307307        spawn("/srv/loopip");

  • uspace/app/trace/ipc_desc.c

    r728d771 r6773ff3  
    3939ipc_m_desc_t ipc_methods[] = {
    4040        /* System methods */
    41         { IPC_M_PHONE_HUNGUP,  "PHONE_HUNGUP" },
    42         { IPC_M_CONNECT_ME,    "CONNECT_ME" },
    43         { IPC_M_CONNECT_ME_TO, "CONNECT_ME_TO" },
    44         { IPC_M_CONNECT_TO_ME, "CONNECT_TO_ME" },
    45         { IPC_M_SHARE_OUT,     "SHARE_OUT" },
    46         { IPC_M_SHARE_IN,      "SHARE_IN" },
    47         { IPC_M_DATA_WRITE,    "DATA_WRITE" },
    48         { IPC_M_DATA_READ,     "DATA_READ" },
    49         { IPC_M_DEBUG,         "DEBUG" },
     41        { IPC_M_PHONE_HUNGUP,     "PHONE_HUNGUP" },
     42        { IPC_M_CONNECTION_CLONE, "CONNECTION_CLONE" },
     43        { IPC_M_CLONE_ESTABLISH,  "CLONE_ESTABLISH" },
     44        { IPC_M_CONNECT_ME_TO,    "CONNECT_ME_TO" },
     45        { IPC_M_CONNECT_TO_ME,    "CONNECT_TO_ME" },
     46        { IPC_M_SHARE_OUT,        "SHARE_OUT" },
     47        { IPC_M_SHARE_IN,         "SHARE_IN" },
     48        { IPC_M_DATA_WRITE,       "DATA_WRITE" },
     49        { IPC_M_DATA_READ,        "DATA_READ" },
     50        { IPC_M_DEBUG,            "DEBUG" },
    5051       
    5152        /* Terminating entry */

  • uspace/lib/c/generic/async.c

    r728d771 r6773ff3  
    946946       
    947947        switch (IPC_GET_IMETHOD(*call)) {
    948         case IPC_M_CONNECT_ME:
     948        case IPC_M_CLONE_ESTABLISH:
    949949        case IPC_M_CONNECT_ME_TO:
    950950                /* Open new connection with fibril, etc. */
    … …  
    16681668}
    16691669
    1670 /** Wrapper for making IPC_M_CONNECT_ME calls using the async framework.
    1671  *
    1672  * Ask through for a cloned connection to some service.
     1670/** Wrapper for making IPC_M_CLONE_ESTABLISH calls using the async framework.
     1671 *
     1672 * Ask for a cloned connection to some service.
    16731673 *
    16741674 * @param mgmt Exchange management style.
    … …  
    16781678 *
    16791679 */
    1680 async_sess_t *async_connect_me(exch_mgmt_t mgmt, async_exch_t *exch)
     1680async_sess_t *async_clone_establish(exch_mgmt_t mgmt, async_exch_t *exch)
    16811681{
    16821682        if (exch == NULL) {
    … …  
    17031703        msg->wdata.active = true;
    17041704       
    1705         ipc_call_async_0(exch->phone, IPC_M_CONNECT_ME, msg,
     1705        ipc_call_async_0(exch->phone, IPC_M_CLONE_ESTABLISH, msg,
    17061706            reply_received, true);
    17071707       

  • uspace/lib/c/generic/ipc.c

    r728d771 r6773ff3  
    647647 *
    648648 */
    649 int ipc_connect_me(int phoneid)
     649int ipc_clone_establish(int phoneid)
    650650{
    651651        sysarg_t newphid;
    652         int res = ipc_call_sync_0_5(phoneid, IPC_M_CONNECT_ME, NULL, NULL,
    653             NULL, NULL, &newphid);
     652        int res = ipc_call_sync_0_5(phoneid, IPC_M_CLONE_ESTABLISH, NULL,
     653            NULL, NULL, NULL, &newphid);
    654654        if (res)
    655655                return res;

  • uspace/lib/c/include/async.h

    r728d771 r6773ff3  
    321321    sysarg_t *, sysarg_t *);
    322322
    323 extern async_sess_t *async_connect_me(exch_mgmt_t, async_exch_t *);
     323extern async_sess_t *async_clone_establish(exch_mgmt_t, async_exch_t *);
    324324extern async_sess_t *async_connect_me_to(exch_mgmt_t, async_exch_t *, sysarg_t,
    325325    sysarg_t, sysarg_t);

  • uspace/lib/c/include/ipc/ipc.h

    r728d771 r6773ff3  
    254254    sysarg_t, sysarg_t, void *, ipc_async_callback_t, bool);
    255255
     256extern int ipc_clone_establish(int);
    256257extern int ipc_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, task_id_t *,
    257258    sysarg_t *);
    258 extern int ipc_connect_me(int);
    259259extern int ipc_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t);
    260260extern int ipc_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t);

  • uspace/lib/fs/libfs.c

    r728d771 r6773ff3  
    404404       
    405405        async_exch_t *exch = async_exchange_begin(mountee_sess);
    406         async_sess_t *sess = async_connect_me(EXCHANGE_PARALLEL, exch);
     406        async_sess_t *sess = async_clone_establish(EXCHANGE_PARALLEL, exch);
    407407       
    408408        if (!sess) {

  • uspace/lib/nic/include/nic.h

    r728d771 r6773ff3  
    232232extern int nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *);
    233233extern void nic_query_address(nic_t *, nic_address_t *);
    234 extern void nic_received_noneth_frame(nic_t *, void *, size_t);
    235234extern void nic_received_frame(nic_t *, nic_frame_t *);
    236235extern void nic_received_frame_list(nic_t *, nic_frame_list_t *);

  • uspace/lib/nic/src/nic_driver.c

    r728d771 r6773ff3  
    624624
    625625/**
    626  * This function is to be used only in the loopback driver. It's workaround
    627  * for the situation when the frame does not contain ethernet address.
    628  * The filtering is therefore not applied here.
    629  *
    630  * @param nic_data
    631  * @param data          Frame data
    632  * @param size          Frame size in bytes
    633  */
    634 void nic_received_noneth_frame(nic_t *nic_data, void *data, size_t size)
    635 {
    636         fibril_rwlock_write_lock(&nic_data->stats_lock);
    637         nic_data->stats.receive_packets++;
    638         nic_data->stats.receive_bytes += size;
    639         fibril_rwlock_write_unlock(&nic_data->stats_lock);
    640        
    641         nic_ev_received(nic_data->client_session, data, size);
    642 }
    643 
    644 /**
    645626 * Some NICs can receive multiple frames during single interrupt. These can
    646627 * send them in whole list of frames (actually nic_frame_t structures), then

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

    r728d771 r6773ff3  
    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

    r728d771 r6773ff3  
    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

    r728d771 r6773ff3  
    5252#include "s3c24xx_ts.h"
    5353
    54 #define NAME       "s3c24ser"
     54#define NAME       "s3c24xx_ts"
    5555#define NAMESPACE  "hid"
    5656
Note: See TracChangeset for help on using the changeset viewer.