Changeset b10a434 in mainline for uspace/lib/drv


Ignore:
Timestamp:
2017-12-22T13:22:54Z (8 years ago)
Author:
Petr Mánek <petr.manek@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
00d23a2
Parents:
96c416a
git-author:
Petr Mánek <petr.manek@…> (2017-12-22 13:22:51)
git-committer:
Petr Mánek <petr.manek@…> (2017-12-22 13:22:54)
Message:

usbdiag: refactoring

Remote usbdiag interface has been modified to allow reporting test duration back to the caller. The usbdiag driver has been modified to pass such information to the remote interface. The tmon utility has been modified to display some basic statistical information derived from the received value.

Location:
uspace/lib/drv
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r96c416a rb10a434  
    6262}
    6363
    64 int usbdiag_burst_intr_in(async_exch_t *exch, int cycles, size_t size)
    65 {
    66         if (!exch)
    67                 return EBADMEM;
    68 
    69         return async_req_3_0(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_INTR_IN, cycles, size);
    70 }
    71 
    72 int usbdiag_burst_intr_out(async_exch_t *exch, int cycles, size_t size)
    73 {
    74         if (!exch)
    75                 return EBADMEM;
    76 
    77         return async_req_3_0(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_INTR_OUT, cycles, size);
    78 }
    79 
    80 int usbdiag_burst_bulk_in(async_exch_t *exch, int cycles, size_t size)
    81 {
    82         if (!exch)
    83                 return EBADMEM;
    84 
    85         return async_req_3_0(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_BULK_IN, cycles, size);
    86 }
    87 
    88 int usbdiag_burst_bulk_out(async_exch_t *exch, int cycles, size_t size)
    89 {
    90         if (!exch)
    91                 return EBADMEM;
    92 
    93         return async_req_3_0(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_BULK_OUT, cycles, size);
    94 }
    95 
    96 int usbdiag_burst_isoch_in(async_exch_t *exch, int cycles, size_t size)
    97 {
    98         if (!exch)
    99                 return EBADMEM;
    100 
    101         return async_req_3_0(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_ISOCH_IN, cycles, size);
    102 }
    103 
    104 int usbdiag_burst_isoch_out(async_exch_t *exch, int cycles, size_t size)
    105 {
    106         if (!exch)
    107                 return EBADMEM;
    108 
    109         return async_req_3_0(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_ISOCH_OUT, cycles, size);
     64int usbdiag_burst_intr_in(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
     65{
     66        if (!exch)
     67                return EBADMEM;
     68
     69        sysarg_t duration_;
     70        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_INTR_IN, cycles, size, &duration_);
     71
     72        if (rc == EOK && duration)
     73                *duration = duration_;
     74
     75        return rc;
     76}
     77
     78int usbdiag_burst_intr_out(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
     79{
     80        if (!exch)
     81                return EBADMEM;
     82
     83        sysarg_t duration_;
     84        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_INTR_OUT, cycles, size, &duration_);
     85
     86        if (rc == EOK && duration)
     87                *duration = duration_;
     88
     89        return rc;
     90}
     91
     92int usbdiag_burst_bulk_in(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
     93{
     94        if (!exch)
     95                return EBADMEM;
     96
     97        sysarg_t duration_;
     98        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_BULK_IN, cycles, size, &duration_);
     99
     100        if (rc == EOK && duration)
     101                *duration = duration_;
     102
     103        return rc;
     104}
     105
     106int usbdiag_burst_bulk_out(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
     107{
     108        if (!exch)
     109                return EBADMEM;
     110
     111        sysarg_t duration_;
     112        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_BULK_OUT, cycles, size, &duration_);
     113
     114        if (rc == EOK && duration)
     115                *duration = duration_;
     116
     117        return rc;
     118}
     119
     120int usbdiag_burst_isoch_in(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
     121{
     122        if (!exch)
     123                return EBADMEM;
     124
     125        sysarg_t duration_;
     126        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_ISOCH_IN, cycles, size, &duration_);
     127
     128        if (rc == EOK && duration)
     129                *duration = duration_;
     130
     131        return rc;
     132}
     133
     134int usbdiag_burst_isoch_out(async_exch_t *exch, int cycles, size_t size, usbdiag_dur_t *duration)
     135{
     136        if (!exch)
     137                return EBADMEM;
     138
     139        sysarg_t duration_;
     140        const int rc = async_req_3_1(exch, DEV_IFACE_ID(USBDIAG_DEV_IFACE), IPC_M_USBDIAG_BURST_ISOCH_OUT, cycles, size, &duration_);
     141
     142        if (rc == EOK && duration)
     143                *duration = duration_;
     144
     145        return rc;
    110146}
    111147
    … …  
    144180        int cycles = DEV_IPC_GET_ARG1(*call);
    145181        size_t size = DEV_IPC_GET_ARG2(*call);
    146         const int ret = diag_iface->burst_intr_in(fun, cycles, size);
    147         async_answer_0(callid, ret);
     182        usbdiag_dur_t duration;
     183        const int ret = diag_iface->burst_intr_in(fun, cycles, size, &duration);
     184
     185        if (ret != EOK) {
     186                async_answer_0(callid, ret);
     187        } else {
     188                async_answer_1(callid, EOK, duration);
     189        }
    148190}
    149191
    … …  
    159201        int cycles = DEV_IPC_GET_ARG1(*call);
    160202        size_t size = DEV_IPC_GET_ARG2(*call);
    161         const int ret = diag_iface->burst_intr_out(fun, cycles, size);
    162         async_answer_0(callid, ret);
     203        usbdiag_dur_t duration;
     204        const int ret = diag_iface->burst_intr_out(fun, cycles, size, &duration);
     205
     206        if (ret != EOK) {
     207                async_answer_0(callid, ret);
     208        } else {
     209                async_answer_1(callid, EOK, duration);
     210        }
    163211}
    164212
    … …  
    174222        int cycles = DEV_IPC_GET_ARG1(*call);
    175223        size_t size = DEV_IPC_GET_ARG2(*call);
    176         const int ret = diag_iface->burst_bulk_in(fun, cycles, size);
    177         async_answer_0(callid, ret);
     224        usbdiag_dur_t duration;
     225        const int ret = diag_iface->burst_bulk_in(fun, cycles, size, &duration);
     226
     227        if (ret != EOK) {
     228                async_answer_0(callid, ret);
     229        } else {
     230                async_answer_1(callid, EOK, duration);
     231        }
    178232}
    179233
    … …  
    189243        int cycles = DEV_IPC_GET_ARG1(*call);
    190244        size_t size = DEV_IPC_GET_ARG2(*call);
    191         const int ret = diag_iface->burst_bulk_out(fun, cycles, size);
    192         async_answer_0(callid, ret);
     245        usbdiag_dur_t duration;
     246        const int ret = diag_iface->burst_bulk_out(fun, cycles, size, &duration);
     247
     248        if (ret != EOK) {
     249                async_answer_0(callid, ret);
     250        } else {
     251                async_answer_1(callid, EOK, duration);
     252        }
    193253}
    194254
    … …  
    204264        int cycles = DEV_IPC_GET_ARG1(*call);
    205265        size_t size = DEV_IPC_GET_ARG2(*call);
    206         const int ret = diag_iface->burst_isoch_in(fun, cycles, size);
    207         async_answer_0(callid, ret);
     266        usbdiag_dur_t duration;
     267        const int ret = diag_iface->burst_isoch_in(fun, cycles, size, &duration);
     268
     269        if (ret != EOK) {
     270                async_answer_0(callid, ret);
     271        } else {
     272                async_answer_1(callid, EOK, duration);
     273        }
    208274}
    209275
    … …  
    219285        int cycles = DEV_IPC_GET_ARG1(*call);
    220286        size_t size = DEV_IPC_GET_ARG2(*call);
    221         const int ret = diag_iface->burst_isoch_out(fun, cycles, size);
    222         async_answer_0(callid, ret);
     287        usbdiag_dur_t duration;
     288        const int ret = diag_iface->burst_isoch_out(fun, cycles, size, &duration);
     289
     290        if (ret != EOK) {
     291                async_answer_0(callid, ret);
     292        } else {
     293                async_answer_1(callid, EOK, duration);
     294        }
    223295}
    224296

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

    r96c416a rb10a434  
    4343#define USBDIAG_CATEGORY "usbdiag"
    4444
     45/** Milliseconds */
     46typedef unsigned long usbdiag_dur_t;
     47
    4548async_sess_t *usbdiag_connect(devman_handle_t);
    4649void usbdiag_disconnect(async_sess_t*);
    47 int usbdiag_burst_intr_in(async_exch_t*, int, size_t);
    48 int usbdiag_burst_intr_out(async_exch_t*, int, size_t);
    49 int usbdiag_burst_bulk_in(async_exch_t*, int, size_t);
    50 int usbdiag_burst_bulk_out(async_exch_t*, int, size_t);
    51 int usbdiag_burst_isoch_in(async_exch_t*, int, size_t);
    52 int usbdiag_burst_isoch_out(async_exch_t*, int, size_t);
     50int usbdiag_burst_intr_in(async_exch_t*, int, size_t, usbdiag_dur_t*);
     51int usbdiag_burst_intr_out(async_exch_t*, int, size_t, usbdiag_dur_t*);
     52int usbdiag_burst_bulk_in(async_exch_t*, int, size_t, usbdiag_dur_t*);
     53int usbdiag_burst_bulk_out(async_exch_t*, int, size_t, usbdiag_dur_t*);
     54int usbdiag_burst_isoch_in(async_exch_t*, int, size_t, usbdiag_dur_t*);
     55int usbdiag_burst_isoch_out(async_exch_t*, int, size_t, usbdiag_dur_t*);
    5356
    5457/** USB diagnostic device communication interface. */
    5558typedef struct {
    56         int (*burst_intr_in)(ddf_fun_t*, int, size_t);
    57         int (*burst_intr_out)(ddf_fun_t*, int, size_t);
    58         int (*burst_bulk_in)(ddf_fun_t*, int, size_t);
    59         int (*burst_bulk_out)(ddf_fun_t*, int, size_t);
    60         int (*burst_isoch_in)(ddf_fun_t*, int, size_t);
    61         int (*burst_isoch_out)(ddf_fun_t*, int, size_t);
     59        int (*burst_intr_in)(ddf_fun_t*, int, size_t, usbdiag_dur_t*);
     60        int (*burst_intr_out)(ddf_fun_t*, int, size_t, usbdiag_dur_t*);
     61        int (*burst_bulk_in)(ddf_fun_t*, int, size_t, usbdiag_dur_t*);
     62        int (*burst_bulk_out)(ddf_fun_t*, int, size_t, usbdiag_dur_t*);
     63        int (*burst_isoch_in)(ddf_fun_t*, int, size_t, usbdiag_dur_t*);
     64        int (*burst_isoch_out)(ddf_fun_t*, int, size_t, usbdiag_dur_t*);
    6265} usbdiag_iface_t;
    6366
Note: See TracChangeset for help on using the changeset viewer.