Changeset cf02eaf in mainline


Ignore:
Timestamp:
2013-08-22T16:01:19Z (11 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5b1adf5
Parents:
a6bdccc
Message:

small cstyle changes (mostly reverting to the state before audio merge)

Location:
uspace
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/device/hw_res.c

    ra6bdccc rcf02eaf  
    4242{
    4343        sysarg_t count = 0;
    44 
     44       
    4545        async_exch_t *exch = async_exchange_begin(sess);
    4646        if (exch == NULL)
    … …  
    4848        int rc = async_req_1_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
    4949            HW_RES_GET_RESOURCE_LIST, &count);
    50 
     50       
    5151        if (rc != EOK) {
    5252                async_exchange_end(exch);
    5353                return rc;
    5454        }
    55 
     55       
    5656        size_t size = count * sizeof(hw_resource_t);
    5757        hw_resource_t *resources = (hw_resource_t *) malloc(size);
    … …  
    6161                return ENOMEM;
    6262        }
    63 
     63       
    6464        rc = async_data_read_start(exch, resources, size);
    6565        async_exchange_end(exch);
    66 
     66       
    6767        if (rc != EOK) {
    6868                free(resources);
    6969                return rc;
    7070        }
    71 
     71       
    7272        hw_resources->resources = resources;
    7373        hw_resources->count = count;
    74 
     74       
    7575        return EOK;
    7676}
    … …  
    8484            HW_RES_ENABLE_INTERRUPT);
    8585        async_exchange_end(exch);
    86 
     86       
    8787        return (rc == EOK);
    8888}

  • uspace/lib/c/generic/device/hw_res_parsed.c

    ra6bdccc rcf02eaf  
    175175        for (size_t i = 0; i < res_count; ++i) {
    176176                const hw_resource_t *resource = &(hw_resources->resources[i]);
    177 
     177               
    178178                switch (resource->type) {
    179179                case INTERRUPT:
    … …  
    195195                }
    196196        }
    197 
     197       
    198198        return EOK;
    199199};

  • uspace/lib/c/include/device/hw_res_parsed.h

    ra6bdccc rcf02eaf  
    139139}
    140140
    141 extern int hw_res_list_parse(
    142     const hw_resource_list_t *, hw_res_list_parsed_t *, int);
     141extern int hw_res_list_parse(const hw_resource_list_t *,
     142    hw_res_list_parsed_t *, int);
    143143extern int hw_res_get_list_parsed(async_sess_t *, hw_res_list_parsed_t *, int);
    144144

  • uspace/lib/c/include/ipc/dev_iface.h

    ra6bdccc rcf02eaf  
    3737        HW_RES_DEV_IFACE = 0,
    3838
    39         /** Audio device mixer interface */
    40         AUDIO_MIXER_IFACE,
    41         /** Audio device pcm buffer interface */
    42         AUDIO_PCM_BUFFER_IFACE,
    43 
    4439        /** Character device interface */
    4540        CHAR_DEV_IFACE,
    … …  
    4742        /** Graphic device interface */
    4843        GRAPH_DEV_IFACE,
     44
     45        /** Audio device mixer interface */
     46        AUDIO_MIXER_IFACE,
     47        /** Audio device pcm buffer interface */
     48        AUDIO_PCM_BUFFER_IFACE,
    4949       
    5050        /** Network interface controller interface */
    … …  
    6060        /** Interface provided by USB HID devices. */
    6161        USBHID_DEV_IFACE,
     62
    6263        /** Interface provided by Real Time Clock devices */
    6364        CLOCK_DEV_IFACE,
     65
    6466        /** Interface provided by battery powered devices */
    6567        BATTERY_DEV_IFACE,
     68
    6669        /** Interface provided by AHCI devices. */
    6770        AHCI_DEV_IFACE,

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

    ra6bdccc rcf02eaf  
    6767                [CLOCK_DEV_IFACE] = &remote_clock_dev_iface,
    6868                [BATTERY_DEV_IFACE] = &remote_battery_dev_iface,
    69                 [AHCI_DEV_IFACE] = &remote_ahci_iface,
     69                [AHCI_DEV_IFACE] = &remote_ahci_iface
    7070        }
    7171};

  • uspace/lib/softfloat/softfloat.c

    ra6bdccc rcf02eaf  
    12651265}
    12661266
    1267 
    12681267float __aeabi_i2f(int i)
    12691268{

  • uspace/srv/hid/compositor/compositor.c

    ra6bdccc rcf02eaf  
    22072207       
    22082208        if (list_empty(&viewport_list)) {
    2209                 printf("%s: Failed to get view ports.\n", NAME);
     2209                printf("%s: Failed to get viewports.\n", NAME);
    22102210                input_disconnect();
    22112211                return -1;
Note: See TracChangeset for help on using the changeset viewer.