Hi,
I'm sending some patches adding support for splashy
(http://splashy.alioth.debian.org). It is a bootsplash system
implemented in user space using the directfb library. The experimental
branch in svn (svn://svn.debian.org/svn/splashy/branches/0.3) now
produces a library to which uswsusp can link.
Is is a series of 5 patches, the second and the third are not directly
related to splashy support, but they are related to splash and output.
--
This moves the order of prepare_console and prepare_splash. This is
because the splash system may launch on a different console and
prepare_console will then switch away.
Also it removes the ioctls around freeze(), IIRC this is an attempt
to lock against VT-switching. The way it is implemented now will
make s2disk switch away from the splash VT. IMHO it is unneeded.
Index: suspend.c
===================================================================
--- suspend.c (revision 155)
+++ suspend.c (revision 156)
@@ -661,17 +661,12 @@
return ENOSPC;
}
- ioctl(vt_fd, KDSKBMODE, K_MEDIUMRAW);
- ioctl(vt_fd, VT_ACTIVATE, vt_no);
- ioctl(vt_fd, VT_WAITACTIVE, vt_no);
- ioctl(vt_fd, KDSETMODE, KD_GRAPHICS);
error = freeze(snapshot_fd);
- ioctl(vt_fd, KDSETMODE, KD_TEXT);
- ioctl(vt_fd, KDSKBMODE, K_XLATE);
- ioctl(vt_fd, VT_ACTIVATE, vt_no);
- ioctl(vt_fd, VT_WAITACTIVE, vt_no);
+ /* This a hack for a bug in bootsplash. Apparently it will
+ * drop to 'verbose mode' after the freeze() call.
+ */
splash.switch_to();
splash.progress(15);
if (error)
@@ -1158,8 +1149,6 @@
goto Close_snapshot_fd;
}
- splash_prepare(&splash, splash_param);
-
vt_fd = prepare_console(&orig_vc, &suspend_vc);
if (vt_fd < 0) {
ret = errno;
@@ -1167,6 +1156,8 @@
goto Close_snapshot_fd;
}
+ splash_prepare(&splash, splash_param);
+
splash.progress(5);
#ifdef CONFIG_BOTH
@@ -1206,8 +1197,8 @@
close_swappiness();
Restore_console:
- restore_console(vt_fd, orig_vc);
splash.finish();
+ restore_console(vt_fd, orig_vc);
Close_snapshot_fd:
close(snapshot_fd);
Close_resume_fd:
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Suspend-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/suspend-devel
