summaryrefslogtreecommitdiff
path: root/usr/src/boot/sys
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/boot/sys')
-rw-r--r--usr/src/boot/sys/boot/forth/logo-illumos.4th38
-rw-r--r--usr/src/boot/sys/boot/i386/cdboot/cdboot.S8
2 files changed, 23 insertions, 23 deletions
diff --git a/usr/src/boot/sys/boot/forth/logo-illumos.4th b/usr/src/boot/sys/boot/forth/logo-illumos.4th
index 656f5ff53b..84948ec3ad 100644
--- a/usr/src/boot/sys/boot/forth/logo-illumos.4th
+++ b/usr/src/boot/sys/boot/forth/logo-illumos.4th
@@ -38,25 +38,25 @@
0 0 0 0 0 s" /boot/illumos.png" fb-putimage if 2drop exit then
- s" @[33m, " logo+
- s" @[33m,./% @[31m& " logo+
- s" @[33m(****@[31m*( " logo+
- s" @[33m*/*@[31m// " logo+
- s" @[33m*,//@[31m/(( " logo+
- s" @[33m,*/@[31m/((/% " logo+
- s" @[33m//@[31m/((((% " logo+
- s" @[33m,*@[31m/(((((% @[33m&@[31m#///((&" logo+
- s" @[33m./@[31m//((((((% %/(((/ " logo+
- s" @[33m./@[31m///(((((///((, " logo+
- s" @[33m.*//@[31m//(((((((((( " logo+
- s" ./((((((((/ " logo+
- s" (/((((((( " logo+
- s" ,,((((((/ " logo+
- s" /(((( " logo+
- s" %/(((( " logo+
- s" @[33m&@[31m%#/((((. " logo+
- s" @[33m,@[31m( ,/ /(/ " logo+
- s" ,/@[m " logo+
+ s" @[33m,@[m " logo+
+ s" @[33m,./% @[31m&@[m " logo+
+ s" @[33m(****@[31m*(@[m " logo+
+ s" @[33m*/*@[31m//@[m " logo+
+ s" @[33m*,//@[31m/((@[m " logo+
+ s" @[33m,*/@[31m/((/%@[m " logo+
+ s" @[33m//@[31m/((((%@[m " logo+
+ s" @[33m,*@[31m/(((((%@[m @[33m&@[31m#///((&@[m" logo+
+ s" @[33m./@[31m//((((((%@[m @[31m%/(((/@[m " logo+
+ s" @[33m./@[31m///(((((///((,@[m " logo+
+ s" @[33m.*//@[31m//((((((((((@[m " logo+
+ s" @[31m./((((((((/@[m " logo+
+ s" @[31m(/(((((((@[m " logo+
+ s" @[31m,,((((((/@[m " logo+
+ s" @[31m/((((@[m " logo+
+ s" @[31m%/((((@[m " logo+
+ s" @[33m&@[31m%#/((((.@[m " logo+
+ s" @[33m,@[31m(@[m @[31m,/@[m @[31m/(/@[m " logo+
+ s" @[31m,/@[m " logo+
2drop
;
diff --git a/usr/src/boot/sys/boot/i386/cdboot/cdboot.S b/usr/src/boot/sys/boot/i386/cdboot/cdboot.S
index 22e277eace..3ab75c1fb2 100644
--- a/usr/src/boot/sys/boot/i386/cdboot/cdboot.S
+++ b/usr/src/boot/sys/boot/i386/cdboot/cdboot.S
@@ -34,7 +34,7 @@
#
# Basically, we first create a set of boot arguments to pass to the loaded
# binary. Then we attempt to load /boot/loader from the CD we were booted
-# off of.
+# from.
#
#include <bootargs.h>
@@ -136,7 +136,7 @@ real_start: cld # string ops inc
stosl # to zero
mov drive,%dl # Store BIOS boot device
mov %dl,0x4(%bx) # in kargs->bootdev
- or $KARGS_FLAGS_CD,0x8(%bx) # kargs->bootflags |=
+ orb $KARGS_FLAGS_CD,0x8(%bx) # kargs->bootflags |=
# KARGS_FLAGS_CD
#
# Load Volume Descriptor
@@ -494,7 +494,7 @@ twiddle: push %ax # Save
# legacy-free and simply doesn't have a keyboard controller.
# Thus, the A20 line is already enabled.
#
-seta20: cli # Disable interrupts
+seta20: cli # Disable interrupts
xor %cx,%cx # Clear
seta20.1: inc %cx # Increment, overflow?
jz seta20.3 # Yes
@@ -518,7 +518,7 @@ hex8: pushl %eax # Save
shrb $0x4,%al # Do upper
call hex8.1 # 4
popl %eax # Restore
-hex8.1: andb $0xf,%al # Get lower 4
+hex8.1: andb $0xf,%al # Get lower 4
cmpb $0xa,%al # Convert
sbbb $0x69,%al # to hex
das # digit