Changeset 77a194c in mainline for uspace/lib/clui/nchoice.h

Timestamp:

2015-11-04T18:55:46Z (8 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.

File:

• uspace/lib/clui/nchoice.h (moved) (moved from uspace/lib/gpt/gpt.h ) (2 diffs)

uspace/lib/clui/nchoice.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
- * Copyright (c) 2011-2013 Dominik Taborsky
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup libgpt
+/** @addtogroup libclui
  * @{
  */
-/** @file
+/**
+ * @file Numerical choice
  */
 
-#ifndef LIBGPT_GPT_H_
-#define LIBGPT_GPT_H_
+#ifndef LIBCLUI_NCHOICE_H_
+#define LIBCLUI_NCHOICE_H_
+
+#include <adt/list.h>
+#include <tinput.h>
 
 typedef enum {
-        AT_REQ_PART = 0,
-        AT_NO_BLOCK_IO,
-        AT_LEGACY_BOOT,
-        AT_UNDEFINED,
-        AT_SPECIFIC = 48
-} gpt_attr_t;
+        /** This is the default option */
+        ncf_default = 1
+} nchoice_flag_t;
 
-/** GPT header */
 typedef struct {
-        uint8_t efi_signature[8];
-        uint8_t revision[4];
-        uint32_t header_size;
-        uint32_t header_crc32;
-        uint32_t reserved;
-        uint64_t current_lba;
-        uint64_t alternate_lba;
-        uint64_t first_usable_lba;
-        uint64_t last_usable_lba;
-        uint8_t disk_guid[16];
-        uint64_t entry_lba;
-        uint32_t fillries;
-        uint32_t entry_size;
-        uint32_t pe_array_crc32;
-} __attribute__((packed)) gpt_header_t;
+        /** Link to nchoice_t.opts */
+        link_t lchoice;
+        /** Option text */
+        char *text;
+        /** User argument */
+        void *arg;
+} nchoice_opt_t;
 
-/** GPT partition entry */
 typedef struct {
-        uint8_t part_type[16];
-        uint8_t part_id[16];
-        uint64_t start_lba;
-        uint64_t end_lba;
-        uint64_t attributes;
-        uint8_t part_name[72];
-} __attribute__((packed)) gpt_entry_t;
+        /** Prompt text */
+        char *prompt;
+        /** Options */
+        list_t opts; /* of nchoice_opt_t */
+        /** Text input */
+        tinput_t *tinput;
+        /** Default option */
+        nchoice_opt_t *def_opt;
+} nchoice_t;
+
+extern int nchoice_create(nchoice_t **);
+extern void nchoice_destroy(nchoice_t *);
+extern int nchoice_set_prompt(nchoice_t *, const char *);
+extern int nchoice_add(nchoice_t *, const char *, void *, nchoice_flag_t);
+extern int nchoice_get(nchoice_t *, void **);
 
 #endif
+
+/** @}
+ */