Sort the sections of util.h.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 119 insertions, 119 deletions

diff --git a/src/util.h b/src/util.h
index 79a2e7f..880c04a 100644
--- a/src/util.h
+++ b/src/util.h
@@ -4,69 +4,9 @@
 
 #include "types.h" // u32
 
-// kbd.c
-void kbd_init(void);
-struct bregs;
-void handle_15c2(struct bregs *regs);
-void process_key(u8 key);
-
-// mouse.c
-void mouse_init(void);
-void process_mouse(u8 data);
-
-// serial.c
-void serial_setup(void);
-void lpt_setup(void);
-
-// cdrom.c
-extern u8 CDRom_locks[];
-extern struct cdemu_s CDEmu;
-extern struct drive_s *cdemu_drive_gf;
-struct disk_op_s;
-int process_cdemu_op(struct disk_op_s *op);
-void cdrom_prepboot(void);
-void cdemu_134b(struct bregs *regs);
-int cdrom_boot(struct drive_s *drive_g);
-
-// clock.c
-void clock_setup(void);
-void handle_1583(struct bregs *regs);
-void handle_1586(struct bregs *regs);
-void useRTC(void);
-void releaseRTC(void);
-
-// hw/floppy.c
-extern struct floppy_ext_dbt_s diskette_param_table2;
-void floppy_setup(void);
-struct drive_s *init_floppy(int floppyid, int ftype);
-int find_floppy_type(u32 size);
-int process_floppy_op(struct disk_op_s *op);
-void floppy_tick(void);
-
-// hw/ramdisk.c
-void ramdisk_setup(void);
-int process_ramdisk_op(struct disk_op_s *op);
-
-// hw/timer.c
-void timer_setup(void);
-void pmtimer_setup(u16 ioport);
-u32 timer_calc(u32 msecs);
-u32 timer_calc_usec(u32 usecs);
-int timer_check(u32 end);
-void ndelay(u32 count);
-void udelay(u32 count);
-void mdelay(u32 count);
-void nsleep(u32 count);
-void usleep(u32 count);
-void msleep(u32 count);
-u32 ticks_to_ms(u32 ticks);
-u32 ticks_from_ms(u32 ms);
-u32 irqtimer_calc_ticks(u32 count);
-u32 irqtimer_calc(u32 msecs);
-int irqtimer_check(u32 end);
-
 // apm.c
 void apm_shutdown(void);
+struct bregs;
 void handle_1553(struct bregs *regs);
 
 // bmp.c
@@ -80,6 +20,7 @@ int bmp_show(struct bmp_decdata *bmp, unsigned char *pic, int width
 void boot_init(void);
 void boot_add_bev(u16 seg, u16 bev, u16 desc, int prio);
 void boot_add_bcv(u16 seg, u16 ip, u16 desc, int prio);
+struct drive_s;
 void boot_add_floppy(struct drive_s *drive_g, const char *desc, int prio);
 void boot_add_hd(struct drive_s *drive_g, const char *desc, int prio);
 void boot_add_cd(struct drive_s *drive_g, const char *desc, int prio);
@@ -96,27 +37,27 @@ int bootprio_find_named_rom(const char *name, int instance);
 struct usbdevice_s;
 int bootprio_find_usb(struct usbdevice_s *usbdev, int lun);
 
-// jpeg.c
-struct jpeg_decdata *jpeg_alloc(void);
-int jpeg_decode(struct jpeg_decdata *jpeg, unsigned char *buf);
-void jpeg_get_size(struct jpeg_decdata *jpeg, int *width, int *height);
-int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic, int width
-              , int height, int depth, int bytes_per_line_dest);
-
-// optionroms.c
-struct rom_header;
-void callrom(struct rom_header *rom, u16 bdf);
+// bootsplash.c
+void enable_vga_console(void);
+void enable_bootsplash(void);
+void disable_bootsplash(void);
 
-// pcibios.c
-void handle_1ab1(struct bregs *regs);
-void bios32_init(void);
+// cdrom.c
+extern u8 CDRom_locks[];
+extern struct cdemu_s CDEmu;
+extern struct drive_s *cdemu_drive_gf;
+struct disk_op_s;
+int process_cdemu_op(struct disk_op_s *op);
+void cdrom_prepboot(void);
+void cdemu_134b(struct bregs *regs);
+int cdrom_boot(struct drive_s *drive_g);
 
-// post.c
-void interface_init(void);
-void device_hardware_setup(void);
-void prepareboot(void);
-void startBoot(void);
-void reloc_preinit(void *f, void *arg);
+// clock.c
+void clock_setup(void);
+void handle_1583(struct bregs *regs);
+void handle_1586(struct bregs *regs);
+void useRTC(void);
+void releaseRTC(void);
 
 // fw/acpi.c
 extern struct rsdp_descriptor *RsdpAddr;
@@ -128,6 +69,20 @@ struct acpi_20_generic_address;
 void acpi_set_reset_reg(struct acpi_20_generic_address *reg, u8 val);
 void acpi_reboot(void);
 
+// fw/biostable.c
+void copy_smbios(void *pos);
+void copy_table(void *pos);
+
+// fw/coreboot.c
+extern const char *CBvendor, *CBpart;
+struct cbfs_file;
+void debug_cbmem(char c);
+void cbfs_run_payload(struct cbfs_file *file);
+void coreboot_platform_setup(void);
+void cbfs_payload_setup(void);
+void coreboot_preinit(void);
+void coreboot_cbfs_init(void);
+
 // fw/csm.c
 int csm_bootprio_fdc(struct pci_device *pci, int port, int fdid);
 int csm_bootprio_ata(struct pci_device *pci, int chanid, int slave);
@@ -136,6 +91,17 @@ int csm_bootprio_pci(struct pci_device *pci);
 // fw/mptable.c
 void mptable_setup(void);
 
+// fw/mtrr.c
+void mtrr_setup(void);
+
+// fw/pciinit.c
+extern const u8 pci_irqs[4];
+void pci_setup(void);
+
+// fw/pirtable.c
+extern struct pir_header *PirAddr;
+void pirtable_setup(void);
+
 // fw/shadow.c
 void make_bios_writable(void);
 void make_bios_readonly(void);
@@ -146,14 +112,6 @@ extern struct smbios_entry_point *SMBiosAddr;
 void smbios_setup(void);
 void display_uuid(void);
 
-// fw/pciinit.c
-extern const u8 pci_irqs[4];
-void pci_setup(void);
-
-// fw/pirtable.c
-extern struct pir_header *PirAddr;
-void pirtable_setup(void);
-
 // fw/smm.c
 void smm_device_setup(void);
 void smm_setup(void);
@@ -165,25 +123,60 @@ void wrmsr_smp(u32 index, u64 val);
 void smp_setup(void);
 int apic_id_is_present(u8 apic_id);
 
-// fw/coreboot.c
-extern const char *CBvendor, *CBpart;
-struct cbfs_file;
-void debug_cbmem(char c);
-void cbfs_run_payload(struct cbfs_file *file);
-void coreboot_platform_setup(void);
-void cbfs_payload_setup(void);
-void coreboot_preinit(void);
-void coreboot_cbfs_init(void);
+// hw/floppy.c
+extern struct floppy_ext_dbt_s diskette_param_table2;
+void floppy_setup(void);
+struct drive_s *init_floppy(int floppyid, int ftype);
+int find_floppy_type(u32 size);
+int process_floppy_op(struct disk_op_s *op);
+void floppy_tick(void);
 
-// fw/biostable.c
-void copy_smbios(void *pos);
-void copy_table(void *pos);
+// hw/ramdisk.c
+void ramdisk_setup(void);
+int process_ramdisk_op(struct disk_op_s *op);
 
-// vgahooks.c
-void handle_155f(struct bregs *regs);
-void vgahook_setup(struct pci_device *pci);
+// hw/timer.c
+void timer_setup(void);
+void pmtimer_setup(u16 ioport);
+u32 timer_calc(u32 msecs);
+u32 timer_calc_usec(u32 usecs);
+int timer_check(u32 end);
+void ndelay(u32 count);
+void udelay(u32 count);
+void mdelay(u32 count);
+void nsleep(u32 count);
+void usleep(u32 count);
+void msleep(u32 count);
+u32 ticks_to_ms(u32 ticks);
+u32 ticks_from_ms(u32 ms);
+u32 irqtimer_calc_ticks(u32 count);
+u32 irqtimer_calc(u32 msecs);
+int irqtimer_check(u32 end);
+
+// jpeg.c
+struct jpeg_decdata *jpeg_alloc(void);
+int jpeg_decode(struct jpeg_decdata *jpeg, unsigned char *buf);
+void jpeg_get_size(struct jpeg_decdata *jpeg, int *width, int *height);
+int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic, int width
+              , int height, int depth, int bytes_per_line_dest);
+
+// kbd.c
+void kbd_init(void);
+void handle_15c2(struct bregs *regs);
+void process_key(u8 key);
+
+// misc.c
+extern struct bios_config_table_s BIOS_CONFIG_TABLE __aligned(1);
+extern u8 BiosChecksum;
+void mathcp_setup(void);
+
+// mouse.c
+void mouse_init(void);
+void process_mouse(u8 data);
 
 // optionroms.c
+struct rom_header;
+void callrom(struct rom_header *rom, u16 bdf);
 void call_bcv(u16 seg, u16 ip);
 int is_pci_vga(struct pci_device *pci);
 void optionrom_setup(void);
@@ -191,33 +184,40 @@ void vgarom_setup(void);
 void s3_resume_vga(void);
 extern int ScreenAndDebug;
 
-// bootsplash.c
-void enable_vga_console(void);
-void enable_bootsplash(void);
-void disable_bootsplash(void);
+// pcibios.c
+void handle_1ab1(struct bregs *regs);
+void bios32_init(void);
 
-// resume.c
-extern int HaveRunPost;
-void dma_setup(void);
+// pmm.c
+void pmm_init(void);
+void pmm_prepboot(void);
 
 // pnpbios.c
 u16 get_pnp_offset(void);
 void pnp_init(void);
 
-// pmm.c
-void pmm_init(void);
-void pmm_prepboot(void);
+// post.c
+void interface_init(void);
+void device_hardware_setup(void);
+void prepareboot(void);
+void startBoot(void);
+void reloc_preinit(void *f, void *arg);
 
-// fw/mtrr.c
-void mtrr_setup(void);
+// resume.c
+extern int HaveRunPost;
+void dma_setup(void);
 
 // romlayout.S
 void reset_vector(void) __noreturn;
 
-// misc.c
-extern struct bios_config_table_s BIOS_CONFIG_TABLE __aligned(1);
-extern u8 BiosChecksum;
-void mathcp_setup(void);
+// serial.c
+void serial_setup(void);
+void lpt_setup(void);
+
+// vgahooks.c
+void handle_155f(struct bregs *regs);
+void vgahook_setup(struct pci_device *pci);
+
 
 // version (auto generated file out/version.c)
 extern const char VERSION[];