Changeset 77a194c in mainline for uspace/srv


Ignore:
Timestamp:
2015-11-04T18:55:46Z (10 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
44183b98
Parents:
5265eea4 (diff), bfcde8d (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 new disk partitioning architecture.

Location:
uspace/srv
Files:
10 added
2 deleted
1 edited
4 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/bd/vbd/Makefile

    r5265eea4 r77a194c  
    11#
    2 # Copyright (c) 2010 Jiri Svoboda
     2# Copyright (c) 2015 Jiri Svoboda
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
    29 USPACE_PREFIX = ../../../..
    30 LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    31 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
     29USPACE_PREFIX = ../../..
    3230
    33 # Correct name is 'guid_part' but must use this because of FAT 8.3 names.
    34 BINARY = g_part
     31LIBS = \
     32        $(LIBLABEL_PREFIX)/liblabel.a \
     33        $(LIBBLOCK_PREFIX)/libblock.a
     34
     35EXTRA_CFLAGS = \
     36        -I$(LIBLABEL_PREFIX)/include \
     37        -I$(LIBBLOCK_PREFIX)
     38
     39BINARY = vbd
    3540
    3641SOURCES = \
    37         guid_part.c
     42        disk.c \
     43        vbd.c
    3844
    3945include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/locsrv/locsrv.c

    r5265eea4 r77a194c  
    13171317        categ_dir_add_cat(&cdir, cat);
    13181318
     1319        cat = category_new("disk");
     1320        categ_dir_add_cat(&cdir, cat);
     1321
     1322        cat = category_new("partition");
     1323        categ_dir_add_cat(&cdir, cat);
     1324
    13191325        cat = category_new("iplink");
    13201326        categ_dir_add_cat(&cdir, cat);

  • uspace/srv/volsrv/Makefile

    r5265eea4 r77a194c  
    11#
    2 # Copyright (c) 2005 Martin Decky
    3 # Copyright (c) 2007 Jakub Jermar
     2# Copyright (c) 2015 Jiri Svoboda
    43# All rights reserved.
    54#
    … …  
    2827#
    2928
    30 USPACE_PREFIX = ../../../..
     29USPACE_PREFIX = ../..
     30
    3131LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
    33 BINARY = mbr_part
     32EXTRA_CFLAGS = -I $(LIBBLOCK_PREFIX)
     33
     34BINARY = volsrv
    3435
    3536SOURCES = \
    36         mbr_part.c
     37        empty.c \
     38        mkfs.c \
     39        part.c \
     40        volsrv.c
    3741
    3842include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/volsrv/empty.h

    r5265eea4 r77a194c  
    11/*
    2  * Copyright (c) 2012-2013 Dominik Taborsky
     2 * Copyright (c) 2015 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup hdisk
     29/** @addtogroup volsrv
    3030 * @{
    3131 */
    32 /** @file
     32/**
     33 * @file
     34 * @brief
    3335 */
    3436
    35 #ifndef __FUNC_GPT_H__
    36 #define __FUNC_GPT_H__
     37#ifndef EMPTY_H_
     38#define EMPTY_H_
    3739
    3840#include <loc.h>
    39 #include <tinput.h>
    40 #include <libgpt.h>
    41 #include "common.h"
    4241
    43 extern int construct_gpt_label(label_t *);
    44 extern int add_gpt_part(label_t *, tinput_t *);
    45 extern int delete_gpt_part(label_t *, tinput_t *);
    46 extern int destroy_gpt_label(label_t *);
    47 extern int new_gpt_label(label_t *);
    48 extern int print_gpt_parts(label_t *);
    49 extern int read_gpt_parts(label_t *);
    50 extern int write_gpt_parts(label_t *);
    51 extern int extra_gpt_funcs(label_t *, tinput_t *);
     42extern int volsrv_part_is_empty(service_id_t, bool *);
     43extern int volsrv_part_empty(service_id_t);
    5244
    5345#endif
     46
     47/** @}
     48 */

  • uspace/srv/volsrv/part.h

    r5265eea4 r77a194c  
    11/*
    2  * Copyright (c) 2012-2013 Dominik Taborsky
     2 * Copyright (c) 2015 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup hdisk
     29/** @addtogroup volsrv
    3030 * @{
    3131 */
    32 /** @file
     32/**
     33 * @file
     34 * @brief
    3335 */
    3436
    35 #ifndef __FUNC_MBR_H__
    36 #define __FUNC_MBR_H__
     37#ifndef PART_H_
     38#define PART_H_
    3739
    3840#include <loc.h>
    39 #include <tinput.h>
    40 #include <libmbr.h>
    41 #include "common.h"
     41#include <sys/types.h>
     42#include <types/vol.h>
     43#include "types/part.h"
    4244
    43 extern int construct_mbr_label(label_t *);
    44 extern int add_mbr_part(label_t *, tinput_t *);
    45 extern int delete_mbr_part(label_t *, tinput_t *);
    46 extern int destroy_mbr_label(label_t *);
    47 extern int new_mbr_label(label_t *);
    48 extern int print_mbr_parts(label_t *);
    49 extern int read_mbr_parts(label_t *);
    50 extern int write_mbr_parts(label_t *);
    51 extern int extra_mbr_funcs(label_t *, tinput_t *);
     45extern int vol_part_init(void);
     46extern int vol_part_discovery_start(void);
     47extern int vol_part_add(service_id_t);
     48extern int vol_part_get_ids(service_id_t *, size_t, size_t *);
     49extern int vol_part_find_by_id(service_id_t, vol_part_t **);
     50extern int vol_part_empty_part(vol_part_t *);
     51extern int vol_part_mkfs_part(vol_part_t *, vol_fstype_t);
     52extern int vol_part_get_info(vol_part_t *, vol_part_info_t *);
    5253
    5354#endif
     55
     56/** @}
     57 */
Note: See TracChangeset for help on using the changeset viewer.