2 files changed, 55 insertions, 50 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index cd3a84c..835586e 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -1,30 +1,30 @@
 /*
-                     This file is part of the Opie Project
+                             This file is part of the Opie Project
-                      Copyright (C) The Opie Team <opie-devel@handhelds.org>
+                             Copyright (C) The Opie Team <opie-devel@handhelds.org>
              =.
            .=l.
-     .>+-=
+           .>+-=
-_;:,   .>  :=|.         This program is free software; you can
+ _;:,     .>    :=|.         This program is free software; you can
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,   .._         License as published by the Free Software
+.="- .-=="i,     .._         License as published by the Free Software
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
+     ._= =}       :          or (at your option) any later version.
-  .%`+i>    _;_.
+    .%`+i>       _;_.
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  : ..  .:,   . . .    without even the implied warranty of
+    : ..    .:,     . . .    without even the implied warranty of
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=    =    ;      Library General Public License for more
+..}^=.=       =       ;      Library General Public License for more
-++=  -.   .`   .:       details.
++=   -.     .`     .:       details.
-:   = ...= . :.=-
+ :     =  ...= . :.=-
-.  .:....=;==+<;          You should have received a copy of the GNU
+ -.   .:....=;==+<;          You should have received a copy of the GNU
- -_. . .  )=. =           Library General Public License along with
+  -_. . .   )=.  =           Library General Public License along with
-  --    :-=`           this library; see the file COPYING.LIB.
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "odevice_ipaq.h"
@@ -144,13 +144,13 @@ ODevice *ODevice::inst()
            }
        }
        else
        {
            qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO );
        }
-        if ( !dev ) dev = new ODevice();
+        if ( !dev ) dev = new Internal::Zaurus();
        dev->init(cpu_info);
    }
    return dev;
 }
 ODevice::ODevice()
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index bf46e43..c6de614 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -1,30 +1,30 @@
 /*
-                     This file is part of the Opie Project
+                             This file is part of the Opie Project
-                      Copyright (C) The Opie Team <opie-devel@handhelds.org>
+                             Copyright (C) The Opie Team <opie-devel@handhelds.org>
              =.
            .=l.
-     .>+-=
+           .>+-=
-_;:,   .>  :=|.         This program is free software; you can
+ _;:,     .>    :=|.         This program is free software; you can
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,   .._         License as published by the Free Software
+.="- .-=="i,     .._         License as published by the Free Software
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
+     ._= =}       :          or (at your option) any later version.
-  .%`+i>    _;_.
+    .%`+i>       _;_.
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  : ..  .:,   . . .    without even the implied warranty of
+    : ..    .:,     . . .    without even the implied warranty of
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=    =    ;      Library General Public License for more
+..}^=.=       =       ;      Library General Public License for more
-++=  -.   .`   .:       details.
++=   -.     .`     .:       details.
-:   = ...= . :.=-
+ :     =  ...= . :.=-
-.  .:....=;==+<;          You should have received a copy of the GNU
+ -.   .:....=;==+<;          You should have received a copy of the GNU
- -_. . .  )=. =           Library General Public License along with
+  -_. . .   )=.  =           Library General Public License along with
-  --    :-=`           this library; see the file COPYING.LIB.
+    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "odevice_simpad.h"
@@ -303,20 +303,25 @@ void SIMpad::playAlarmSound()
 bool SIMpad::suspend() // Must override because SIMpad does NOT have apm
 {
    qDebug( "ODevice for SIMpad: suspend()" );
    if ( !isQWS( ) ) // only qwsserver is allowed to suspend
        return false;
-    bool res = false;
+    /*
-    ODevice::sendSuspendmsg();
+     * we need to save the screen content
+     * then go to suspend using ODevice::suspend
-    struct timeval tvs, tvn;
+     * and finally restore the screen content
-    ::gettimeofday ( &tvs, 0 );
+     */
+    (void)::system( "cat /dev/fb/0 > /tmp/.buffer" );
+    bool res  = ODevice::suspend();
-    ::sync(); // flush fs caches
+    /*
-    res = ( ::system ( "cat /dev/fb/0 >/tmp/.buffer; echo > /proc/sys/pm/suspend; cat /tmp/.buffer >/dev/fb/0" ) == 0 ); //TODO make better :)
+     * restore
+     */
+    if ( res )
+        ::system( "cat /tmp/.buffer > /dev/fb/0" );
    return res;
 }
 bool SIMpad::setSoftSuspend ( bool soft )

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index cd3a84c..835586e 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp
@@ -1,30 +1,30 @@
1	/*	1	/*
2	This file is part of the Opie Project	2	This file is part of the Opie Project
3	Copyright (C) The Opie Team <opie-devel@handhelds.org>	3	Copyright (C) The Opie Team <opie-devel@handhelds.org>
4	=.	4	=.
5	.=l.	5	.=l.
6	.>+-=	6	.>+-=
7	_;:, .> :=\|. This program is free software; you can	7	_;:, .> :=\|. This program is free software; you can
8	.> <`_, > . <= redistribute it and/or modify it under	8	.> <`_, > . <= redistribute it and/or modify it under
9	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public	9	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
10	.="- .-=="i, .._ License as published by the Free Software	10	.="- .-=="i, .._ License as published by the Free Software
11	- . .-<_> .<> Foundation; either version 2 of the License,	11	- . .-<_> .<> Foundation; either version 2 of the License,
12	._= =} : or (at your option) any later version.	12	._= =} : or (at your option) any later version.
13	.%`+i> _;_.	13	.%`+i> _;_.
14	.i_,=:_. -<s. This program is distributed in the hope that	14	.i_,=:_. -<s. This program is distributed in the hope that
15	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;	15	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
16	: .. .:, . . . without even the implied warranty of	16	: .. .:, . . . without even the implied warranty of
17	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A	17	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
18	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU	18	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
19	..}^=.= = ; Library General Public License for more	19	..}^=.= = ; Library General Public License for more
20	++= -. .` .: details.	20	++= -. .` .: details.
21	: = ...= . :.=-	21	: = ...= . :.=-
22	-. .:....=;==+<; You should have received a copy of the GNU	22	-. .:....=;==+<; You should have received a copy of the GNU
23	-_. . . )=. = Library General Public License along with	23	-_. . . )=. = Library General Public License along with
24	-- :-=` this library; see the file COPYING.LIB.	24	-- :-=` this library; see the file COPYING.LIB.
25	If not, write to the Free Software Foundation,	25	If not, write to the Free Software Foundation,
26	Inc., 59 Temple Place - Suite 330,	26	Inc., 59 Temple Place - Suite 330,
27	Boston, MA 02111-1307, USA.	27	Boston, MA 02111-1307, USA.
28	*/	28	*/
29		29
30	#include "odevice_ipaq.h"	30	#include "odevice_ipaq.h"
@@ -144,13 +144,13 @@ ODevice *ODevice::inst()
144	}	144	}
145	}	145	}
146	else	146	else
147	{	147	{
148	qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO );	148	qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO );
149	}	149	}
150	if ( !dev ) dev = new ODevice();	150	if ( !dev ) dev = new Internal::Zaurus();
151	dev->init(cpu_info);	151	dev->init(cpu_info);
152	}	152	}
153	return dev;	153	return dev;
154	}	154	}
155		155
156	ODevice::ODevice()	156	ODevice::ODevice()


diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp index bf46e43..c6de614 100644 --- a/libopie2/opiecore/device/odevice_simpad.cpp +++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -1,30 +1,30 @@
1	/*	1	/*
2	This file is part of the Opie Project	2	This file is part of the Opie Project
3	Copyright (C) The Opie Team <opie-devel@handhelds.org>	3	Copyright (C) The Opie Team <opie-devel@handhelds.org>
4	=.	4	=.
5	.=l.	5	.=l.
6	.>+-=	6	.>+-=
7	_;:, .> :=\|. This program is free software; you can	7	_;:, .> :=\|. This program is free software; you can
8	.> <`_, > . <= redistribute it and/or modify it under	8	.> <`_, > . <= redistribute it and/or modify it under
9	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public	9	:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
10	.="- .-=="i, .._ License as published by the Free Software	10	.="- .-=="i, .._ License as published by the Free Software
11	- . .-<_> .<> Foundation; either version 2 of the License,	11	- . .-<_> .<> Foundation; either version 2 of the License,
12	._= =} : or (at your option) any later version.	12	._= =} : or (at your option) any later version.
13	.%`+i> _;_.	13	.%`+i> _;_.
14	.i_,=:_. -<s. This program is distributed in the hope that	14	.i_,=:_. -<s. This program is distributed in the hope that
15	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;	15	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
16	: .. .:, . . . without even the implied warranty of	16	: .. .:, . . . without even the implied warranty of
17	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A	17	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
18	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU	18	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
19	..}^=.= = ; Library General Public License for more	19	..}^=.= = ; Library General Public License for more
20	++= -. .` .: details.	20	++= -. .` .: details.
21	: = ...= . :.=-	21	: = ...= . :.=-
22	-. .:....=;==+<; You should have received a copy of the GNU	22	-. .:....=;==+<; You should have received a copy of the GNU
23	-_. . . )=. = Library General Public License along with	23	-_. . . )=. = Library General Public License along with
24	-- :-=` this library; see the file COPYING.LIB.	24	-- :-=` this library; see the file COPYING.LIB.
25	If not, write to the Free Software Foundation,	25	If not, write to the Free Software Foundation,
26	Inc., 59 Temple Place - Suite 330,	26	Inc., 59 Temple Place - Suite 330,
27	Boston, MA 02111-1307, USA.	27	Boston, MA 02111-1307, USA.
28	*/	28	*/
29		29
30	#include "odevice_simpad.h"	30	#include "odevice_simpad.h"
@@ -303,20 +303,25 @@ void SIMpad::playAlarmSound()
303	bool SIMpad::suspend() // Must override because SIMpad does NOT have apm	303	bool SIMpad::suspend() // Must override because SIMpad does NOT have apm
304	{	304	{
305	qDebug( "ODevice for SIMpad: suspend()" );	305	qDebug( "ODevice for SIMpad: suspend()" );
306	if ( !isQWS( ) ) // only qwsserver is allowed to suspend	306	if ( !isQWS( ) ) // only qwsserver is allowed to suspend
307	return false;	307	return false;
308		308
309	bool res = false;	309	/*
310	ODevice::sendSuspendmsg();	310	* we need to save the screen content
311		311	* then go to suspend using ODevice::suspend
312	struct timeval tvs, tvn;	312	* and finally restore the screen content
313	::gettimeofday ( &tvs, 0 );	313	*/
		314	(void)::system( "cat /dev/fb/0 > /tmp/.buffer" );
		315	bool res = ODevice::suspend();
314		316
315	::sync(); // flush fs caches	317	/*
316	res = ( ::system ( "cat /dev/fb/0 >/tmp/.buffer; echo > /proc/sys/pm/suspend; cat /tmp/.buffer >/dev/fb/0" ) == 0 ); //TODO make better :)	318	* restore
		319	*/
		320	if ( res )
		321	::system( "cat /tmp/.buffer > /dev/fb/0" );
317		322
318	return res;	323	return res;
319	}	324	}
320		325
321		326
322	bool SIMpad::setSoftSuspend ( bool soft )	327	bool SIMpad::setSoftSuspend ( bool soft )