White space style cleanup.

5 files changed, 109 insertions, 109 deletions

diff --git a/sys/boot/i386/boot0/boot0.S b/sys/boot/i386/boot0/boot0.S
index 17305d8..62e6556 100644
--- a/sys/boot/i386/boot0/boot0.S
+++ b/sys/boot/i386/boot0/boot0.S
@@ -107,12 +107,12 @@ main:		pushw %dx			# Save
 		jnz main.1			# Yes
 		testb %dl,%dl			# Drive number valid?
 		js main.2			# Possibly (0x80 set)
-main.1: 	movb _SETDRV(%bp),%dl		# Drive number to use
+main.1:		movb _SETDRV(%bp),%dl		# Drive number to use
 #
 # Whatever we decided to use, now store it into the fake
 # partition entry that lives in the data space above us.
 #
-main.2: 	movb %dl,_FAKE(%bp)		# Save drive number
+main.2:		movb %dl,_FAKE(%bp)		# Save drive number
 		callw putn			# To new line
 		pushw %dx			# Save drive number
 #
@@ -128,7 +128,7 @@ main.2: 	movb %dl,_FAKE(%bp)		# Save drive number
 # Loop around on the partition table, printing values until we
 # pass a 256 byte boundary. The end of loop test is at main.5.
 #
-main.3: 	movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
+main.3:		movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
 		btw %dx,_FLAGS(%bp)		# Entry enabled?
 		jnc main.5			# No
 #
@@ -155,10 +155,10 @@ main.3: 	movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
 # pointing at its first element which points to a "?".
 #
 		addw $TBL1SZ,%di		# Adjust
-main.4: 	movb (%di),%cl			# Partition
+main.4:		movb (%di),%cl			# Partition
 		addw %cx,%di			#  description
 		callw putx			# Display it
-main.5: 	incw %dx			# Next item
+main.5:		incw %dx			# Next item
 		addb $0x10,%bl			# Next entry
 		jnc main.3			# Till done
 #
@@ -186,7 +186,7 @@ main.5: 	incw %dx			# Next item
 # This also is part of the printed drive string so add 0x80 to indicate
 # end of string.
 #
-main.6: 	addb $'0'|0x80,%al		# Save next
+main.6:		addb $'0'|0x80,%al		# Save next
 		movb %al,_NXTDRV(%bp)		#  drive number
 		movw $drive,%di			# Display
 		callw putx			#  item
@@ -194,7 +194,7 @@ main.6: 	addb $'0'|0x80,%al		# Save next
 # Now that we've printed the drive (if we needed to), display a prompt.
 # Get ready for the input byte noting the time.
 #
-main.7: 	movw $prompt,%si		# Display
+main.7:		movw $prompt,%si		# Display
 		callw putstr			#  prompt
 		movb _OPT(%bp),%dl		# Display
 		decw %si			#  default
@@ -224,7 +224,7 @@ main.8:		xorw %dx,%dx			# Use COM1
 #
 # If timed out or defaulting, come here.
 #
-main.9: 	movb _OPT(%bp),%al		# Load default
+main.9:		movb _OPT(%bp),%al		# Load default
 		jmp main.12			# Join common code
 #
 # User's last try was bad, beep in displeasure.
@@ -239,7 +239,7 @@ main.10:	movb $ASCII_BEL,%al		# Signal
 #
 # Check the character we just got on the serial port.
 #
-main.11: 	movb $0x02,%ah			# BIOS: Receive
+main.11:	movb $0x02,%ah			# BIOS: Receive
 		int $0x14			#  COM Byte
 #
 # If it's CR act as if timed out.
@@ -316,7 +316,7 @@ main.15:	movw $LOAD,%bx			# Address for read
 # Display routines
 #
 
-putkey: 	movb $ASCII_1,%al		# Prepare
+putkey:		movb $ASCII_1,%al		# Prepare
 		addb %dl,%al			#  digit
 		jmp putstr.1			# Display the rest
 
@@ -333,7 +333,7 @@ puts:		callw putstr			# Display string
 
 putn:		movw $crlf,%si			# To next line
 
-putstr: 	lodsb				# Get byte
+putstr:		lodsb				# Get byte
 		testb $0x80,%al 		# End of string?
 		jnz putstr.2			# Yes
 putstr.1:	callw putchr			# Display char
@@ -350,7 +350,7 @@ putchr:		pushw %dx			# Save
 
 # One-sector disk I/O routine
 
-intx13: 	movb 0x1(%si),%dh		# Load head
+intx13:		movb 0x1(%si),%dh		# Load head
 		movw 0x2(%si),%cx		# Load cylinder:sector
 		movb $0x1,%al			# Sector count
 		pushw %si			# Save
@@ -374,7 +374,7 @@ intx13.1:	int $0x13			# BIOS: Disk I/O
 # Menu strings
 
 item:		.ascii " ";	     .byte ' '|0x80
-prompt: 	.ascii "\nDef:";     .byte ' '|0x80
+prompt:		.ascii "\nDef:";     .byte ' '|0x80
 crlf:		.ascii "\r";	     .byte '\n'|0x80
 
 # Partition type tables
@@ -410,10 +410,10 @@ tables:
 # the end of the string. (not so great for Russians but...)
 #
 os_misc:	.ascii "?";    .byte '?'|0x80
-os_dos: 	.ascii "DO";   .byte 'S'|0x80
+os_dos:		.ascii "DO";   .byte 'S'|0x80
 os_linux:	.ascii "Linu"; .byte 'x'|0x80
 os_freebsd:	.ascii "Free"
-os_bsd: 	.ascii "BS";   .byte 'D'|0x80
+os_bsd:		.ascii "BS";   .byte 'D'|0x80
 
 		.org PRT_OFF-0xe,0x90
 
@@ -425,14 +425,14 @@ os_bsd: 	.ascii "BS";   .byte 'D'|0x80
 # is part of the same string.
 #
 drive:		.ascii "Drive "
-nxtdrv: 	.byte 0x0			# Next drive number
+nxtdrv:		.byte 0x0			# Next drive number
 opt:		.byte 0x0			# Option
-setdrv: 	.byte 0x80			# Drive to force
+setdrv:		.byte 0x80			# Drive to force
 flags:		.byte FLAGS			# Flags
 ticks:		.word TICKS			# Delay
 
 #
 # here is the 64 byte partition table that fdisk would fiddle with.
 #
-partbl: 	.fill 0x40,0x1,0x0		# Partition table
+partbl:		.fill 0x40,0x1,0x0		# Partition table
 		.word MAGIC			# Magic number
diff --git a/sys/boot/i386/boot0/boot0.s b/sys/boot/i386/boot0/boot0.s
index 0fb9775..25fa8f0 100644
--- a/sys/boot/i386/boot0/boot0.s
+++ b/sys/boot/i386/boot0/boot0.s
@@ -91,12 +91,12 @@ main:		testb $0x20,_FLAGS(%bp)		# Set number drive?
 		jnz main.1			# Yes
 		testb %dl,%dl			# Drive number valid?
 		js main.2			# Possibly (0x80 set)
-main.1: 	movb _SETDRV(%bp),%dl		# Drive number to use
+main.1:		movb _SETDRV(%bp),%dl		# Drive number to use
 #
 # Whatever we decided to use, now store it into the fake
 # partition entry that lives in the data space above us.
 #
-main.2: 	movb %dl,_FAKE(%bp)		# Save drive number
+main.2:		movb %dl,_FAKE(%bp)		# Save drive number
 		callw putn			# To new line
 		pushw %dx			# Save drive number
 #
@@ -112,7 +112,7 @@ main.2: 	movb %dl,_FAKE(%bp)		# Save drive number
 # Loop around on the partition table, printing values until we
 # pass a 256 byte boundary. The end of loop test is at main.5.
 #
-main.3: 	movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
+main.3:		movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
 		btw %dx,_FLAGS(%bp)		# Entry enabled?
 		jnc main.5			# No
 #
@@ -139,10 +139,10 @@ main.3: 	movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
 # pointing at its first element which points to a "?".
 #
 		addw $TBL1SZ,%di		# Adjust
-main.4: 	movb (%di),%cl			# Partition
+main.4:		movb (%di),%cl			# Partition
 		addw %cx,%di			#  description
 		callw putx			# Display it
-main.5: 	incw %dx			# Next item
+main.5:		incw %dx			# Next item
 		addb $0x10,%bl			# Next entry
 		jnc main.3			# Till done
 #
@@ -170,7 +170,7 @@ main.5: 	incw %dx			# Next item
 # This also is part of the printed drive string so add 0x80 to indicate
 # end of string.
 #
-main.6: 	addb $'0'|0x80,%al		# Save next
+main.6:		addb $'0'|0x80,%al		# Save next
 		movb %al,_NXTDRV(%bp)		#  drive number
 		movw $drive,%di			# Display
 		callw putx			#  item
@@ -178,7 +178,7 @@ main.6: 	addb $'0'|0x80,%al		# Save next
 # Now that we've printed the drive (if we needed to), display a prompt.
 # Get ready for the input by noting the time.
 #
-main.7: 	movw $prompt,%si		# Display
+main.7:		movw $prompt,%si		# Display
 		callw putstr			#  prompt
 		movb _OPT(%bp),%dl		# Display
 		decw %si			#  default
@@ -191,7 +191,7 @@ main.7: 	movw $prompt,%si		# Display
 # Busy loop, looking for keystrokes but
 # keeping one eye on the time.
 #
-main.8: 	movb $0x1,%ah			# BIOS: Check
+main.8:		movb $0x1,%ah			# BIOS: Check
 		int $0x16			#  for keypress
 		jnz main.11			# Have one
 		xorb %ah,%ah			# BIOS: Get
@@ -201,7 +201,7 @@ main.8: 	movb $0x1,%ah			# BIOS: Check
 #
 # If timed out or defaulting, come here.
 #
-main.9: 	movb _OPT(%bp),%al		# Load default
+main.9:		movb _OPT(%bp),%al		# Load default
 		jmp main.12			# Join common code
 #
 # User's last try was bad, beep in displeasure.
@@ -296,7 +296,7 @@ main.15:	movw $LOAD,%bx			# Address for read
 # Display routines
 #
 
-putkey: 	movb $'F',%al			# Display
+putkey:		movb $'F',%al			# Display
 		callw putchr			#  'F'
 		movb $'1',%al			# Prepare
 		addb %dl,%al			#  digit
@@ -315,14 +315,14 @@ puts:		callw putstr			# Display string
 
 putn:		movw $crlf,%si			# To next line
 
-putstr: 	lodsb				# Get byte
+putstr:		lodsb				# Get byte
 		testb $0x80,%al 		# End of string?
 		jnz putstr.2			# Yes
 putstr.1:	callw putchr			# Display char
 		jmp putstr			# Continue
 putstr.2:	andb $~0x80,%al 		# Clear MSB
 
-putchr: 	pushw %bx			# Save
+putchr:		pushw %bx			# Save
 		movw $0x7,%bx	 		# Page:attribute
 		movb $0xe,%ah			# BIOS: Display
 		int $0x10			#  character
@@ -331,7 +331,7 @@ putchr: 	pushw %bx			# Save
 
 # One-sector disk I/O routine
 
-intx13: 	movb 0x1(%si),%dh		# Load head
+intx13:		movb 0x1(%si),%dh		# Load head
 		movw 0x2(%si),%cx		# Load cylinder:sector
 		movb $0x1,%al			# Sector count
 		pushw %si			# Save
@@ -355,7 +355,7 @@ intx13.1:	int $0x13			# BIOS: Disk I/O
 # Menu strings
 
 item:		.ascii "  ";	     .byte ' '|0x80
-prompt: 	.ascii "\nDefault:"; .byte ' '|0x80
+prompt:		.ascii "\nDefault:"; .byte ' '|0x80
 crlf:		.ascii "\r";	     .byte '\n'|0x80
 
 # Partition type tables
@@ -391,10 +391,10 @@ tables:
 # the end of the string. (not so great for Russians but...)
 #
 os_misc:	.ascii "?";    .byte '?'|0x80
-os_dos: 	.ascii "DO";   .byte 'S'|0x80
+os_dos:		.ascii "DO";   .byte 'S'|0x80
 os_linux:	.ascii "Linu"; .byte 'x'|0x80
 os_freebsd:	.ascii "Free"
-os_bsd: 	.ascii "BS";   .byte 'D'|0x80
+os_bsd:		.ascii "BS";   .byte 'D'|0x80
 
 		.org PRT_OFF-0xe,0x90
 
@@ -406,14 +406,14 @@ os_bsd: 	.ascii "BS";   .byte 'D'|0x80
 # is part of the same string.
 #
 drive:		.ascii "Drive "
-nxtdrv: 	.byte 0x0			# Next drive number
+nxtdrv:		.byte 0x0			# Next drive number
 opt:		.byte 0x0			# Option
-setdrv: 	.byte 0x80			# Drive to force
+setdrv:		.byte 0x80			# Drive to force
 flags:		.byte FLAGS			# Flags
 ticks:		.word TICKS			# Delay
 
 #
 # here is the 64 byte partition table that fdisk would fiddle with.
 #
-partbl: 	.fill 0x40,0x1,0x0		# Partition table
+partbl:		.fill 0x40,0x1,0x0		# Partition table
 		.word MAGIC			# Magic number
diff --git a/sys/boot/i386/boot0/boot0ext.S b/sys/boot/i386/boot0/boot0ext.S
index f0a9550..305a4ba 100644
--- a/sys/boot/i386/boot0/boot0ext.S
+++ b/sys/boot/i386/boot0/boot0ext.S
@@ -72,9 +72,9 @@ start:		cld				# String ops inc
 		movw %ax,%ds			#  data
 		movw %ax,%ss			# Set up
 		movw $LOAD,%sp			#  stack
-# 
+#
 # End signature code
-# 
+#
 #
 # Set address for variable space beyond code, and clear it.
 # Notice that this is also used to point to the values embedded in the block,
@@ -98,7 +98,7 @@ boot.1:		movb LOAD+setdrv-start,%dl	# Drive number to use
 boot.2:
 #
 # Reload all of boot0 (including the extra sectors) into memory at the
-# relocation address.  
+# relocation address.
 #
 		push %dx			# Save drive number
 		movw $start,%bx			# Origin we were linked for
@@ -130,7 +130,7 @@ main:		movb %dl,_FAKE(%bp)		# Save drive number
 # Loop around on the partition table, printing values until we
 # pass a 256 byte boundary. The end of loop test is at main.5.
 #
-main.3: 	movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
+main.3:		movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
 		btw %dx,_FLAGS(%bp)		# Entry enabled?
 		jnc main.5			# No
 #
@@ -157,16 +157,16 @@ main.3: 	movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
 # pointing at its first element which points to a "?".
 #
 		addw $TBL1SZ,%di		# Adjust
-main.4: 	movb (%di),%cl			# Partition
+main.4		movb (%di),%cl			# Partition
 		addw %cx,%di			#  description
 		callw putx			# Display it
-main.5: 	incw %dx			# Next item 
+main.5		incw %dx			# Next item
 		addb $0x10,%bl			# Next entry
 		jnc main.3			# Till done
 #
 # Passed a 256 byte boundary..
 # table is finished.
-# Add one to the drive number and check it is valid, 
+# Add one to the drive number and check it is valid,
 #
 		popw %ax			# Drive number
 		subb $0x80-0x1,%al		# Does next
@@ -188,7 +188,7 @@ main.5: 	incw %dx			# Next item
 # This also is part of the printed drive string so add 0x80 to indicate
 # end of string.
 #
-main.6: 	addb $'0'|0x80,%al		# Save next
+main.6:		addb $'0'|0x80,%al		# Save next
 		movb %al,_NXTDRV(%bp)		#  drive number
 		movw $drive,%di			# Display
 		callw putx			#  item
@@ -196,7 +196,7 @@ main.6: 	addb $'0'|0x80,%al		# Save next
 # Now that we've printed the drive (if we needed to), display a prompt.
 # Get ready for the input by noting the time.
 #
-main.7: 	movw $prompt,%si		# Display
+main.7:		movw $prompt,%si		# Display
 		callw putstr			#  prompt
 		movb _OPT(%bp),%dl		# Display
 		decw %si			#  default
@@ -205,11 +205,11 @@ main.7: 	movw $prompt,%si		# Display
 		int $0x1a			#  system time
 		movw %dx,%di			# Ticks when
 		addw _TICKS(%bp),%di	 	#  timeout
-# 
+#
 # Busy loop, looking for keystrokes but
 # keeping one eye on the time.
 #
-main.8: 	movb $0x1,%ah			# BIOS: Check
+main.8:		movb $0x1,%ah			# BIOS: Check
 		int $0x16			#  for keypress
 		jnz main.11			# Have one
 		xorb %ah,%ah			# BIOS: Get
@@ -219,12 +219,12 @@ main.8: 	movb $0x1,%ah			# BIOS: Check
 #
 # If timed out or defaulting, come here.
 #
-main.9: 	movb _OPT(%bp),%al		# Load default
+main.9:		movb _OPT(%bp),%al		# Load default
 		jmp main.12			# Join common code
 #
 # User's last try was bad, beep in displeasure.
 # Since nothing was printed, just continue on as if the user
-# hadn't done anything. This gives the effect of the user getting a beep 
+# hadn't done anything. This gives the effect of the user getting a beep
 # for all bad keystrokes but no action until either the timeout
 # occurs or the user hits a good key.
 #
@@ -293,7 +293,7 @@ main.14:	popw %si			# Restore
 		jne main.15			# If not F5/#5
 		movb _NXTDRV(%bp),%dl		# Next drive
 		subb $'0',%dl			#  number
-# 
+#
 # load  selected bootsector to the LOAD location in RAM.
 # If it fails to read or isn't marked bootable, treat it
 # as a bad selection.
@@ -311,7 +311,7 @@ main.15:	movw $LOAD,%bx			# Address for read
 # Display routines
 #
 
-putkey: 	movb $'F',%al			# Display
+putkey:		movb $'F',%al			# Display
 		callw putchr			#  'F'
 		movb $'1',%al			# Prepare
 		addb %dl,%al			#  digit
@@ -330,14 +330,14 @@ puts:		callw putstr			# Display string
 
 putn:		movw $crlf,%si			# To next line
 
-putstr: 	lodsb				# Get byte
+putstr:		lodsb				# Get byte
 		testb $0x80,%al 		# End of string?
 		jnz putstr.2			# Yes
 putstr.1:	callw putchr			# Display char
 		jmp putstr			# Continue
 putstr.2:	andb $~0x80,%al 		# Clear MSB
 
-putchr: 	pushw %bx			# Save
+putchr:		pushw %bx			# Save
 		movw $0x7,%bx	 		# Page:attribute
 		movb $0xe,%ah			# BIOS: Display
 		int $0x10			#  character
@@ -360,7 +360,7 @@ putchr: 	pushw %bx			# Save
 # to use the EDD stuff with the LBA offset instead of CHS.  However,
 # use CHS if at all possible.
 
-intx13: 	movb 0x1(%si),%dh		# Load head
+intx13:		movb 0x1(%si),%dh		# Load head
 		movw 0x2(%si),%cx		# Load cylinder:sector
 		pushw %si			# Save
 		movw %sp,%di			# Save
@@ -405,25 +405,25 @@ intx13.2:	int $0x13			# BIOS: Disk I/O
 		.org PRT_OFF-0xe,0x90
 #
 # These values are sometimes changed before writing back to the drive
-# Be especially careful that nxtdrv: must come after drive:, as it 
+# Be especially careful that nxtdrv: must come after drive:, as it
 # is part of the same string.
 #
 # Note that the 'drive' string variable is used as the second signature
 # check in boot0cfg(8).
 #
 version_minor:	.byte 0x1			# minor version
-version_major:	.byte 0x1			# major version	
+version_major:	.byte 0x1			# major version
 drive:		.ascii "Drive "
-nxtdrv: 	.byte 0x0			# Next drive number
+nxtdrv:		.byte 0x0			# Next drive number
 opt:		.byte 0x0			# Option
-setdrv: 	.byte 0x80			# Drive to force
+setdrv:		.byte 0x80			# Drive to force
 flags:		.byte FLAGS			# Flags
 ticks:		.word TICKS			# Delay
 
 #
 # here is the 64 byte partition table that fdisk would fiddle with.
 #
-partbl: 	.fill 0x40,0x1,0x0		# Partition table
+partbl:		.fill 0x40,0x1,0x0		# Partition table
 		.word MAGIC			# Magic number
 
 #
@@ -433,7 +433,7 @@ partbl: 	.fill 0x40,0x1,0x0		# Partition table
 # Menu strings
 
 item:		.ascii "  ";	     .byte ' '|0x80
-prompt: 	.ascii "\nDefault:"; .byte ' '|0x80
+prompt:		.ascii "\nDefault:"; .byte ' '|0x80
 crlf:		.ascii "\r";	     .byte '\n'|0x80
 
 # Partition type tables
@@ -470,13 +470,13 @@ table1_end:
 		.byte os_openbsd-.		# OpenBSD
 		.byte os_netbsd-.		# NetBSD
 #
-# And here are the strings themselves. 0x80 or'd into a byte indicates 
+# And here are the strings themselves. 0x80 or'd into a byte indicates
 # the end of the string. (not so great for Russians but...)
 #
 os_misc:	.ascii "Unknow";	.byte 'n'|0x80
-os_dos: 	.ascii "DO";		.byte 'S'|0x80
+os_dos:		.ascii "DO";		.byte 'S'|0x80
 os_nt:		.ascii "Windows NT/X";	.byte 'P'|0x80
-os_windows: 	.ascii "Window";	.byte 's'|0x80
+os_windows:	.ascii "Window";	.byte 's'|0x80
 os_unix:	.ascii "UNI";		.byte 'X'|0x80
 os_linux:	.ascii "Linu";		.byte 'x'|0x80
 os_freebsd:	.ascii "FreeBS";	.byte 'D'|0x80
diff --git a/sys/boot/i386/boot0/boot0ext.s b/sys/boot/i386/boot0/boot0ext.s
index f0a9550..305a4ba 100644
--- a/sys/boot/i386/boot0/boot0ext.s
+++ b/sys/boot/i386/boot0/boot0ext.s
@@ -72,9 +72,9 @@ start:		cld				# String ops inc
 		movw %ax,%ds			#  data
 		movw %ax,%ss			# Set up
 		movw $LOAD,%sp			#  stack
-# 
+#
 # End signature code
-# 
+#
 #
 # Set address for variable space beyond code, and clear it.
 # Notice that this is also used to point to the values embedded in the block,
@@ -98,7 +98,7 @@ boot.1:		movb LOAD+setdrv-start,%dl	# Drive number to use
 boot.2:
 #
 # Reload all of boot0 (including the extra sectors) into memory at the
-# relocation address.  
+# relocation address.
 #
 		push %dx			# Save drive number
 		movw $start,%bx			# Origin we were linked for
@@ -130,7 +130,7 @@ main:		movb %dl,_FAKE(%bp)		# Save drive number
 # Loop around on the partition table, printing values until we
 # pass a 256 byte boundary. The end of loop test is at main.5.
 #
-main.3: 	movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
+main.3:		movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
 		btw %dx,_FLAGS(%bp)		# Entry enabled?
 		jnc main.5			# No
 #
@@ -157,16 +157,16 @@ main.3: 	movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
 # pointing at its first element which points to a "?".
 #
 		addw $TBL1SZ,%di		# Adjust
-main.4: 	movb (%di),%cl			# Partition
+main.4		movb (%di),%cl			# Partition
 		addw %cx,%di			#  description
 		callw putx			# Display it
-main.5: 	incw %dx			# Next item 
+main.5		incw %dx			# Next item
 		addb $0x10,%bl			# Next entry
 		jnc main.3			# Till done
 #
 # Passed a 256 byte boundary..
 # table is finished.
-# Add one to the drive number and check it is valid, 
+# Add one to the drive number and check it is valid,
 #
 		popw %ax			# Drive number
 		subb $0x80-0x1,%al		# Does next
@@ -188,7 +188,7 @@ main.5: 	incw %dx			# Next item
 # This also is part of the printed drive string so add 0x80 to indicate
 # end of string.
 #
-main.6: 	addb $'0'|0x80,%al		# Save next
+main.6:		addb $'0'|0x80,%al		# Save next
 		movb %al,_NXTDRV(%bp)		#  drive number
 		movw $drive,%di			# Display
 		callw putx			#  item
@@ -196,7 +196,7 @@ main.6: 	addb $'0'|0x80,%al		# Save next
 # Now that we've printed the drive (if we needed to), display a prompt.
 # Get ready for the input by noting the time.
 #
-main.7: 	movw $prompt,%si		# Display
+main.7:		movw $prompt,%si		# Display
 		callw putstr			#  prompt
 		movb _OPT(%bp),%dl		# Display
 		decw %si			#  default
@@ -205,11 +205,11 @@ main.7: 	movw $prompt,%si		# Display
 		int $0x1a			#  system time
 		movw %dx,%di			# Ticks when
 		addw _TICKS(%bp),%di	 	#  timeout
-# 
+#
 # Busy loop, looking for keystrokes but
 # keeping one eye on the time.
 #
-main.8: 	movb $0x1,%ah			# BIOS: Check
+main.8:		movb $0x1,%ah			# BIOS: Check
 		int $0x16			#  for keypress
 		jnz main.11			# Have one
 		xorb %ah,%ah			# BIOS: Get
@@ -219,12 +219,12 @@ main.8: 	movb $0x1,%ah			# BIOS: Check
 #
 # If timed out or defaulting, come here.
 #
-main.9: 	movb _OPT(%bp),%al		# Load default
+main.9:		movb _OPT(%bp),%al		# Load default
 		jmp main.12			# Join common code
 #
 # User's last try was bad, beep in displeasure.
 # Since nothing was printed, just continue on as if the user
-# hadn't done anything. This gives the effect of the user getting a beep 
+# hadn't done anything. This gives the effect of the user getting a beep
 # for all bad keystrokes but no action until either the timeout
 # occurs or the user hits a good key.
 #
@@ -293,7 +293,7 @@ main.14:	popw %si			# Restore
 		jne main.15			# If not F5/#5
 		movb _NXTDRV(%bp),%dl		# Next drive
 		subb $'0',%dl			#  number
-# 
+#
 # load  selected bootsector to the LOAD location in RAM.
 # If it fails to read or isn't marked bootable, treat it
 # as a bad selection.
@@ -311,7 +311,7 @@ main.15:	movw $LOAD,%bx			# Address for read
 # Display routines
 #
 
-putkey: 	movb $'F',%al			# Display
+putkey:		movb $'F',%al			# Display
 		callw putchr			#  'F'
 		movb $'1',%al			# Prepare
 		addb %dl,%al			#  digit
@@ -330,14 +330,14 @@ puts:		callw putstr			# Display string
 
 putn:		movw $crlf,%si			# To next line
 
-putstr: 	lodsb				# Get byte
+putstr:		lodsb				# Get byte
 		testb $0x80,%al 		# End of string?
 		jnz putstr.2			# Yes
 putstr.1:	callw putchr			# Display char
 		jmp putstr			# Continue
 putstr.2:	andb $~0x80,%al 		# Clear MSB
 
-putchr: 	pushw %bx			# Save
+putchr:		pushw %bx			# Save
 		movw $0x7,%bx	 		# Page:attribute
 		movb $0xe,%ah			# BIOS: Display
 		int $0x10			#  character
@@ -360,7 +360,7 @@ putchr: 	pushw %bx			# Save
 # to use the EDD stuff with the LBA offset instead of CHS.  However,
 # use CHS if at all possible.
 
-intx13: 	movb 0x1(%si),%dh		# Load head
+intx13:		movb 0x1(%si),%dh		# Load head
 		movw 0x2(%si),%cx		# Load cylinder:sector
 		pushw %si			# Save
 		movw %sp,%di			# Save
@@ -405,25 +405,25 @@ intx13.2:	int $0x13			# BIOS: Disk I/O
 		.org PRT_OFF-0xe,0x90
 #
 # These values are sometimes changed before writing back to the drive
-# Be especially careful that nxtdrv: must come after drive:, as it 
+# Be especially careful that nxtdrv: must come after drive:, as it
 # is part of the same string.
 #
 # Note that the 'drive' string variable is used as the second signature
 # check in boot0cfg(8).
 #
 version_minor:	.byte 0x1			# minor version
-version_major:	.byte 0x1			# major version	
+version_major:	.byte 0x1			# major version
 drive:		.ascii "Drive "
-nxtdrv: 	.byte 0x0			# Next drive number
+nxtdrv:		.byte 0x0			# Next drive number
 opt:		.byte 0x0			# Option
-setdrv: 	.byte 0x80			# Drive to force
+setdrv:		.byte 0x80			# Drive to force
 flags:		.byte FLAGS			# Flags
 ticks:		.word TICKS			# Delay
 
 #
 # here is the 64 byte partition table that fdisk would fiddle with.
 #
-partbl: 	.fill 0x40,0x1,0x0		# Partition table
+partbl:		.fill 0x40,0x1,0x0		# Partition table
 		.word MAGIC			# Magic number
 
 #
@@ -433,7 +433,7 @@ partbl: 	.fill 0x40,0x1,0x0		# Partition table
 # Menu strings
 
 item:		.ascii "  ";	     .byte ' '|0x80
-prompt: 	.ascii "\nDefault:"; .byte ' '|0x80
+prompt:		.ascii "\nDefault:"; .byte ' '|0x80
 crlf:		.ascii "\r";	     .byte '\n'|0x80
 
 # Partition type tables
@@ -470,13 +470,13 @@ table1_end:
 		.byte os_openbsd-.		# OpenBSD
 		.byte os_netbsd-.		# NetBSD
 #
-# And here are the strings themselves. 0x80 or'd into a byte indicates 
+# And here are the strings themselves. 0x80 or'd into a byte indicates
 # the end of the string. (not so great for Russians but...)
 #
 os_misc:	.ascii "Unknow";	.byte 'n'|0x80
-os_dos: 	.ascii "DO";		.byte 'S'|0x80
+os_dos:		.ascii "DO";		.byte 'S'|0x80
 os_nt:		.ascii "Windows NT/X";	.byte 'P'|0x80
-os_windows: 	.ascii "Window";	.byte 's'|0x80
+os_windows:	.ascii "Window";	.byte 's'|0x80
 os_unix:	.ascii "UNI";		.byte 'X'|0x80
 os_linux:	.ascii "Linu";		.byte 'x'|0x80
 os_freebsd:	.ascii "FreeBS";	.byte 'D'|0x80
diff --git a/sys/boot/i386/boot0/boot0sio.s b/sys/boot/i386/boot0/boot0sio.s
index 17305d8..62e6556 100644
--- a/sys/boot/i386/boot0/boot0sio.s
+++ b/sys/boot/i386/boot0/boot0sio.s
@@ -107,12 +107,12 @@ main:		pushw %dx			# Save
 		jnz main.1			# Yes
 		testb %dl,%dl			# Drive number valid?
 		js main.2			# Possibly (0x80 set)
-main.1: 	movb _SETDRV(%bp),%dl		# Drive number to use
+main.1:		movb _SETDRV(%bp),%dl		# Drive number to use
 #
 # Whatever we decided to use, now store it into the fake
 # partition entry that lives in the data space above us.
 #
-main.2: 	movb %dl,_FAKE(%bp)		# Save drive number
+main.2:		movb %dl,_FAKE(%bp)		# Save drive number
 		callw putn			# To new line
 		pushw %dx			# Save drive number
 #
@@ -128,7 +128,7 @@ main.2: 	movb %dl,_FAKE(%bp)		# Save drive number
 # Loop around on the partition table, printing values until we
 # pass a 256 byte boundary. The end of loop test is at main.5.
 #
-main.3: 	movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
+main.3:		movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
 		btw %dx,_FLAGS(%bp)		# Entry enabled?
 		jnc main.5			# No
 #
@@ -155,10 +155,10 @@ main.3: 	movb %ch,-0x4(%bx)		# Zero active flag (ch == 0)
 # pointing at its first element which points to a "?".
 #
 		addw $TBL1SZ,%di		# Adjust
-main.4: 	movb (%di),%cl			# Partition
+main.4:		movb (%di),%cl			# Partition
 		addw %cx,%di			#  description
 		callw putx			# Display it
-main.5: 	incw %dx			# Next item
+main.5:		incw %dx			# Next item
 		addb $0x10,%bl			# Next entry
 		jnc main.3			# Till done
 #
@@ -186,7 +186,7 @@ main.5: 	incw %dx			# Next item
 # This also is part of the printed drive string so add 0x80 to indicate
 # end of string.
 #
-main.6: 	addb $'0'|0x80,%al		# Save next
+main.6:		addb $'0'|0x80,%al		# Save next
 		movb %al,_NXTDRV(%bp)		#  drive number
 		movw $drive,%di			# Display
 		callw putx			#  item
@@ -194,7 +194,7 @@ main.6: 	addb $'0'|0x80,%al		# Save next
 # Now that we've printed the drive (if we needed to), display a prompt.
 # Get ready for the input byte noting the time.
 #
-main.7: 	movw $prompt,%si		# Display
+main.7:		movw $prompt,%si		# Display
 		callw putstr			#  prompt
 		movb _OPT(%bp),%dl		# Display
 		decw %si			#  default
@@ -224,7 +224,7 @@ main.8:		xorw %dx,%dx			# Use COM1
 #
 # If timed out or defaulting, come here.
 #
-main.9: 	movb _OPT(%bp),%al		# Load default
+main.9:		movb _OPT(%bp),%al		# Load default
 		jmp main.12			# Join common code
 #
 # User's last try was bad, beep in displeasure.
@@ -239,7 +239,7 @@ main.10:	movb $ASCII_BEL,%al		# Signal
 #
 # Check the character we just got on the serial port.
 #
-main.11: 	movb $0x02,%ah			# BIOS: Receive
+main.11:	movb $0x02,%ah			# BIOS: Receive
 		int $0x14			#  COM Byte
 #
 # If it's CR act as if timed out.
@@ -316,7 +316,7 @@ main.15:	movw $LOAD,%bx			# Address for read
 # Display routines
 #
 
-putkey: 	movb $ASCII_1,%al		# Prepare
+putkey:		movb $ASCII_1,%al		# Prepare
 		addb %dl,%al			#  digit
 		jmp putstr.1			# Display the rest
 
@@ -333,7 +333,7 @@ puts:		callw putstr			# Display string
 
 putn:		movw $crlf,%si			# To next line
 
-putstr: 	lodsb				# Get byte
+putstr:		lodsb				# Get byte
 		testb $0x80,%al 		# End of string?
 		jnz putstr.2			# Yes
 putstr.1:	callw putchr			# Display char
@@ -350,7 +350,7 @@ putchr:		pushw %dx			# Save
 
 # One-sector disk I/O routine
 
-intx13: 	movb 0x1(%si),%dh		# Load head
+intx13:		movb 0x1(%si),%dh		# Load head
 		movw 0x2(%si),%cx		# Load cylinder:sector
 		movb $0x1,%al			# Sector count
 		pushw %si			# Save
@@ -374,7 +374,7 @@ intx13.1:	int $0x13			# BIOS: Disk I/O
 # Menu strings
 
 item:		.ascii " ";	     .byte ' '|0x80
-prompt: 	.ascii "\nDef:";     .byte ' '|0x80
+prompt:		.ascii "\nDef:";     .byte ' '|0x80
 crlf:		.ascii "\r";	     .byte '\n'|0x80
 
 # Partition type tables
@@ -410,10 +410,10 @@ tables:
 # the end of the string. (not so great for Russians but...)
 #
 os_misc:	.ascii "?";    .byte '?'|0x80
-os_dos: 	.ascii "DO";   .byte 'S'|0x80
+os_dos:		.ascii "DO";   .byte 'S'|0x80
 os_linux:	.ascii "Linu"; .byte 'x'|0x80
 os_freebsd:	.ascii "Free"
-os_bsd: 	.ascii "BS";   .byte 'D'|0x80
+os_bsd:		.ascii "BS";   .byte 'D'|0x80
 
 		.org PRT_OFF-0xe,0x90
 
@@ -425,14 +425,14 @@ os_bsd: 	.ascii "BS";   .byte 'D'|0x80
 # is part of the same string.
 #
 drive:		.ascii "Drive "
-nxtdrv: 	.byte 0x0			# Next drive number
+nxtdrv:		.byte 0x0			# Next drive number
 opt:		.byte 0x0			# Option
-setdrv: 	.byte 0x80			# Drive to force
+setdrv:		.byte 0x80			# Drive to force
 flags:		.byte FLAGS			# Flags
 ticks:		.word TICKS			# Delay
 
 #
 # here is the 64 byte partition table that fdisk would fiddle with.
 #
-partbl: 	.fill 0x40,0x1,0x0		# Partition table
+partbl:		.fill 0x40,0x1,0x0		# Partition table
 		.word MAGIC			# Magic number