Changeset 827ec41 in mainline


Ignore:
Timestamp:
2011-12-29T12:50:38Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ae481e0
Parents:
f0b74b2
Message:

Fix build errors.

Location:
uspace/drv
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    rf0b74b2 r827ec41  
    226226                fibril_mutex_lock(&instance->guard);
    227227                assert(instance->unfinished_interrupt_transfer == NULL);
    228                 const uint16_t mask = create_interrupt_mask(instance);
     228                uint16_t mask = create_interrupt_mask(instance);
    229229                if (mask == 0) {
    230230                        usb_log_debug("No changes...\n");
    … …  
    257257        if (instance->unfinished_interrupt_transfer) {
    258258                usb_log_debug("Finalizing interrupt transfer\n");
    259                 const uint16_t mask = create_interrupt_mask(instance);
     259                uint16_t mask = create_interrupt_mask(instance);
    260260                interrupt_request(instance->unfinished_interrupt_transfer,
    261261                    mask, instance->interrupt_mask_size);
    … …  
    278278
    279279        /* 7 bytes + 2 port bit fields (port count + global bit) */
    280         const size_t size = 7 + (instance->interrupt_mask_size * 2);
     280        size_t size = 7 + (instance->interrupt_mask_size * 2);
    281281        assert(size <= HUB_DESCRIPTOR_MAX_SIZE);
    282282        instance->hub_descriptor_size = size;
    283283
    284         const uint32_t hub_desc = instance->registers->rh_desc_a;
    285         const uint32_t port_desc = instance->registers->rh_desc_b;
     284        uint32_t hub_desc = instance->registers->rh_desc_a;
     285        uint32_t port_desc = instance->registers->rh_desc_b;
    286286
    287287        /* bDescLength */
    … …  
    394394
    395395
    396         const usb_device_request_setup_packet_t *request_packet =
     396        usb_device_request_setup_packet_t *request_packet =
    397397            (usb_device_request_setup_packet_t*)request->setup_buffer;
    398398
    … …  
    406406                        TRANSFER_END(request, EOVERFLOW);
    407407                } else {
    408                         const uint32_t data = instance->registers->rh_status &
     408                        uint32_t data = instance->registers->rh_status &
    409409                            (RHS_LPS_FLAG | RHS_LPSC_FLAG
    410410                                | RHS_OCI_FLAG | RHS_OCIC_FLAG);
    … …  
    420420                        TRANSFER_END(request, EOVERFLOW);
    421421                } else {
    422                         const unsigned port = request_packet->index;
     422                        unsigned port = request_packet->index;
    423423                        if (port < 1 || port > instance->port_count)
    424424                                TRANSFER_END(request, EINVAL);
    425425
    426                         const uint32_t data =
     426                        uint32_t data =
    427427                            instance->registers->rh_port_status[port - 1];
    428428                        TRANSFER_END_DATA(request, &data, sizeof(data));
    … …  
    434434                        TRANSFER_END(request, EOVERFLOW);
    435435                } else {
    436                         static const uint16_t data =
     436                        uint16_t data =
    437437                            uint16_host2usb(USB_DEVICE_STATUS_SELF_POWERED);
    438438                        TRANSFER_END_DATA(request, &data, sizeof(data));
    … …  
    455455                } else {
    456456                        /* Endpoints are OK. (We don't halt) */
    457                         static const uint16_t data = 0;
     457                        uint16_t data = 0;
    458458                        TRANSFER_END_DATA(request, &data, sizeof(data));
    459459                }
    … …  
    480480        assert(request);
    481481
    482         const usb_device_request_setup_packet_t *setup_request =
     482        usb_device_request_setup_packet_t *setup_request =
    483483            (usb_device_request_setup_packet_t *) request->setup_buffer;
    484         const uint16_t setup_request_value = setup_request->value_high;
     484        uint16_t setup_request_value = setup_request->value_high;
    485485        switch (setup_request_value)
    486486        {
    … …  
    648648        assert(request);
    649649
    650         const usb_device_request_setup_packet_t *setup_request =
     650        usb_device_request_setup_packet_t *setup_request =
    651651            (usb_device_request_setup_packet_t *) request->setup_buffer;
    652652        switch (setup_request->request_type)
    … …  
    654654        case USB_HUB_REQ_TYPE_SET_PORT_FEATURE:
    655655                usb_log_debug("USB_HUB_REQ_TYPE_SET_PORT_FEATURE\n");
    656                 const int ret = set_feature_port(instance,
     656                int ret = set_feature_port(instance,
    657657                    setup_request->value, setup_request->index);
    658658                TRANSFER_END(request, ret);
    … …  
    686686        assert(request);
    687687
    688         const usb_device_request_setup_packet_t *setup_request =
     688        usb_device_request_setup_packet_t *setup_request =
    689689            (usb_device_request_setup_packet_t *) request->setup_buffer;
    690690
    … …  
    693693        case USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE:
    694694                usb_log_debug("USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE\n");
    695                 const int ret = clear_feature_port(instance,
     695                int ret = clear_feature_port(instance,
    696696                    setup_request->value, setup_request->index);
    697697                TRANSFER_END(request, ret);
    … …  
    753753        usb_log_debug2("CTRL packet: %s.\n",
    754754            usb_debug_str_buffer((uint8_t *) request->setup_buffer, 8, 8));
    755         const usb_device_request_setup_packet_t *setup_request =
     755        usb_device_request_setup_packet_t *setup_request =
    756756            (usb_device_request_setup_packet_t *) request->setup_buffer;
    757757        switch (setup_request->request)
    … …  
    771771                if (request->buffer_size == 0)
    772772                        TRANSFER_END(request, EOVERFLOW);
    773                 static const uint8_t config = 1;
     773                uint8_t config = 1;
    774774                TRANSFER_END_DATA(request, &config, sizeof(config));
    775775

  • uspace/drv/infrastructure/rootmac/rootmac.c

    rf0b74b2 r827ec41  
    161161
    162162static hw_res_ops_t fun_hw_res_ops = {
    163         &rootmac_get_resources,
    164         &rootmac_enable_interrupt
     163        .get_resource_list = &rootmac_get_resources,
     164        .enable_interrupt = &rootmac_enable_interrupt
    165165};
    166166
Note: See TracChangeset for help on using the changeset viewer.