[illumos-gate merge]

commit 981fe1b1a6ca86e9c41a706462f976f947e6f465
    10097 indenting fixes in usr/src/{lib,common}
commit a923e7f4befb22c1dcef53db9008f4a97ad15c3c
    10099 libfakekernel vpanic() should cast away assfail()
commit 49ca4dd9cc393385ef09332b5fdd34023c9bb659
    10268 prtconf needs a bit of tlc
commit 09b644819e59933f6b70f32a06e8a0127ae2b8f9
    10231 loader fb-putimage should support image resizing and placement
commit b0ef425652e5cfce27df9fa5826a9cd64cee110a
    10230 zfs mishandles partial writes
commit 588340b578485109e57c57bc12e5ea214d5c627b
    10127 coreadm is mis-using strcpy()
commit dccbe85045092d9c23c58a4d604e7c57285ba30f
    10246 fix apic_allocate_irq() indentation
commit 7bae76cd719249c96ef7bc1748c4e8838cc6ace1
    10109 libzonecfg needs a smatch fix
commit 10ef8623c60fb2d3d54ff885eafaeaec567a9357
    10096 kstat update routines shouldn't check for NULL kstat
commit 2d1ec69e09f53398451f5a87e38aab2447e00818
    10095 unchecked return value in segvn_pagelock()
commit 523787b97e0a5c576acd92812ade7681cd317b8b
    9097 typos in makemap(1M)/editmap(1M)

1 files changed, 77 insertions, 1 deletions

diff --git a/usr/src/man/man5/loader.5 b/usr/src/man/man5/loader.5
index 69a9261747..745197e8d0 100644
--- a/usr/src/man/man5/loader.5
+++ b/usr/src/man/man5/loader.5
@@ -1,4 +1,5 @@
 .\" Copyright (c) 1999 Daniel C. Sobral
+.\" Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -22,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd July 24, 2018
+.Dd January 14, 2019
 .Dt LOADER 5
 .Os
 .Sh NAME
@@ -703,6 +704,81 @@ Returns the number of seconds since midnight.
 .It Ic tib> Pq -- Ar addr len
 Returns the remainder of the input buffer as a string on the stack.
 .El
+.Ss Loader Extra Framebuffer Words
+.Bl -tag -width XXXXXXXX
+.It Ic fb-bezier Pq Ar x1 y1 x2 y2 x3 y3 width --
+Draws a quadratic Bezier curve in the current foreground color using the
+three provided points and specified line with.
+.It Ic fb-drawrect Pq Ar x1 y1 x2 y2 fill --
+Draws a rectangle to the screen with the top left at
+.Em (x1,y1)
+and the bottom right at
+.Em (x2,y2)
+, using the current foreground color.
+If
+.Em fill
+is
+.Ic true
+then the rectangle will be filled in.
+.It Ic fb-line Pq Ar x1 y1 x2 y2 width --
+Draws a line from
+.Em (x1,y1)
+to
+.Em (x2,y2)
+in the current foreground color and with the specified width.
+.It Ic fb-putimage Pq Ar flags x1 y1 x2 y2 addr len -- flag
+Outputs an image to the screen.
+Returns
+.Ic true
+if the image was able to be written and
+.Ic false
+otherwise.
+Only truecolor PNG images are supported and the path to the file
+must be provided through the
+.Em addr
+and
+.Em len
+arguments on the stack.
+The image will be displayed in the rectangular screen region with the top left
+at
+.Em (x1,y1)
+and the bottom right at
+.Em (x2,y2)
+.
+.Pp
+Either
+.Em x2
+or
+.Em y2
+can be set to "0" which causes it to be calculated to maintain the aspect
+ratio of the image.
+If both are "0" then the native resolution of the image will be used.
+.Pp
+If
+.Em x1
+is "0", then the image will be placed as far over to the right of the
+screen as possible.
+Similarly, if
+.Em y1
+is "0", then the image will be placed as far down the screen as possible.
+.Pp
+Flags is a bitfield; the following bits are defined:
+.Bl -tag -width XXXXX -offset indent
+.It 1
+Draw a single pixel border around the image in the current foreground color.
+.It 2
+Do not scroll the image with the rest of the screen.
+.It 128
+Output diagnostic information (for debugging).
+.El
+.It Ic fb-setpixel Pq Ar x y --
+Colors the pixel at
+.Em (x,y)
+with the current foreground color.
+.It Ic term-drawrect Pq Ar x1 y1 x2 y2 --
+Draws a rectangle with rounded corners using terminal coordinates and the
+current foreground color.
+.El
 .Ss Loader Defined Environmental Queries
 .Bl -tag -width Ds
 .It arch-i386