svn commit: r200216 - in head/sys/boot/i386: libi386 loader

[John Baldwin]

Author: jhb
Date: Mon Dec  7 16:00:59 2009
New Revision: 200216
URL: http://svn.freebsd.org/changeset/base/200216

Log:
  Various small whitespace and style fixes.

Modified:
  head/sys/boot/i386/libi386/biosmem.c
  head/sys/boot/i386/libi386/libi386.h
  head/sys/boot/i386/loader/main.c

Modified: head/sys/boot/i386/libi386/biosmem.c
==============================================================================
--- head/sys/boot/i386/libi386/biosmem.c	Mon Dec  7 15:29:07 2009	(r200215)
+++ head/sys/boot/i386/libi386/biosmem.c	Mon Dec  7 16:00:59 2009	(r200216)
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include "btxv86.h"
 
 vm_offset_t	memtop, memtop_copyin;
-u_int32_t	bios_basemem, bios_extmem;
+uint32_t	bios_basemem, bios_extmem;
 
 static struct bios_smap smap;
 
@@ -98,4 +98,3 @@ bios_getmem(void)
     memtop = memtop_copyin = 0x100000 + bios_extmem;
 
 }    
-

Modified: head/sys/boot/i386/libi386/libi386.h
==============================================================================
--- head/sys/boot/i386/libi386/libi386.h	Mon Dec  7 15:29:07 2009	(r200215)
+++ head/sys/boot/i386/libi386/libi386.h	Mon Dec  7 16:00:59 2009	(r200216)
@@ -78,9 +78,9 @@ int	bc_add(int biosdev);		/* Register CD
 int	bc_getdev(struct i386_devdesc *dev);	/* return dev_t for (dev) */
 int	bc_bios2unit(int biosdev);	/* xlate BIOS device -> bioscd unit */
 int	bc_unit2bios(int unit);		/* xlate bioscd unit -> BIOS device */
-u_int32_t	bd_getbigeom(int bunit);	/* return geometry in bootinfo format */
-int	bd_bios2unit(int biosdev);		/* xlate BIOS device -> biosdisk unit */
-int	bd_unit2bios(int unit);			/* xlate biosdisk unit -> BIOS device */
+uint32_t bd_getbigeom(int bunit);	/* return geometry in bootinfo format */
+int	bd_bios2unit(int biosdev);	/* xlate BIOS device -> biosdisk unit */
+int	bd_unit2bios(int unit);		/* xlate biosdisk unit -> BIOS device */
 int	bd_getdev(struct i386_devdesc *dev);	/* return dev_t for (dev) */
 
 ssize_t	i386_copyin(const void *src, vm_offset_t dest, const size_t len);
@@ -92,12 +92,13 @@ void	bios_addsmapdata(struct preloaded_f
 void	bios_getsmap(void);
 
 void	bios_getmem(void);
-extern u_int32_t	bios_basemem;				/* base memory in bytes */
-extern u_int32_t	bios_extmem;				/* extended memory in bytes */
+extern uint32_t		bios_basemem;	/* base memory in bytes */
+extern uint32_t		bios_extmem;	/* extended memory in bytes */
 extern vm_offset_t	memtop;		/* last address of physical memory + 1 */
 extern vm_offset_t	memtop_copyin;	/* memtop less heap size for the cases */
-					/*  when heap is at the top of extended memory */
-					/*  for other cases - just the same as memtop */
+					/*  when heap is at the top of         */
+					/*  extended memory; for other cases   */
+					/*  just the same as memtop            */
 
 int biospci_find_devclass(uint32_t class, int index, uint32_t *locator);
 int biospci_write_config(uint32_t locator, int offset, int width, uint32_t val);

Modified: head/sys/boot/i386/loader/main.c
==============================================================================
--- head/sys/boot/i386/loader/main.c	Mon Dec  7 15:29:07 2009	(r200215)
+++ head/sys/boot/i386/loader/main.c	Mon Dec  7 16:00:59 2009	(r200216)
@@ -102,7 +102,8 @@ main(void)
      */
     bios_getmem();
 
-#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) || defined(LOADER_GPT_SUPPORT) || defined(LOADER_ZFS_SUPPORT)
+#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) || \
+    defined(LOADER_GPT_SUPPORT) || defined(LOADER_ZFS_SUPPORT)
     heap_top = PTOV(memtop_copyin);
     memtop_copyin -= 0x300000;
     heap_bottom = PTOV(memtop_copyin);