diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-05-29 15:10:27 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-29 15:10:27 -0700 |
commit | 5c54b787a5ab2ab796402af6f39b9da9ab9b67f4 (patch) | |
tree | e4ddf8a31b79c3da1248efe4f334d309f6ac5462 /com32/mboot/mb_info.h | |
parent | 081182ef395725abecd79a710083a2168282647b (diff) | |
download | syslinux-5c54b787a5ab2ab796402af6f39b9da9ab9b67f4.tar.gz syslinux-5c54b787a5ab2ab796402af6f39b9da9ab9b67f4.tar.xz syslinux-5c54b787a5ab2ab796402af6f39b9da9ab9b67f4.zip |
Run Nindent on com32/mboot/mb_info.h
Automatically reformat com32/mboot/mb_info.h using Nindent.
Do this for all files except HDT, gPXE and externally maintained
libraries (zlib, tinyjpeg, libpng).
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/mboot/mb_info.h')
-rw-r--r-- | com32/mboot/mb_info.h | 188 |
1 files changed, 92 insertions, 96 deletions
diff --git a/com32/mboot/mb_info.h b/com32/mboot/mb_info.h index 149099fc..597a7381 100644 --- a/com32/mboot/mb_info.h +++ b/com32/mboot/mb_info.h @@ -22,23 +22,22 @@ */ #ifndef MBOOT_MB_INFO_H -#define MBOOT_MB_INFO_H +#define MBOOT_MB_INFO_H #include <inttypes.h> struct mod_list { - /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */ - uint32_t mod_start; - uint32_t mod_end; + /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */ + uint32_t mod_start; + uint32_t mod_end; - /* Module command line */ - uint32_t cmdline; + /* Module command line */ + uint32_t cmdline; - /* padding to take it to 16 bytes (must be zero) */ - uint32_t pad; + /* padding to take it to 16 bytes (must be zero) */ + uint32_t pad; }; - /* * INT-15, AX=E820 style "AddressRangeDescriptor" * ...with a "size" parameter on the front which is the structure size - 4, @@ -47,55 +46,52 @@ struct mod_list { */ struct AddrRangeDesc { - uint32_t size; - uint64_t BaseAddr; - uint64_t Length; - uint32_t Type; - /* unspecified optional padding... */ -} __attribute__((packed)); + uint32_t size; + uint64_t BaseAddr; + uint64_t Length; + uint32_t Type; + /* unspecified optional padding... */ +} __attribute__ ((packed)); /* usable memory "Type", all others are reserved. */ #define MB_ARD_MEMORY 1 - /* Drive Info structure. */ struct drive_info { - /* The size of this structure. */ - uint32_t size; + /* The size of this structure. */ + uint32_t size; - /* The BIOS drive number. */ - uint8_t drive_number; + /* The BIOS drive number. */ + uint8_t drive_number; - /* The access mode (see below). */ - uint8_t drive_mode; + /* The access mode (see below). */ + uint8_t drive_mode; - /* The BIOS geometry. */ - uint16_t drive_cylinders; - uint8_t drive_heads; - uint8_t drive_sectors; + /* The BIOS geometry. */ + uint16_t drive_cylinders; + uint8_t drive_heads; + uint8_t drive_sectors; - /* The array of I/O ports used for the drive. */ - uint16_t drive_ports[0]; + /* The array of I/O ports used for the drive. */ + uint16_t drive_ports[0]; }; /* Drive Mode. */ #define MB_DI_CHS_MODE 0 #define MB_DI_LBA_MODE 1 - /* APM BIOS info. */ struct apm_info { - uint16_t version; - uint16_t cseg; - uint32_t offset; - uint16_t cseg_16; - uint16_t dseg_16; - uint16_t cseg_len; - uint16_t cseg_16_len; - uint16_t dseg_16_len; + uint16_t version; + uint16_t cseg; + uint32_t offset; + uint16_t cseg_16; + uint16_t dseg_16; + uint16_t cseg_len; + uint16_t cseg_16_len; + uint16_t dseg_16_len; }; - /* * MultiBoot Info description * @@ -104,64 +100,64 @@ struct apm_info { */ struct multiboot_info { - /* MultiBoot info version number */ - uint32_t flags; - - /* Available memory from BIOS */ - uint32_t mem_lower; - uint32_t mem_upper; - - /* "root" partition */ - uint32_t boot_device; - - /* Kernel command line */ - uint32_t cmdline; - - /* Boot-Module list */ - uint32_t mods_count; - uint32_t mods_addr; - - union { - struct { - /* (a.out) Kernel symbol table info */ - uint32_t tabsize; - uint32_t strsize; - uint32_t addr; - uint32_t pad; - } a; - struct { - /* (ELF) Kernel section header table */ - uint32_t num; - uint32_t size; - uint32_t addr; - uint32_t shndx; - } e; - } syms; - - /* Memory Mapping buffer */ - uint32_t mmap_length; - uint32_t mmap_addr; - - /* Drive Info buffer */ - uint32_t drives_length; - uint32_t drives_addr; - - /* ROM configuration table */ - uint32_t config_table; - - /* Boot Loader Name */ - uint32_t boot_loader_name; - - /* APM table */ - uint32_t apm_table; - - /* Video */ - uint32_t vbe_control_info; - uint32_t vbe_mode_info; - uint16_t vbe_mode; - uint16_t vbe_interface_seg; - uint16_t vbe_interface_off; - uint16_t vbe_interface_len; + /* MultiBoot info version number */ + uint32_t flags; + + /* Available memory from BIOS */ + uint32_t mem_lower; + uint32_t mem_upper; + + /* "root" partition */ + uint32_t boot_device; + + /* Kernel command line */ + uint32_t cmdline; + + /* Boot-Module list */ + uint32_t mods_count; + uint32_t mods_addr; + + union { + struct { + /* (a.out) Kernel symbol table info */ + uint32_t tabsize; + uint32_t strsize; + uint32_t addr; + uint32_t pad; + } a; + struct { + /* (ELF) Kernel section header table */ + uint32_t num; + uint32_t size; + uint32_t addr; + uint32_t shndx; + } e; + } syms; + + /* Memory Mapping buffer */ + uint32_t mmap_length; + uint32_t mmap_addr; + + /* Drive Info buffer */ + uint32_t drives_length; + uint32_t drives_addr; + + /* ROM configuration table */ + uint32_t config_table; + + /* Boot Loader Name */ + uint32_t boot_loader_name; + + /* APM table */ + uint32_t apm_table; + + /* Video */ + uint32_t vbe_control_info; + uint32_t vbe_mode_info; + uint16_t vbe_mode; + uint16_t vbe_interface_seg; + uint16_t vbe_interface_off; + uint16_t vbe_interface_len; }; /* |