Changeset 64ce0c1 in mainline for uspace/drv/bus/usb/usbdiag/device.c


Ignore:
Timestamp:
2018-02-02T10:13:55Z (6 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
961a5ee
Parents:
e67c50a (diff), 290338b (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 commit '290338bf7224f502808b23e82d98306208962b97' into forwardport

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/usbdiag/device.c

    re67c50a r64ce0c1  
    4646
    4747static usbdiag_iface_t diag_interface = {
    48         .burst_intr_in = usbdiag_burst_test_intr_in,
    49         .burst_intr_out = usbdiag_burst_test_intr_out,
    50         .burst_bulk_in = usbdiag_burst_test_bulk_in,
    51         .burst_bulk_out = usbdiag_burst_test_bulk_out,
    52         .burst_isoch_in = usbdiag_burst_test_isoch_in,
    53         .burst_isoch_out = usbdiag_burst_test_isoch_out,
    54         .data_intr_in = usbdiag_data_test_intr_in,
    55         .data_intr_out = usbdiag_data_test_intr_out,
    56         .data_bulk_in = usbdiag_data_test_bulk_in,
    57         .data_bulk_out = usbdiag_data_test_bulk_out,
    58         .data_isoch_in = usbdiag_data_test_isoch_in,
    59         .data_isoch_out = usbdiag_data_test_isoch_out
     48        .test_in = usbdiag_dev_test_in,
     49        .test_out = usbdiag_dev_test_out,
    6050};
    6151
    … …  
    8676        } while (0);
    8777
    88         _MAP_EP(dev->intr_in, INTR_IN);
    89         _MAP_EP(dev->intr_out, INTR_OUT);
    90         _MAP_EP(dev->bulk_in, BULK_IN);
    91         _MAP_EP(dev->bulk_out, BULK_OUT);
    92         _MAP_EP(dev->isoch_in, ISOCH_IN);
    93         _MAP_EP(dev->isoch_out, ISOCH_OUT);
     78        _MAP_EP(dev->burst_intr_in, BURST_INTR_IN);
     79        _MAP_EP(dev->burst_intr_out, BURST_INTR_OUT);
     80        _MAP_EP(dev->burst_bulk_in, BURST_BULK_IN);
     81        _MAP_EP(dev->burst_bulk_out, BURST_BULK_OUT);
     82        _MAP_EP(dev->burst_isoch_in, BURST_ISOCH_IN);
     83        _MAP_EP(dev->burst_isoch_out, BURST_ISOCH_OUT);
     84        _MAP_EP(dev->data_intr_in, DATA_INTR_IN);
     85        _MAP_EP(dev->data_intr_out, DATA_INTR_OUT);
     86        _MAP_EP(dev->data_bulk_in, DATA_BULK_IN);
     87        _MAP_EP(dev->data_bulk_out, DATA_BULK_OUT);
     88        _MAP_EP(dev->data_isoch_in, DATA_ISOCH_IN);
     89        _MAP_EP(dev->data_isoch_out, DATA_ISOCH_OUT);
    9490
    9591#undef _MAP_EP
Note: See TracChangeset for help on using the changeset viewer.