Changeset ae3a941 in mainline for uspace/lib/drv


Ignore:
Timestamp:
2018-02-26T16:51:40Z (7 years ago)
Author:
Ondřej Hlavatý <aearsis@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e773f58
Parents:
3692678
Message:

usb: cstyle

Location:
uspace/lib/drv
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/drv/generic/remote_usb.c

    r3692678 rae3a941  
    5252usb_dev_session_t *usb_dev_connect_to_self(ddf_dev_t *dev)
    5353{
    54         return devman_parent_device_connect(ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
     54        return devman_parent_device_connect(ddf_dev_get_handle(dev),
     55            IPC_FLAG_BLOCKING);
    5556}
    5657
    … …  
    9091}
    9192
    92 static void remote_usb_get_my_description(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
     93static void remote_usb_get_my_description(ddf_fun_t *, void *,
     94    ipc_callid_t, ipc_call_t *);
    9395
    9496/** Remote USB interface operations. */

  • uspace/lib/drv/generic/remote_usbdiag.c

    r3692678 rae3a941  
    5858}
    5959
    60 errno_t usbdiag_test_in(async_exch_t *exch, const usbdiag_test_params_t *params, usbdiag_test_results_t *results)
     60errno_t usbdiag_test_in(async_exch_t *exch,
     61    const usbdiag_test_params_t *params, usbdiag_test_results_t *results)
    6162{
    6263        if (!exch)
    … …  
    6465
    6566        ipc_call_t answer;
    66         aid_t req = async_send_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_TEST_IN, &answer);
    67 
    68         errno_t rc = async_data_write_start(exch, params, sizeof(usbdiag_test_params_t));
    69         if (rc != EOK) {
    70                 async_exchange_end(exch);
    71                 async_forget(req);
    72                 return rc;
    73         }
    74 
    75         rc = async_data_read_start(exch, results, sizeof(usbdiag_test_results_t));
     67        aid_t req = async_send_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE),
     68            IPC_M_USBDIAG_TEST_IN, &answer);
     69
     70        errno_t rc = async_data_write_start(exch, params,
     71            sizeof(usbdiag_test_params_t));
     72        if (rc != EOK) {
     73                async_exchange_end(exch);
     74                async_forget(req);
     75                return rc;
     76        }
     77
     78        rc = async_data_read_start(exch, results,
     79            sizeof(usbdiag_test_results_t));
    7680        if (rc != EOK) {
    7781                async_exchange_end(exch);
    … …  
    8892}
    8993
    90 errno_t usbdiag_test_out(async_exch_t *exch, const usbdiag_test_params_t *params, usbdiag_test_results_t *results)
     94errno_t usbdiag_test_out(async_exch_t *exch,
     95    const usbdiag_test_params_t *params, usbdiag_test_results_t *results)
    9196{
    9297        if (!exch)
    … …  
    9499
    95100        ipc_call_t answer;
    96         aid_t req = async_send_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_TEST_OUT, &answer);
    97 
    98         errno_t rc = async_data_write_start(exch, params, sizeof(usbdiag_test_params_t));
    99         if (rc != EOK) {
    100                 async_exchange_end(exch);
    101                 async_forget(req);
    102                 return rc;
    103         }
    104 
    105         rc = async_data_read_start(exch, results, sizeof(usbdiag_test_results_t));
     101        aid_t req = async_send_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE),
     102            IPC_M_USBDIAG_TEST_OUT, &answer);
     103
     104        errno_t rc = async_data_write_start(exch, params,
     105            sizeof(usbdiag_test_params_t));
     106        if (rc != EOK) {
     107                async_exchange_end(exch);
     108                async_forget(req);
     109                return rc;
     110        }
     111
     112        rc = async_data_read_start(exch, results,
     113            sizeof(usbdiag_test_results_t));
    106114        if (rc != EOK) {
    107115                async_exchange_end(exch);
    … …  
    118126}
    119127
    120 static void remote_usbdiag_test_in(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
    121 static void remote_usbdiag_test_out(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
     128static void remote_usbdiag_test_in(ddf_fun_t *, void *,
     129    ipc_callid_t, ipc_call_t *);
     130static void remote_usbdiag_test_out(ddf_fun_t *, void *,
     131    ipc_callid_t, ipc_call_t *);
    122132
    123133/** Remote USB diagnostic interface operations. */
    … …  
    133143};
    134144
    135 void remote_usbdiag_test_in(ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)
     145void remote_usbdiag_test_in(ddf_fun_t *fun, void *iface,
     146    ipc_callid_t callid, ipc_call_t *call)
    136147{
    137148        const usbdiag_iface_t *diag_iface = (usbdiag_iface_t *) iface;
    … …  
    158169
    159170        usbdiag_test_results_t results;
    160         const errno_t ret = !diag_iface->test_in ? ENOTSUP : diag_iface->test_in(fun, &params, &results);
     171        const errno_t ret = !diag_iface->test_in ? ENOTSUP
     172            : diag_iface->test_in(fun, &params, &results);
    161173
    162174        if (ret != EOK) {
    … …  
    185197}
    186198
    187 void remote_usbdiag_test_out(ddf_fun_t *fun, void *iface, ipc_callid_t callid, ipc_call_t *call)
     199void remote_usbdiag_test_out(ddf_fun_t *fun, void *iface,
     200    ipc_callid_t callid, ipc_call_t *call)
    188201{
    189202        const usbdiag_iface_t *diag_iface = (usbdiag_iface_t *) iface;
    … …  
    210223
    211224        usbdiag_test_results_t results;
    212         const errno_t ret = !diag_iface->test_out ? ENOTSUP : diag_iface->test_out(fun, &params, &results);
     225        const errno_t ret = !diag_iface->test_out ? ENOTSUP
     226            : diag_iface->test_out(fun, &params, &results);
    213227
    214228        if (ret != EOK) {

  • uspace/lib/drv/include/usb_iface.h

    r3692678 rae3a941  
    4646
    4747typedef struct {
    48         usb_address_t address;          /** Current USB address */
    49         uint8_t depth;                  /** Depth in the hub hiearchy */
    50         usb_speed_t speed;              /** Speed of the device */
    51         devman_handle_t handle;         /** Handle to DDF function of the HC driver */
    52         int iface;                      /** Interface set by multi interface driver, -1 if none */
     48        usb_address_t address;  /**< Current USB address */
     49        uint8_t depth;          /**< Depth in the hub hiearchy */
     50        usb_speed_t speed;      /**< Speed of the device */
     51        devman_handle_t handle; /**< Handle to DDF function of the HC driver */
     52        /** Interface set by multi interface driver,  -1 if none */
     53        int iface;
    5354} usb_device_desc_t;
    5455

  • uspace/lib/drv/include/usbdiag_iface.h

    r3692678 rae3a941  
    6363
    6464async_sess_t *usbdiag_connect(devman_handle_t);
    65 void usbdiag_disconnect(async_sess_t*);
     65void usbdiag_disconnect(async_sess_t *);
    6666
    67 errno_t usbdiag_test_in(async_exch_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
    68 errno_t usbdiag_test_out(async_exch_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
     67errno_t usbdiag_test_in(async_exch_t *,
     68    const usbdiag_test_params_t *, usbdiag_test_results_t *);
     69errno_t usbdiag_test_out(async_exch_t*,
     70    const usbdiag_test_params_t *, usbdiag_test_results_t *);
    6971
    7072/** USB diagnostic device communication interface. */
    7173typedef struct {
    72         errno_t (*test_in)(ddf_fun_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
    73         errno_t (*test_out)(ddf_fun_t*, const usbdiag_test_params_t *, usbdiag_test_results_t *);
     74        errno_t (*test_in)(ddf_fun_t *,
     75            const usbdiag_test_params_t *, usbdiag_test_results_t *);
     76        errno_t (*test_out)(ddf_fun_t*,
     77            const usbdiag_test_params_t *, usbdiag_test_results_t *);
    7478} usbdiag_iface_t;
    7579
Note: See TracChangeset for help on using the changeset viewer.