Changeset db71e2a in mainline for uspace/drv/bus/usb


Ignore:
Timestamp:
2013-07-24T17:42:25Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
69b264a9
Parents:
52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

Location:
uspace/drv/bus/usb
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/ohci/hc.c

    r52f1882 rdb71e2a  
    533533        assert(instance);
    534534
    535         bzero(&instance->rh, sizeof(instance->rh));
     535        memset(&instance->rh, 0, sizeof(instance->rh));
    536536        /* Init queues */
    537537        const int ret = hc_init_transfer_lists(instance);

  • uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

    r52f1882 rdb71e2a  
    5353{
    5454        assert(instance);
    55         bzero(instance, sizeof(ed_t));
     55        memset(instance, 0, sizeof(ed_t));
    5656
    5757        if (ep == NULL) {

  • uspace/drv/bus/usb/ohci/hw_struct/hcca.h

    r52f1882 rdb71e2a  
    6868        hcca_t *hcca = memalign(256, sizeof(hcca_t));
    6969        if (hcca)
    70                 bzero(hcca, sizeof(hcca_t));
     70                memset(hcca, 0, sizeof(hcca_t));
    7171        return hcca;
    7272}

  • uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c

    r52f1882 rdb71e2a  
    5858{
    5959        assert(instance);
    60         bzero(instance, sizeof(td_t));
     60        memset(instance, 0, sizeof(td_t));
    6161        /* Set PID and Error code */
    6262        OHCI_MEM32_WR(instance->status,

  • uspace/drv/bus/usb/uhci/uhci_batch.c

    r52f1882 rdb71e2a  
    112112        CHECK_NULL_DISPOSE_RETURN(uhci_batch->device_buffer,
    113113            "Failed to allocate UHCI buffer.\n");
    114         bzero(uhci_batch->device_buffer, total_size);
     114        memset(uhci_batch->device_buffer, 0, total_size);
    115115
    116116        uhci_batch->tds = uhci_batch->device_buffer;

  • uspace/drv/bus/usb/usbhub/port.c

    r52f1882 rdb71e2a  
    141141        usb_log_debug("Interrupt at port %zu\n", port->port_number);
    142142
    143         usb_port_status_t status;
     143        usb_port_status_t status = 0;
    144144        const int opResult = get_port_status(port, &status);
    145145        if (opResult != EOK) {

  • uspace/drv/bus/usb/usbmast/scsi_ms.c

    r52f1882 rdb71e2a  
    167167         */
    168168
    169         bzero(inq_res, sizeof(*inq_res));
     169        memset(inq_res, 0, sizeof(*inq_res));
    170170
    171171        inq_res->device_type = BIT_RANGE_EXTRACT(uint8_t,

  • uspace/drv/bus/usb/vhc/hub/virthubops.c

    r52f1882 rdb71e2a  
    299299    size_t *act_size)
    300300{
    301         int rc;
     301        int rc = ENOTSUP;
    302302        size_t port = request->index - 1;
    303303        usb_hub_class_feature_t feature = request->value;
Note: See TracChangeset for help on using the changeset viewer.