Changeset 22fb7ab in mainline for uspace/lib/fdisk/include


Ignore:
Timestamp:
2015-06-26T16:15:31Z (11 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
28ed0d95
Parents:
1356f85a
Message:

Delegate disks to volsrv and labels to vbd.

Location:
uspace/lib/fdisk/include
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/fdisk/include/fdisk.h

    r1356f85a r22fb7ab  
    4040#include <types/fdisk.h>
    4141
    42 extern int fdisk_dev_list_get(fdisk_dev_list_t **);
     42extern int fdisk_create(fdisk_t **);
     43extern void fdisk_destroy(fdisk_t *);
     44extern int fdisk_dev_list_get(fdisk_t *, fdisk_dev_list_t **);
    4345extern void fdisk_dev_list_free(fdisk_dev_list_t *);
    4446extern fdisk_dev_info_t *fdisk_dev_first(fdisk_dev_list_t *);
    … …  
    4850extern int fdisk_dev_info_capacity(fdisk_dev_info_t *, fdisk_cap_t *);
    4951
    50 extern int fdisk_dev_open(service_id_t, fdisk_dev_t **);
     52extern int fdisk_dev_open(fdisk_t *, service_id_t, fdisk_dev_t **);
    5153extern void fdisk_dev_close(fdisk_dev_t *);
    5254extern int fdisk_dev_get_svcname(fdisk_dev_t *, char **);
    … …  
    5456
    5557extern int fdisk_label_get_info(fdisk_dev_t *, fdisk_label_info_t *);
    56 extern int fdisk_label_create(fdisk_dev_t *, fdisk_label_type_t);
     58extern int fdisk_label_create(fdisk_dev_t *, label_type_t);
    5759extern int fdisk_label_destroy(fdisk_dev_t *);
    5860
    … …  
    6870extern int fdisk_cap_format(fdisk_cap_t *, char **);
    6971extern int fdisk_cap_parse(const char *, fdisk_cap_t *);
    70 extern int fdisk_ltype_format(fdisk_label_type_t, char **);
     72extern int fdisk_ltype_format(label_type_t, char **);
    7173extern int fdisk_fstype_format(fdisk_fstype_t, char **);
    7274

  • uspace/lib/fdisk/include/types/fdisk.h

    r1356f85a r22fb7ab  
    4040#include <loc.h>
    4141#include <stdint.h>
     42#include <types/label.h>
     43#include <vol.h>
    4244
    4345typedef enum {
    … …  
    9597} fdisk_dev_info_t;
    9698
    97 /** Fdisk label type */
    98 typedef enum {
    99         /** None */
    100         fdl_none = 0,
    101         /** Unknown */
    102         fdl_unknown,
    103         /** BIOS Master Boot Record */
    104         fdl_mbr,
    105         /** UEFI GUID Partition Table */
    106         fdl_gpt
    107 } fdisk_label_type_t;
    108 
    109 /** Highest label type + 1 */
    110 #define FDL_LIMIT (fdl_gpt + 1)
    111 /** Lowest label type allowed for creation */
    112 #define FDL_CREATE_LO fdl_mbr
    113 /** Highest label type allowed for creation + 1 */
    114 #define FDL_CREATE_HI (fdl_gpt + 1)
    115 
    11699/** Open fdisk device */
    117100typedef struct {
    118         /** Label type */
    119         fdisk_label_type_t ltype;
     101        /** Fdisk instance */
     102        struct fdisk *fdisk;
     103        /** Disk contents */
     104        label_disk_cnt_t dcnt;
     105        /** Service ID */
     106        service_id_t sid;
    120107        /** Partitions */
    121108        list_t parts; /* of fdisk_part_t */
    122         /** Service ID */
    123         service_id_t sid;
    124109} fdisk_dev_t;
    125110
    126111typedef struct {
     112        /** Disk contents */
     113        label_disk_cnt_t dcnt;
    127114        /** Label type */
    128         fdisk_label_type_t ltype;
     115        label_type_t ltype;
    129116} fdisk_label_info_t;
    130117
    … …  
    156143} fdisk_part_info_t;
    157144
     145/** Fdisk instance */
     146typedef struct fdisk {
     147        /** Volume service */
     148        vol_t *vol;
     149} fdisk_t;
     150
    158151#endif
    159152
Note: See TracChangeset for help on using the changeset viewer.