- repair broken headers (tss...)

- fix logical error in ODevice::sendSuspendmsg() - send qcop signal returnFromSuspend() after resuming from suspend - remove debug macro from opcmciasystem; better do this from the .pro file with DEFINES +=
author: mickeyl <mickeyl> 2005-06-21 13:56:23 (UTC)
committer: mickeyl <mickeyl> 2005-06-21 13:56:23 (UTC)
commit: 65ea54f43ee7dcbd95ffb474c8dfbb8b076d43e5 (patch) (unidiff)
tree: 00439d8a397bfa4147e5fd26baec01f619f384c3
parent: a1f2f34836103ef80b3e11f5183a96218f7ea215 (diff)
download: opie-65ea54f43ee7dcbd95ffb474c8dfbb8b076d43e5.zip
opie-65ea54f43ee7dcbd95ffb474c8dfbb8b076d43e5.tar.gz
opie-65ea54f43ee7dcbd95ffb474c8dfbb8b076d43e5.tar.bz2
4 files changed, 36 insertions, 36 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index dd1e2f3..5e91d8b 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -1,33 +1,33 @@
 /*
-                             This file is part of the Opie Project
+ � � � � � � � �             This file is part of the Opie Project
+             =.              (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
-                             Copyright (C)2002-2005 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; version 2 of the License.
-�� �� ��._= =} �� �� �� :          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_beagle.h"
 #include "odevice_ipaq.h"
 #include "odevice_jornada.h"
@@ -694,7 +694,7 @@ void ODevice::virtual_hook(int, void* ){
 */
 void ODevice::sendSuspendmsg()
 {
-    if ( isQWS() )
+    if ( !isQWS() )
        return;
    QCopEnvelope ( "QPE/System", "aboutToSuspend()" );
diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
index f3f6af5..fe5864b 100644
--- a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
+++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
@@ -1,19 +1,15 @@
 /*
 � � � � � � � �             This file is part of the Opie Project
-� � � � � � �                Copyright (C) 2004, 2005 Holger Hans Peter Freyther <freyther@handhelds.org>
+                             Copyright (C) 2004, 2005 Holger Hans Peter Freyther <freyther@handhelds.org>
-                             Copyright (C) 2004, 2005 Michael 'mickey' Lauer <mickeyl@handhelds.org>
+              =.             Copyright (C) 2004, 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
-                             Copyright (C) 2002, 2003 Robert Griebl <sandman@handhelds.org>
+            .=l.             Copyright (C) 2002, 2003 Robert Griebl <sandman@handhelds.org>
-              =.
-            .=l.
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This program is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU Library General Public
 .="- .-=="i, � � .._         License as published by the Free Software
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+�- . � .-<_> � � .<>         Foundation; version 2 of the License.
-� � �._= =} � � � :          or (at your option) any later version.
+� � �._= =} � � � :
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This program is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
@@ -33,6 +29,8 @@
 #include "odevice_abstractmobiledevice.h"
+#include <qpe/qcopenvelope_qws.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
@@ -64,7 +62,8 @@ bool OAbstractMobileDevice::suspend() {
        return false;
    bool res = false;
-    ODevice::sendSuspendmsg();
+    QCopEnvelope( "QPE/System", "aboutToSuspend()" );
    struct timeval tvs, tvn;
    ::gettimeofday ( &tvs, 0 );
@@ -84,6 +83,8 @@ bool OAbstractMobileDevice::suspend() {
    }
    return res;
+    QCopEnvelope( "QPE/System", "returnFromSuspend()" );
 }
 //#include <linux/fb.h> better not rely on kernel headers in userspace ...
diff --git a/libopie2/opiecore/linux/linux.pro b/libopie2/opiecore/linux/linux.pro
index c396e59..c0c4f7f 100644
--- a/libopie2/opiecore/linux/linux.pro
+++ b/libopie2/opiecore/linux/linux.pro
@@ -8,3 +8,4 @@ SOURCES += \
           linux/oinputsystem.cpp \
           linux/opcmciasystem.cpp
+DEFINES += OPCMCIA_DEBUG=1
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index eae356e..445d903 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -49,8 +49,6 @@ using namespace Opie::Core;
 #define PROC_DEVICES "/proc/devices"
-// #define OPCMCIA_DEBUG 1
 /*======================================================================================
 * OPcmciaSystem
 *======================================================================================*/
author	mickeyl <mickeyl>	2005-06-21 13:56:23 (UTC)
committer	mickeyl <mickeyl>	2005-06-21 13:56:23 (UTC)
commit	65ea54f43ee7dcbd95ffb474c8dfbb8b076d43e5 (patch) (unidiff)
tree	00439d8a397bfa4147e5fd26baec01f619f384c3
parent	a1f2f34836103ef80b3e11f5183a96218f7ea215 (diff)
download	opie-65ea54f43ee7dcbd95ffb474c8dfbb8b076d43e5.zip opie-65ea54f43ee7dcbd95ffb474c8dfbb8b076d43e5.tar.gz opie-65ea54f43ee7dcbd95ffb474c8dfbb8b076d43e5.tar.bz2

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index dd1e2f3..5e91d8b 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp
@@ -1,33 +1,33 @@
1	/*	1	/*
2	This file is part of the Opie Project	2	� � � � � � � � This file is part of the Opie Project
3		3	=. (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
4	Copyright (C)2002-2005 The Opie Team <opie-devel@handhelds.org>
5	=.
6	.=l.	4	.=l.
7	�� .>+-=	5	� � � � � �.>+-=
8	��_;:, �� .> �� :=\|. This program is free software; you can	6	�_;:, � � .> � �:=\|. This program is free software; you can
9	.> <`_, �� > ��. �� <= redistribute it and/or modify it under	7	.> <`_, � > �. � <= redistribute it and/or modify it under
10	:`=1 )Y*s>-.-- �� : the terms of the GNU Library General Public	8	:`=1 )Y*s>-.-- � : the terms of the GNU Library General Public
11	.="- .-=="i, �� .._ License as published by the Free Software	9	.="- .-=="i, � � .._ License as published by the Free Software
12	��- . �� .-<_> �� .<> Foundation; either version 2 of the License,	10	�- . � .-<_> � � .<> Foundation; version 2 of the License.
13	�� ._= =} �� : or (at your option) any later version.	11	� � �._= =} � � � :
14	�� .%`+i> �� _;_.	12	� � .%`+i> � � � _;_.
15	�� .i_,=:_. �� -<s. This program is distributed in the hope that	13	� � .i_,=:_. � � �-<s. This program is distributed in the hope that
16	�� + ��. ��-:. �� = it will be useful, but WITHOUT ANY WARRANTY;	14	� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY;
17	: .. �� .:, �� . . . without even the implied warranty of	15	� � : .. � �.:, � � . . . without even the implied warranty of
18	�� =_ �� + �� =;=\|` MERCHANTABILITY or FITNESS FOR A	16	� � =_ � � � �+ � � =;=\|` MERCHANTABILITY or FITNESS FOR A
19	�� _.=:. �� : �� :=>`: PARTICULAR PURPOSE. See the GNU	17	� _.=:. � � � : � �:=>`: PARTICULAR PURPOSE. See the GNU
20	..}^=.= �� = �� ; Library General Public License for more	18	..}^=.= � � � = � � � ; Library General Public License for more
21	++= �� -. �� .` �� .: details.	19	++= � -. � � .` � � .: details.
22	: �� = ��...= . :.=-	20	�: � � = �...= . :.=-
23	��-. �� .:....=;==+<; You should have received a copy of the GNU	21	�-. � .:....=;==+<; You should have received a copy of the GNU
24	�� -_. . . �� )=. ��= Library General Public License along with	22	� -_. . . � )=. �= Library General Public License along with
25	�� -- �� :-=` this library; see the file COPYING.LIB.	23	� � -- � � � �:-=` this library; see the file COPYING.LIB.
26	If not, write to the Free Software Foundation,	24	If not, write to the Free Software Foundation,
27	Inc., 59 Temple Place - Suite 330,	25	Inc., 59 Temple Place - Suite 330,
28	Boston, MA 02111-1307, USA.	26	Boston, MA 02111-1307, USA.
		27
29	*/	28	*/
30		29
		30
31	#include "odevice_beagle.h"	31	#include "odevice_beagle.h"
32	#include "odevice_ipaq.h"	32	#include "odevice_ipaq.h"
33	#include "odevice_jornada.h"	33	#include "odevice_jornada.h"
@@ -694,7 +694,7 @@ void ODevice::virtual_hook(int, void* ){
694	*/	694	*/
695	void ODevice::sendSuspendmsg()	695	void ODevice::sendSuspendmsg()
696	{	696	{
697	if ( isQWS() )	697	if ( !isQWS() )
698	return;	698	return;
699		699
700	QCopEnvelope ( "QPE/System", "aboutToSuspend()" );	700	QCopEnvelope ( "QPE/System", "aboutToSuspend()" );


diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp index f3f6af5..fe5864b 100644 --- a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp +++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
@@ -1,19 +1,15 @@
1	/*	1	/*
2	� � � � � � � � This file is part of the Opie Project	2	� � � � � � � � This file is part of the Opie Project
3	� � � � � � � Copyright (C) 2004, 2005 Holger Hans Peter Freyther <freyther@handhelds.org>	3	Copyright (C) 2004, 2005 Holger Hans Peter Freyther <freyther@handhelds.org>
4	Copyright (C) 2004, 2005 Michael 'mickey' Lauer <mickeyl@handhelds.org>	4	=. Copyright (C) 2004, 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
5	Copyright (C) 2002, 2003 Robert Griebl <sandman@handhelds.org>	5	.=l. Copyright (C) 2002, 2003 Robert Griebl <sandman@handhelds.org>
6
7
8	=.
9	.=l.
10	� � � � � �.>+-=	6	� � � � � �.>+-=
11	�_;:, � � .> � �:=\|. This program is free software; you can	7	�_;:, � � .> � �:=\|. This program is free software; you can
12	.> <`_, � > �. � <= redistribute it and/or modify it under	8	.> <`_, � > �. � <= redistribute it and/or modify it under
13	:`=1 )Y*s>-.-- � : the terms of the GNU Library General Public	9	:`=1 )Y*s>-.-- � : the terms of the GNU Library General Public
14	.="- .-=="i, � � .._ License as published by the Free Software	10	.="- .-=="i, � � .._ License as published by the Free Software
15	�- . � .-<_> � � .<> Foundation; either version 2 of the License,	11	�- . � .-<_> � � .<> Foundation; version 2 of the License.
16	� � �._= =} � � � : or (at your option) any later version.	12	� � �._= =} � � � :
17	� � .%`+i> � � � _;_.	13	� � .%`+i> � � � _;_.
18	� � .i_,=:_. � � �-<s. This program is distributed in the hope that	14	� � .i_,=:_. � � �-<s. This program is distributed in the hope that
19	� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY;	15	� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY;
@@ -33,6 +29,8 @@
33		29
34	#include "odevice_abstractmobiledevice.h"	30	#include "odevice_abstractmobiledevice.h"
35		31
		32	#include <qpe/qcopenvelope_qws.h>
		33
36	#include <sys/time.h>	34	#include <sys/time.h>
37	#include <sys/ioctl.h>	35	#include <sys/ioctl.h>
38		36
@@ -64,7 +62,8 @@ bool OAbstractMobileDevice::suspend() {
64	return false;	62	return false;
65		63
66	bool res = false;	64	bool res = false;
67	ODevice::sendSuspendmsg();	65
		66	QCopEnvelope( "QPE/System", "aboutToSuspend()" );
68		67
69	struct timeval tvs, tvn;	68	struct timeval tvs, tvn;
70	::gettimeofday ( &tvs, 0 );	69	::gettimeofday ( &tvs, 0 );
@@ -84,6 +83,8 @@ bool OAbstractMobileDevice::suspend() {
84	}	83	}
85		84
86	return res;	85	return res;
		86
		87	QCopEnvelope( "QPE/System", "returnFromSuspend()" );
87	}	88	}
88		89
89	//#include <linux/fb.h> better not rely on kernel headers in userspace ...	90	//#include <linux/fb.h> better not rely on kernel headers in userspace ...


diff --git a/libopie2/opiecore/linux/linux.pro b/libopie2/opiecore/linux/linux.pro index c396e59..c0c4f7f 100644 --- a/libopie2/opiecore/linux/linux.pro +++ b/libopie2/opiecore/linux/linux.pro
@@ -8,3 +8,4 @@ SOURCES += \
8	linux/oinputsystem.cpp \	8	linux/oinputsystem.cpp \
9	linux/opcmciasystem.cpp	9	linux/opcmciasystem.cpp
10		10
		11	DEFINES += OPCMCIA_DEBUG=1


diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index eae356e..445d903 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -49,8 +49,6 @@ using namespace Opie::Core;
49		49
50	#define PROC_DEVICES "/proc/devices"	50	#define PROC_DEVICES "/proc/devices"
51		51
52	// #define OPCMCIA_DEBUG 1
53
54	/*======================================================================================	52	/*======================================================================================
55	* OPcmciaSystem	53	* OPcmciaSystem
56	======================================================================================/	54	======================================================================================/