diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-08 13:02:33 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-08 13:02:33 +0000 |
| commit | a1d6a2531188cc9154c8090624e5527e4703867b (patch) | |
| tree | 99b69ccc17f40c55018cf0a31f76b0d6e9e814d6 /usr/src/uts/common/sys/fbio.h | |
| parent | 7a899a42e86d8d3e6d7d3eaf31bcacc6411fbb74 (diff) | |
| parent | 2a1fd0ffe121888d44fdec321c25b53dcfaa9118 (diff) | |
| download | illumos-joyent-a1d6a2531188cc9154c8090624e5527e4703867b.tar.gz | |
[illumos-gate merge]
commit 2a1fd0ffe121888d44fdec321c25b53dcfaa9118
10318 Remove starfire support
commit 84a8796cdac4378079f720e0ca4d2ff15eb1b8b7
10353 uts: tem_safe_pix_clear_prom_output() fails to clear the first line
commit e09cef950d257b6d3955013d461825bbc79322ef
10345 segspt_badop: cast between incompatible function types
commit 5a80180135ef1464c88328124fbd15e94a5fb632
10337 uts: tem implement cls callback & visual_io v4
commit 82bb7c22d8e83f1de600f67544ab4c79e4d44b14
10331 uts: gfx_private bitmap framebuffer implementation
commit 11f30dc397b17ef5d8b607824b7b028e4d3c4648
10314 nvmeadm: NULL pointer errors
commit 0fbb50554d1bc9b33ef3b8e4e35eef6d94a8a56e
10237 Disable smatch for iasl
commit f821b9564d61a645b0618fe71d527eeec8b2e4b5
10339 uts: x86 should have tem 80x25
commit 09e2ab34f6c69b170fe7478e8b011d6bb505e0d9
10322 usr/lib/libc - remove lint and lint libraries
Conflicts:
usr/src/uts/i86xpv/Makefile.files
Diffstat (limited to 'usr/src/uts/common/sys/fbio.h')
| -rw-r--r-- | usr/src/uts/common/sys/fbio.h | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/usr/src/uts/common/sys/fbio.h b/usr/src/uts/common/sys/fbio.h index 441991c26f..11debf4c95 100644 --- a/usr/src/uts/common/sys/fbio.h +++ b/usr/src/uts/common/sys/fbio.h @@ -27,8 +27,6 @@ #ifndef _SYS_FBIO_H #define _SYS_FBIO_H -#pragma ident "%Z%%M% %I% %E% SMI" /* SunOS4.1.2 5.49 */ - #include <sys/types.h> #ifdef __cplusplus @@ -91,9 +89,9 @@ struct fbcmap { struct fbcmap32 { int32_t index; /* first element (0 origin) */ int32_t count; /* number of elements */ - caddr32_t red; /* red color map elements */ - caddr32_t green; /* green color map elements */ - caddr32_t blue; /* blue color map elements */ + caddr32_t red; /* red color map elements */ + caddr32_t green; /* green color map elements */ + caddr32_t blue; /* blue color map elements */ }; #endif /* _SYSCALL32 */ @@ -300,6 +298,20 @@ struct fb_wid_dbl_info { #define FBIO_WID_DBL_SET (FIOC|37) #define FBIOVRTOFFSET (FIOC|38) +struct gfxfb_info { + uint16_t terminal_origin_x; + uint16_t terminal_origin_y; + uint32_t pitch; + uint16_t font_width; + uint16_t font_height; + uint8_t red_mask_size; + uint8_t red_field_position; + uint8_t green_mask_size; + uint8_t green_field_position; + uint8_t blue_mask_size; + uint8_t blue_field_position; +}; + struct cg6_info { ushort_t accessible_width; /* accessible bytes in scanline */ ushort_t accessible_height; /* number of accessible scanlines */ |