* doc/multiboot.h: Stylistic improvements. Add APM declarations.

diff --git a/ChangeLog b/ChangeLog
index e264003475e619afa903a4075cf39e73f980350d..b0bd22e8742644db4affd67b445f79bfc81fe3a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * doc/multiboot.h: Stylistic improvements. Add APM declarations.
+
 2010-09-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * doc/multiboot.texi: Add new memory type for badram.

diff --git a/doc/multiboot.h b/doc/multiboot.h
index 1ca087f1f293c9f2c220d6139b3e0a467c629a71..dac45187daaeeb784e6e325f314a31c39dba2843 100644 (file)
--- a/doc/multiboot.h
+++ b/doc/multiboot.h
@@ -24,6 +24,7 @@
 
 /* How many bytes from the start of the file we search for the header.  */
 #define MULTIBOOT_SEARCH                       8192
+#define MULTIBOOT_HEADER_ALIGN                 4
 
 /* The magic field should contain this.  */
 #define MULTIBOOT_HEADER_MAGIC                 0x1BADB002
@@ -202,20 +203,17 @@ struct multiboot_info
   multiboot_uint32_t framebuffer_width;
   multiboot_uint32_t framebuffer_height;
   multiboot_uint8_t framebuffer_bpp;
-#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED     0
-#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB         1
+#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
+#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB     1
 #define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT    2
   multiboot_uint8_t framebuffer_type;
   union
   {
-    /* Indexed color.  */
     struct
     {
-      struct multiboot_color *framebuffer_palette_addr;
+      multiboot_uint32_t framebuffer_palette_addr;
       multiboot_uint16_t framebuffer_palette_num_colors;
     };
-
-    /* Direct RGB color.  */
     struct
     {
       multiboot_uint8_t framebuffer_red_field_position;
@@ -229,6 +227,13 @@ struct multiboot_info
 };
 typedef struct multiboot_info multiboot_info_t;
 
+struct multiboot_color
+{
+  multiboot_uint8_t red;
+  multiboot_uint8_t green;
+  multiboot_uint8_t blue;
+};
+
 struct multiboot_mmap_entry
 {
   multiboot_uint32_t size;
@@ -257,6 +262,20 @@ struct multiboot_mod_list
 };
 typedef struct multiboot_mod_list multiboot_module_t;
 
+/* APM BIOS info.  */
+struct multiboot_apm_info
+{
+  grub_uint16_t version;
+  grub_uint16_t cseg;
+  grub_uint32_t offset;
+  grub_uint16_t cseg_16;
+  grub_uint16_t dseg;
+  grub_uint16_t flags;
+  grub_uint16_t cseg_len;
+  grub_uint16_t cseg_16_len;
+  grub_uint16_t dseg_len;
+};
+
 #endif /* ! ASM_FILE */
 
 #endif /* ! MULTIBOOT_HEADER */