Changeset 2b3dd78 in mainline for uspace/srv


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/srv
Files:
39 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/audio/hound/audio_data.c

    ra0a9cc2 r2b3dd78  
    3636#include <macros.h>
    3737#include <stdlib.h>
     38#include <str.h>
    3839
    3940#include "audio_data.h"
    … …  
    5051    pcm_format_t format)
    5152{
    52         audio_data_t *adata = malloc(sizeof(audio_data_t));
     53        audio_data_t *adata = malloc(sizeof(audio_data_t) + size);
    5354        if (adata) {
    5455                unsigned overflow = size % pcm_format_frame_size(&format);
    … …  
    5657                        log_warning("Data not a multiple of frame size, "
    5758                            "clipping.");
    58 
    59                 adata->data = data;
     59                uint8_t *d = ((uint8_t *)adata) + offsetof(audio_data_t, data);
     60                memcpy(d, data, size);
    6061                adata->size = size - overflow;
    6162                adata->format = format;
    … …  
    8687        atomic_count_t refc = atomic_predec(&adata->refcount);
    8788        if (refc == 0) {
    88                 free(adata->data);
    8989                free(adata);
    9090        }

  • uspace/srv/audio/hound/audio_data.h

    ra0a9cc2 r2b3dd78  
    4545/** Reference counted audio buffer */
    4646typedef struct {
    47         /** Audio data */
    48         const void *data;
    4947        /** Size of the buffer pointer to by data */
    5048        size_t size;
    … …  
    5351        /** Reference counter */
    5452        atomic_t refcount;
     53        /** Audio data */
     54        const uint8_t data[];
    5555} audio_data_t;
    5656

  • uspace/srv/audio/hound/audio_sink.h

    ra0a9cc2 r2b3dd78  
    5454        list_t connections;
    5555        /** Sink's name */
    56         const char *name;
     56        char *name;
    5757        /** Consumes data in this format */
    5858        pcm_format_t format;

  • uspace/srv/audio/hound/audio_source.c

    ra0a9cc2 r2b3dd78  
    9696 * @return Error code.
    9797 */
    98 errno_t audio_source_push_data(audio_source_t *source, const void *data,
     98errno_t audio_source_push_data(audio_source_t *source, void *data,
    9999    size_t size)
    100100{

  • uspace/srv/audio/hound/audio_source.h

    ra0a9cc2 r2b3dd78  
    4949        list_t connections;
    5050        /** String identifier */
    51         const char *name;
     51        char *name;
    5252        /** audio data format */
    5353        pcm_format_t format;
    … …  
    7575    const pcm_format_t *f);
    7676void audio_source_fini(audio_source_t *source);
    77 errno_t audio_source_push_data(audio_source_t *source, const void *data,
     77errno_t audio_source_push_data(audio_source_t *source, void *data,
    7878    size_t size);
    7979static inline const pcm_format_t *audio_source_format(const audio_source_t *s)

  • uspace/srv/audio/hound/hound.c

    ra0a9cc2 r2b3dd78  
    3737#include <assert.h>
    3838#include <stdlib.h>
     39#include <str.h>
    3940
    4041#include "hound.h"
    … …  
    413414 * @return Error code.
    414415 */
    415 errno_t hound_list_sources(hound_t *hound, const char ***list, size_t *size)
     416errno_t hound_list_sources(hound_t *hound, char ***list, size_t *size)
    416417{
    417418        assert(hound);
    … …  
    427428                return EOK;
    428429        }
    429         const char **names = calloc(count, sizeof(char *));
     430        char **names = calloc(count, sizeof(char *));
    430431        errno_t ret = names ? EOK : ENOMEM;
    431432        for (unsigned long i = 0; i < count && ret == EOK; ++i) {
    … …  
    455456 * @return Error code.
    456457 */
    457 errno_t hound_list_sinks(hound_t *hound, const char ***list, size_t *size)
     458errno_t hound_list_sinks(hound_t *hound, char ***list, size_t *size)
    458459{
    459460        assert(hound);
    … …  
    469470                return EOK;
    470471        }
    471         const char **names = calloc(count, sizeof(char *));
     472        char **names = calloc(count, sizeof(char *));
    472473        errno_t ret = names ? EOK : ENOMEM;
    473474        for (size_t i = 0; i < count && ret == EOK; ++i) {

  • uspace/srv/audio/hound/hound.h

    ra0a9cc2 r2b3dd78  
    7070hound_ctx_t *hound_get_ctx_by_id(hound_t *hound, hound_context_id_t id);
    7171
    72 errno_t hound_add_device(hound_t *hound, service_id_t id, const char* name);
     72errno_t hound_add_device(hound_t *hound, service_id_t id, const char *name);
    7373errno_t hound_add_source(hound_t *hound, audio_source_t *source);
    7474errno_t hound_add_sink(hound_t *hound, audio_sink_t *sink);
    75 errno_t hound_list_sources(hound_t *hound, const char ***list, size_t *size);
    76 errno_t hound_list_sinks(hound_t *hound, const char ***list, size_t *size);
     75errno_t hound_list_sources(hound_t *hound, char ***list, size_t *size);
     76errno_t hound_list_sinks(hound_t *hound, char ***list, size_t *size);
    7777errno_t hound_list_connections(hound_t *hound, const char ***sources,
    7878    const char ***sinks, size_t *size);
    7979errno_t hound_remove_source(hound_t *hound, audio_source_t *source);
    8080errno_t hound_remove_sink(hound_t *hound, audio_sink_t *sink);
    81 errno_t hound_connect(hound_t *hound, const char* source_name, const char* sink_name);
    82 errno_t hound_disconnect(hound_t *hound, const char* source_name, const char* sink_name);
     81errno_t hound_connect(hound_t *hound, const char *source_name, const char *sink_name);
     82errno_t hound_disconnect(hound_t *hound, const char *source_name, const char *sink_name);
    8383
    8484#endif

  • uspace/srv/audio/hound/hound_ctx.h

    ra0a9cc2 r2b3dd78  
    6969
    7070hound_ctx_stream_t *hound_ctx_create_stream(hound_ctx_t *ctx, int flags,
    71         pcm_format_t format, size_t buffer_size);
     71    pcm_format_t format, size_t buffer_size);
    7272void hound_ctx_destroy_stream(hound_ctx_stream_t *stream);
    7373

  • uspace/srv/audio/hound/iface.c

    ra0a9cc2 r2b3dd78  
    8686}
    8787
    88 static errno_t iface_get_list(void *server, const char ***list, size_t *size,
     88static errno_t iface_get_list(void *server, char ***list, size_t *size,
    8989    const char *connection, int flags)
    9090{

  • uspace/srv/bd/file_bd/file_bd.c

    ra0a9cc2 r2b3dd78  
    5252#include <task.h>
    5353#include <macros.h>
     54#include <str.h>
    5455
    5556#define NAME "file_bd"

  • uspace/srv/bd/vbd/disk.h

    ra0a9cc2 r2b3dd78  
    5252extern errno_t vbds_label_delete(service_id_t);
    5353extern errno_t vbds_part_get_info(vbds_part_id_t, vbd_part_info_t *);
    54 extern errno_t vbds_part_create(service_id_t, vbd_part_spec_t *,vbds_part_id_t *);
     54extern errno_t vbds_part_create(service_id_t, vbd_part_spec_t *, vbds_part_id_t *);
    5555extern errno_t vbds_part_delete(vbds_part_id_t);
    5656extern errno_t vbds_suggest_ptype(service_id_t, label_pcnt_t, label_ptype_t *);

  • uspace/srv/devman/devman.h

    ra0a9cc2 r2b3dd78  
    8080        char *name;
    8181        /** Path to the driver's binary. */
    82         const char *binary_path;
     82        char *binary_path;
    8383        /** List of device ids for device-to-driver matching. */
    8484        match_id_list_t match_ids;

  • uspace/srv/devman/driver.c

    ra0a9cc2 r2b3dd78  
    140140       
    141141        /* Check whether the driver's binary exists. */
    142         struct stat s;
     142        vfs_stat_t s;
    143143        if (vfs_stat_path(drv->binary_path, &s) != EOK) {
    144144                log_msg(LOG_DEFAULT, LVL_ERROR, "Driver not found at path `%s'.",

  • uspace/srv/devman/match.c

    ra0a9cc2 r2b3dd78  
    200200        int fd;
    201201        size_t len = 0;
    202         struct stat st;
     202        vfs_stat_t st;
    203203       
    204204        errno_t rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);

  • uspace/srv/fs/cdfs/cdfs.c

    ra0a9cc2 r2b3dd78  
    4444#include <stdio.h>
    4545#include <libfs.h>
     46#include <str.h>
    4647#include "cdfs.h"
    4748#include "cdfs_ops.h"

  • uspace/srv/fs/exfat/exfat.c

    ra0a9cc2 r2b3dd78  
    4747#include <stdio.h>
    4848#include <libfs.h>
     49#include <str.h>
    4950#include "../../vfs/vfs.h"
    5051

  • uspace/srv/fs/exfat/exfat_bitmap.h

    ra0a9cc2 r2b3dd78  
    4242struct exfat_bs;
    4343
    44 extern errno_t exfat_bitmap_alloc_clusters(struct exfat_bs *, service_id_t, 
     44extern errno_t exfat_bitmap_alloc_clusters(struct exfat_bs *, service_id_t,
    4545    exfat_cluster_t *, exfat_cluster_t);
    46 extern errno_t exfat_bitmap_append_clusters(struct exfat_bs *, struct exfat_node *, 
     46extern errno_t exfat_bitmap_append_clusters(struct exfat_bs *, struct exfat_node *,
    4747    exfat_cluster_t);
    48 extern errno_t exfat_bitmap_free_clusters(struct exfat_bs *, struct exfat_node *, 
     48extern errno_t exfat_bitmap_free_clusters(struct exfat_bs *, struct exfat_node *,
    4949    exfat_cluster_t);
    50 extern errno_t exfat_bitmap_replicate_clusters(struct exfat_bs *, struct exfat_node *); 
     50extern errno_t exfat_bitmap_replicate_clusters(struct exfat_bs *, struct exfat_node *);
    5151
    5252extern errno_t exfat_bitmap_is_free(struct exfat_bs *, service_id_t, exfat_cluster_t);
    5353extern errno_t exfat_bitmap_set_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t);
    54 extern errno_t exfat_bitmap_clear_cluster(struct exfat_bs *, service_id_t, 
     54extern errno_t exfat_bitmap_clear_cluster(struct exfat_bs *, service_id_t,
    5555    exfat_cluster_t);
    5656
    57 extern errno_t exfat_bitmap_set_clusters(struct exfat_bs *, service_id_t, 
     57extern errno_t exfat_bitmap_set_clusters(struct exfat_bs *, service_id_t,
    5858    exfat_cluster_t, exfat_cluster_t);
    59 extern errno_t exfat_bitmap_clear_clusters(struct exfat_bs *, service_id_t, 
     59extern errno_t exfat_bitmap_clear_clusters(struct exfat_bs *, service_id_t,
    6060    exfat_cluster_t, exfat_cluster_t);
    6161

  • uspace/srv/fs/exfat/exfat_directory.h

    ra0a9cc2 r2b3dd78  
    2929/** @addtogroup fs
    3030 * @{
    31  */ 
     31 */
    3232
    3333#ifndef EXFAT_EXFAT_DIRECTORY_H_
    … …  
    6666extern errno_t exfat_directory_find(exfat_directory_t *, exfat_dentry_clsf_t,
    6767    exfat_dentry_t **);
    68 extern errno_t exfat_directory_find_continue(exfat_directory_t *, 
     68extern errno_t exfat_directory_find_continue(exfat_directory_t *,
    6969    exfat_dentry_clsf_t, exfat_dentry_t **);
    7070

  • uspace/srv/fs/exfat/exfat_fat.h

    ra0a9cc2 r2b3dd78  
    6161    exfat_cluster_walk((bs), (sid), (fc), NULL, (numc), (uint32_t) -1)
    6262
    63 extern errno_t exfat_cluster_walk(struct exfat_bs *, service_id_t, 
     63extern errno_t exfat_cluster_walk(struct exfat_bs *, service_id_t,
    6464    exfat_cluster_t, exfat_cluster_t *, uint32_t *, uint32_t);
    6565extern errno_t exfat_block_get(block_t **, struct exfat_bs *, struct exfat_node *,

  • uspace/srv/fs/ext4fs/ext4fs.c

    ra0a9cc2 r2b3dd78  
    4242#include <task.h>
    4343#include <ipc/services.h>
     44#include <str.h>
    4445#include "ext4/ops.h"
    4546#include "../../vfs/vfs.h"

  • uspace/srv/fs/fat/fat.c

    ra0a9cc2 r2b3dd78  
    4747#include <stdio.h>
    4848#include <libfs.h>
     49#include <str.h>
    4950#include "../../vfs/vfs.h"
    5051

  • uspace/srv/fs/fat/fat_directory.h

    ra0a9cc2 r2b3dd78  
    2929/** @addtogroup fs
    3030 * @{
    31  */ 
     31 */
    3232
    3333#ifndef FAT_FAT_DIRECTORY_H_

  • uspace/srv/fs/locfs/locfs.c

    ra0a9cc2 r2b3dd78  
    4747#include <task.h>
    4848#include <libfs.h>
     49#include <str.h>
    4950#include "locfs.h"
    5051#include "locfs_ops.h"

  • uspace/srv/fs/locfs/locfs.h

    ra0a9cc2 r2b3dd78  
    2929/** @addtogroup fs
    3030 * @{
    31  */ 
     31 */
    3232
    3333#ifndef LOCFS_LOCFS_H_

  • uspace/srv/fs/mfs/mfs_dentry.c

    ra0a9cc2 r2b3dd78  
    3131 */
    3232
     33#include <str.h>
    3334#include "mfs.h"
    3435

  • uspace/srv/fs/mfs/mfs_ops.c

    ra0a9cc2 r2b3dd78  
    3636#include <adt/hash_table.h>
    3737#include <adt/hash.h>
     38#include <str.h>
    3839#include "mfs.h"
    3940

  • uspace/srv/fs/tmpfs/tmpfs.c

    ra0a9cc2 r2b3dd78  
    5050#include <task.h>
    5151#include <libfs.h>
     52#include <str.h>
    5253#include "../../vfs/vfs.h"
    5354

  • uspace/srv/hid/console/console.c

    ra0a9cc2 r2b3dd78  
    5151#include <fibril_synch.h>
    5252#include <stdlib.h>
     53#include <str.h>
    5354#include "console.h"
    5455

  • uspace/srv/hid/input/input.c

    ra0a9cc2 r2b3dd78  
    5454#include <stdio.h>
    5555#include <stdlib.h>
     56#include <str.h>
    5657#include <str_error.h>
    5758

  • uspace/srv/hid/isdv4_tablet/isdv4.h

    ra0a9cc2 r2b3dd78  
    7474
    7575typedef enum {
    76         UNKNOWN, PRESS, RELEASE, PROXIMITY_IN, PROXIMITY_OUT, MOVE
     76        UNKNOWN,
     77        PRESS,
     78        RELEASE,
     79        PROXIMITY_IN,
     80        PROXIMITY_OUT,
     81        MOVE
    7782} isdv4_event_type_t;
    7883
    7984typedef enum {
    80         STYLUS_TIP, STYLUS_ERASER, TOUCH
     85        STYLUS_TIP,
     86        STYLUS_ERASER,
     87        TOUCH
    8188} isdv4_source_type_t;
    8289

  • uspace/srv/hid/isdv4_tablet/main.c

    ra0a9cc2 r2b3dd78  
    3535#include <stddef.h>
    3636#include <stdio.h>
     37#include <str.h>
    3738#include <task.h>
    3839

  • uspace/srv/hid/output/output.h

    ra0a9cc2 r2b3dd78  
    4242
    4343typedef struct {
    44         errno_t (* yield)(struct outdev *dev);
    45         errno_t (* claim)(struct outdev *dev);
     44        errno_t (*yield)(struct outdev *dev);
     45        errno_t (*claim)(struct outdev *dev);
    4646       
    47         void (* get_dimensions)(struct outdev *dev, sysarg_t *cols,
     47        void (*get_dimensions)(struct outdev *dev, sysarg_t *cols,
    4848            sysarg_t *rows);
    49         console_caps_t (* get_caps)(struct outdev *dev);
     49        console_caps_t (*get_caps)(struct outdev *dev);
    5050       
    51         void (* cursor_update)(struct outdev *dev, sysarg_t prev_col,
     51        void (*cursor_update)(struct outdev *dev, sysarg_t prev_col,
    5252            sysarg_t prev_row, sysarg_t col, sysarg_t row, bool visible);
    53         void (* char_update)(struct outdev *dev, sysarg_t col, sysarg_t row);
    54         void (* flush)(struct outdev *dev);
     53        void (*char_update)(struct outdev *dev, sysarg_t col, sysarg_t row);
     54        void (*flush)(struct outdev *dev);
    5555} outdev_ops_t;
    5656

  • uspace/srv/hid/output/proto/vt100.h

    ra0a9cc2 r2b3dd78  
    3535#include <io/charfield.h>
    3636
    37 typedef void (* vt100_putchar_t)(wchar_t ch);
    38 typedef void (* vt100_control_puts_t)(const char *str);
    39 typedef void (* vt100_flush_t)(void);
     37typedef void (*vt100_putchar_t)(wchar_t ch);
     38typedef void (*vt100_control_puts_t)(const char *str);
     39typedef void (*vt100_flush_t)(void);
    4040
    4141typedef struct {

  • uspace/srv/hid/remcons/remcons.c

    ra0a9cc2 r2b3dd78  
    4949#include <io/console.h>
    5050#include <inttypes.h>
     51#include <str.h>
    5152#include "telnet.h"
    5253#include "user.h"

  • uspace/srv/hid/rfb/main.c

    ra0a9cc2 r2b3dd78  
    3535#include <inttypes.h>
    3636#include <io/log.h>
     37#include <str.h>
    3738#include <task.h>
    3839

  • uspace/srv/net/dhcp/dhcp.c

    ra0a9cc2 r2b3dd78  
    4848#include <stdio.h>
    4949#include <stdlib.h>
     50#include <str.h>
    5051
    5152#include "dhcp.h"

  • uspace/srv/net/dnsrsrv/dnsrsrv.c

    ra0a9cc2 r2b3dd78  
    4343#include <stdio.h>
    4444#include <stdlib.h>
     45#include <str.h>
    4546#include <task.h>
    4647

  • uspace/srv/net/loopip/loopip.c

    ra0a9cc2 r2b3dd78  
    4545#include <stdio.h>
    4646#include <stdlib.h>
     47#include <str.h>
    4748#include <task.h>
    4849

  • uspace/srv/net/tcp/ncsim.c

    ra0a9cc2 r2b3dd78  
    8181        return;
    8282
    83         if (0 /*random() % 4 == 3*/) {
     83        if (0 /*rand() % 4 == 3*/) {
    8484                /* Drop segment */
    8585                log_msg(LOG_DEFAULT, LVL_ERROR, "NCSim dropping segment");
    … …  
    9494        }
    9595
    96         sqe->delay = random() % (1000 * 1000);
     96        sqe->delay = rand() % (1000 * 1000);
    9797        sqe->epp = *epp;
    9898        sqe->seg = seg;
Note: See TracChangeset for help on using the changeset viewer.