Hi,
the first hunk fixes s2ram -n, without it does not print what hacks would
actually be applied.
The other hunks let s2ram complain louder about machines that are still
UNSURE. The fedora guys made pretty bad experiences with entries marked
UNSURE and we actually seldom get reports to confirm those, since s2ram
is quite silent about this flag. I changed that. Now it also complains
during a plain "s2ram" call, even though it will probably just work.
I will need to move s2ram_check() before machine_known() to fix the
"implicit declaration"-warning, but i'll do that separately to not
obfuscate the patch.
Any objections?
Index: s2ram-x86.c
===================================================================
RCS file: /cvsroot/suspend/suspend/s2ram-x86.c,v
retrieving revision 1.2
diff -u -p -r1.2 s2ram-x86.c
--- s2ram-x86.c 13 May 2007 20:10:16 -0000 1.2
+++ s2ram-x86.c 31 May 2007 15:30:50 -0000
@@ -124,6 +124,8 @@ void machine_known(void)
identify_machine();
}
+ s2ram_check(i);
+
printf("Machine matched entry %d:\n"
" sys_vendor = '%s'\n"
" sys_product = '%s'\n"
@@ -131,7 +133,7 @@ void machine_known(void)
" bios_version = '%s'\n", i,
whitelist[i].sys_vendor, whitelist[i].sys_product,
whitelist[i].sys_version, whitelist[i].bios_version);
- printf("Fixes: 0x%x %s%s%s%s%s%s%s%s\n", flags,
+ printf("Fixes: 0x%x %s%s%s%s%s%s%s%s%s\n", flags,
(flags & VBE_SAVE) ? "VBE_SAVE " : "",
(flags & VBE_POST) ? "VBE_POST " : "",
(flags & VBE_MODE) ? "VBE_MODE " : "",
@@ -139,11 +141,8 @@ void machine_known(void)
(flags & S3_BIOS) ? "S3_BIOS " : "",
(flags & S3_MODE) ? "S3_MODE " : "",
(flags & NOFB) ? "NOFB " : "",
- (flags & PCI_SAVE) ? "PCI_SAVE " : "");
- if (flags & UNSURE)
- printf("Machine is in the whitelist but perhaps using "
- "vbetool unnecessarily.\n"
- "Please try to find minimal options.\n\n");
+ (flags & PCI_SAVE) ? "PCI_SAVE " : "",
+ (flags & UNSURE) ? "UNSURE " : "");
/* in case of a bugreport we might need to find a better match than
* the one we already have (additional BIOS version e.g)...
*/
@@ -160,6 +159,12 @@ int s2ram_check(int id)
flags = whitelist[id].flags;
if ((flags & NOFB) && is_framebuffer())
ret = S2RAM_NOFB;
+ if (flags & UNSURE)
+ printf("ATTENTION:\nYour machine is in the whitelist "
+ " but the entry has not been confirmed.\n"
+ "Please try to find the best options and "
+ "report them as explained on\n"
+ "http://en.opensuse.org/S2ram.\n\n";);
}
return ret;
--
Stefan Seyfried
QA / R&D Team Mobile Devices | "Any ideas, John?"
SUSE LINUX Products GmbH, Nürnberg | "Well, surrounding them's out."
This footer brought to you by insane German lawmakers:
SUSE Linux Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Suspend-devel mailing list
Suspend-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/suspend-devel
