Page MenuHomeFreeBSD
Files F163270758

D56537.id176340.diff
No OneTemporary
Actions

D56537.id176340.diff
View Options

diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -1684,32 +1684,42 @@
uintptr_t image;
vt_axis_t top, left;
- if (!(vd->vd_flags & VDF_TEXTMODE) && (boothowto & RB_MUTE)) {
- if (rebooting == 1) {
- si = MD_FETCH(preload_kmdp, MODINFOMD_SHTDWNSPLASH, struct splash_info *);
- vd->vd_driver->vd_blank(vd, TC_BLACK);
- } else {
- si = MD_FETCH(preload_kmdp, MODINFOMD_SPLASH, struct splash_info *);
- }
- if (si == NULL) {
- top = (vd->vd_height - vt_logo_height) / 2;
- left = (vd->vd_width - vt_logo_width) / 2;
- vd->vd_driver->vd_bitblt_bmp(vd, vd->vd_curwindow,
- vt_logo_image, NULL, vt_logo_width, vt_logo_height,
- left, top, TC_WHITE, TC_BLACK);
- } else {
- if (si->si_depth != 4)
- return;
- image = (uintptr_t)si + sizeof(struct splash_info);
- image = roundup2(image, 8);
- top = (vd->vd_height - si->si_height) / 2;
- left = (vd->vd_width - si->si_width) / 2;
- vd->vd_driver->vd_bitblt_argb(vd, vd->vd_curwindow,
- (unsigned char *)image, si->si_width, si->si_height,
- left, top);
- }
- vd->vd_flags |= VDF_SPLASH;
+ if ((vd->vd_flags & VDF_TEXTMODE) != 0 || (boothowto & RB_MUTE) == 0)
+ return;
+
+ si = MD_FETCH(preload_kmdp, rebooting == 1 ? MODINFOMD_SHTDWNSPLASH :
+ MODINFOMD_SPLASH, struct splash_info *);
+ if (si == NULL) {
+ if (vd->vd_driver->vd_bitblt_bmp == NULL)
+ return;
+ } else if (vd->vd_driver->vd_bitblt_argb == NULL)
+ return;
+
+ if (rebooting == 1) {
+ if (vd->vd_driver->vd_blank == NULL)
+ return;
+ vd->vd_driver->vd_blank(vd, TC_BLACK);
}
+
+ if (si == NULL) {
+ top = (vd->vd_height - vt_logo_height) / 2;
+ left = (vd->vd_width - vt_logo_width) / 2;
+ vd->vd_driver->vd_bitblt_bmp(vd,
+ vd->vd_curwindow, vt_logo_image, NULL,
+ vt_logo_width, vt_logo_height, left, top,
+ TC_WHITE, TC_BLACK);
+ } else {
+ if (si->si_depth != 4)
+ return;
+ image = (uintptr_t)si + sizeof(struct splash_info);
+ image = roundup2(image, 8);
+ top = (vd->vd_height - si->si_height) / 2;
+ left = (vd->vd_width - si->si_width) / 2;
+ vd->vd_driver->vd_bitblt_argb(vd,
+ vd->vd_curwindow, (unsigned char *)image,
+ si->si_width, si->si_height, left, top);
+ }
+ vd->vd_flags |= VDF_SPLASH;
}
#endif

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 3:11 PM (9 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32130155
Default Alt Text
D56537.id176340.diff (2 KB)

Event Timeline