merge mainline into butter

include/grub/efiemu/efiemu.h

@@ -21,6 +21,7 @@
 
 #include <grub/efi/api.h>
 #include <grub/file.h>
+#include <grub/memory.h>
 
 #define GRUB_EFIEMU_PAGESIZE 4096
 
@@ -227,9 +228,7 @@ grub_efiemu_finish_boot_services (grub_efi_uintn_t *memory_map_size,
 				  grub_efi_uint32_t *descriptor_version);
 
 grub_err_t
-grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
-							grub_uint64_t,
-							grub_uint32_t));
+grub_efiemu_mmap_iterate (grub_memory_hook_t hook);
 int grub_efiemu_sizeof_uintn_t (void);
 grub_err_t
 grub_efiemu_get_lower_upper_memory (grub_uint64_t *lower, grub_uint64_t *upper);

include/grub/fs.h

@@ -31,9 +31,9 @@ struct grub_file;
 
 struct grub_dirhook_info
 {
-  int dir:1;
-  int mtimeset:1;
-  int case_insensitive:1;
+  unsigned dir:1;
+  unsigned mtimeset:1;
+  unsigned case_insensitive:1;
   grub_int32_t mtime;
 };
 

include/grub/lvm.h

@@ -47,6 +47,9 @@ struct grub_lvm_lv {
   unsigned int number;
   unsigned int segment_count;
   grub_uint64_t size;
+
+  int visible;
+
   struct grub_lvm_segment *segments; /* Pointer to segment_count segments. */
   struct grub_lvm_vg *vg;
   struct grub_lvm_lv *next;
@@ -55,14 +58,19 @@ struct grub_lvm_lv {
 struct grub_lvm_segment {
   unsigned int start_extent;
   unsigned int extent_count;
-  unsigned int stripe_count;
+  enum { GRUB_LVM_STRIPED, GRUB_LVM_MIRROR } type; 
+
+  unsigned int node_count;
+  struct grub_lvm_node *nodes;
+
   unsigned int stripe_size;
-  struct grub_lvm_stripe *stripes; /* Pointer to stripe_count stripes. */
 };
 
-struct grub_lvm_stripe {
-  int start;
+struct grub_lvm_node {
+  grub_disk_addr_t start;
+  char *name;
   struct grub_lvm_pv *pv;
+  struct grub_lvm_lv *lv;
 };
 
 #define GRUB_LVM_LABEL_SIZE GRUB_DISK_SECTOR_SIZE

include/grub/mm.h

@@ -36,7 +36,7 @@ void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
 void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
 
 void grub_mm_check_real (char *file, int line);
-#define GRUB_MM_CHECK grub_mm_check_real (__FILE__, __LINE__);
+#define grub_mm_check() grub_mm_check_real (GRUB_FILE, __LINE__);
 
 /* For debugging.  */
 #if defined(MM_DEBUG) && !defined(GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)

include/grub/normal.h

@@ -51,7 +51,7 @@ extern int grub_normal_exit_level;
 /* Defined in `main.c'.  */
 void grub_enter_normal_mode (const char *config);
 void grub_normal_execute (const char *config, int nested, int batch);
-void grub_menu_init_page (int nested, int edit,
+void grub_menu_init_page (int nested, int edit, int *num_entries,
 			  struct grub_term_output *term);
 void grub_normal_init_page (struct grub_term_output *term);
 char *grub_file_getline (grub_file_t file);
@@ -80,6 +80,11 @@ grub_print_ucs4 (const grub_uint32_t * str,
 		 const grub_uint32_t * last_position,
 		 int margin_left, int margin_right,
 		 struct grub_term_output *term);
+int
+grub_ucs4_count_lines (const grub_uint32_t * str,
+		       const grub_uint32_t * last_position,
+		       int margin_left, int margin_right,
+		       struct grub_term_output *term);
 grub_ssize_t grub_getstringwidth (grub_uint32_t * str,
 				  const grub_uint32_t * last_position,
 				  struct grub_term_output *term);

include/grub/offsets.h

@@ -38,9 +38,9 @@
 #define GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY	0x1c
 
 /* The size of the first region which won't be compressed.  */
-#define GRUB_KERNEL_I386_PC_RAW_SIZE		0xca4
+#define GRUB_KERNEL_I386_PC_RAW_SIZE		0xcd0
 
-#define GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART 0x70c
+#define GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART 0x730
 
 /* The offset of GRUB_PREFIX.  */
 #define GRUB_KERNEL_I386_PC_PREFIX		GRUB_KERNEL_I386_PC_RAW_SIZE

include/grub/term.h

@@ -140,9 +140,6 @@ grub_term_color_state;
 /* The X position of the left border.  */
 #define GRUB_TERM_LEFT_BORDER_X	GRUB_TERM_MARGIN
 
-/* The number of lines of messages at the bottom.  */
-#define GRUB_TERM_MESSAGE_HEIGHT	8
-
 /* The Y position of the first entry.  */
 #define GRUB_TERM_FIRST_ENTRY_Y	(GRUB_TERM_TOP_BORDER_Y + 1)
 
@@ -339,29 +336,6 @@ grub_term_entry_width (struct grub_term_output *term)
   return grub_term_border_width (term) - 2 - GRUB_TERM_MARGIN * 2 - 1;
 }
 
-/* The height of the border.  */
-
-static inline unsigned
-grub_term_border_height (struct grub_term_output *term)
-{
-  return grub_term_height (term) - GRUB_TERM_TOP_BORDER_Y
-    - GRUB_TERM_MESSAGE_HEIGHT;
-}
-
-/* The number of entries shown at a time.  */
-static inline int
-grub_term_num_entries (struct grub_term_output *term)
-{
-  return grub_term_border_height (term) - 2;
-}
-
-static inline int
-grub_term_cursor_x (struct grub_term_output *term)
-{
-  return (GRUB_TERM_LEFT_BORDER_X + grub_term_border_width (term) 
-	  - GRUB_TERM_MARGIN - 1);
-}
-
 static inline grub_uint16_t
 grub_term_getxy (struct grub_term_output *term)
 {

include/grub/util/raid.h

@@ -21,7 +21,7 @@
 #define GRUB_RAID_UTIL_HEADER	1
 
 #ifdef __linux__
-char** grub_util_raid_getmembers (char *name);
+char** grub_util_raid_getmembers (const char *name);
 #endif
 
 #endif /* ! GRUB_RAID_UTIL_HEADER */