Changeset 2b3dd78 in mainline for uspace/drv


Ignore:
Timestamp:
2018-01-31T12:02:00Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5595841
Parents:
a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

Location:
uspace/drv
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/audio/hdaudio/spec/regs.h

    ra0a9cc2 r2b3dd78  
    6464        /** Buffer Descriptor List Pointer - Lower */
    6565        uint32_t bdpl;
    66         /** Buffer Descriptor List Pointer - Upper */ 
     66        /** Buffer Descriptor List Pointer - Upper */
    6767        uint32_t bdpu;
    6868} hda_sdesc_regs_t;

  • uspace/drv/audio/sb16/dsp.h

    ra0a9cc2 r2b3dd78  
    8282errno_t sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *size);
    8383errno_t sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
    84   pcm_sample_format_t *format);
     84    pcm_sample_format_t *format);
    8585errno_t sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size);
    8686errno_t sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session);
    87 async_sess_t * sb_dsp_get_event_session(sb_dsp_t *dsp);
     87async_sess_t *sb_dsp_get_event_session(sb_dsp_t *dsp);
    8888errno_t sb_dsp_release_buffer(sb_dsp_t *dsp);
    8989errno_t sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,

  • uspace/drv/audio/sb16/mixer.h

    ra0a9cc2 r2b3dd78  
    5050} sb_mixer_t;
    5151
    52 const char * sb_mixer_type_str(sb_mixer_type_t type);
     52const char *sb_mixer_type_str(sb_mixer_type_t type);
    5353errno_t sb_mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, sb_mixer_type_t type);
    5454int sb_mixer_get_control_item_count(const sb_mixer_t *mixer);

  • uspace/drv/bus/isa/isa.c

    ra0a9cc2 r2b3dd78  
    279279        errno_t rc;
    280280        size_t nread;
    281         struct stat st;
     281        vfs_stat_t st;
    282282
    283283        rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);

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

    ra0a9cc2 r2b3dd78  
    4242#include <stdio.h>
    4343#include <stdlib.h>
     44#include <str.h>
    4445#include <ddf/driver.h>
    4546
    … …  
    155156        dev->descriptors = &descriptors;
    156157        dev->address = 0;
    157         dev->name = str_dup(name);
    158         if (!dev->name)
     158
     159        char *n = str_dup(name);
     160        if (!n)
    159161                return ENOMEM;
    160162
    161163        hub_t *hub = malloc(sizeof(hub_t));
    162164        if (hub == NULL) {
    163                 free(dev->name);
     165                free(n);
    164166                return ENOMEM;
    165167        }
    166168
     169        dev->name = n;
    167170        hub_init(hub);
    168171        dev->device_data = hub;

  • uspace/drv/hid/atkbd/atkbd.h

    ra0a9cc2 r2b3dd78  
    4949        chardev_t *chardev;
    5050        /** Callback connection to client */
    51         async_sess_t *client_sess; 
     51        async_sess_t *client_sess;
    5252        /** Fibril retrieving and parsing data */
    5353        fid_t polling_fibril;

  • uspace/drv/platform/amdm37x/main.c

    ra0a9cc2 r2b3dd78  
    4949typedef struct {
    5050        const char *name;
    51         match_id_t match_id;
     51        const char *id;
     52        int score;
    5253        hw_resource_list_t hw_resources;
    5354} amdm37x_fun_t;
    … …  
    133134{
    134135        .name = "ohci",
    135         .match_id = { .id = "usb/host=ohci", .score = 90 },
     136        .id = "usb/host=ohci",
     137        .score = 90,
    136138        .hw_resources = { .resources = ohci_res, .count = ARRAY_SIZE(ohci_res) }
    137139},
    138140{
    139141        .name = "ehci",
    140         .match_id = { .id = "usb/host=ehci", .score = 90 },
     142        .id = "usb/host=ehci",
     143        .score = 90,
    141144        .hw_resources = { .resources = ehci_res, .count = ARRAY_SIZE(ehci_res) }
    142145},
    143146{
    144147        .name = "fb",
    145         .match_id = { .id = "amdm37x&dispc", .score = 90 },
     148        .id = "amdm37x&dispc",
     149        .score = 90,
    146150        .hw_resources = { .resources = disp_res, .count = ARRAY_SIZE(disp_res) }
    147151},
    … …  
    174178       
    175179        /* Add match id */
    176         errno_t ret = ddf_fun_add_match_id(fnode,
    177             fun->match_id.id, fun->match_id.score);
     180        errno_t ret = ddf_fun_add_match_id(fnode, fun->id, fun->score);
    178181        if (ret != EOK) {
    179182                ddf_fun_destroy(fnode);

  • uspace/drv/test/test1/test1.c

    ra0a9cc2 r2b3dd78  
    3737#include <ddf/driver.h>
    3838#include <ddf/log.h>
     39#include <str.h>
    3940
    4041#include "test1.h"

  • uspace/drv/test/test2/test2.c

    ra0a9cc2 r2b3dd78  
    3434#include <stdio.h>
    3535#include <errno.h>
     36#include <str.h>
    3637#include <str_error.h>
    3738#include <ddf/driver.h>
Note: See TracChangeset for help on using the changeset viewer.