summaryrefslogtreecommitdiff
path: root/libopie
authorsandman <sandman>2002-09-06 21:40:14 (UTC)
committer sandman <sandman>2002-09-06 21:40:14 (UTC)
commitc22872aadda2ba93ddc53e5d5607ad795f147883 (patch) (side-by-side diff)
tree247c442995fec2e5e2ed9b5826f46a427333a410 /libopie
parente95e14f056ce6be658a4fd0d4737168431e92d88 (diff)
downloadopie-c22872aadda2ba93ddc53e5d5607ad795f147883.zip
opie-c22872aadda2ba93ddc53e5d5607ad795f147883.tar.gz
opie-c22872aadda2ba93ddc53e5d5607ad795f147883.tar.bz2
Fix for the new OD_IO macros
Diffstat (limited to 'libopie') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 6e3f114..9871e80 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -29,28 +29,30 @@
#include <qapplication.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qpe/sound.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include "odevice.h"
// _IO and friends are only defined in kernel headers ...
-#define OD_IO(type,area,number,args) (( type << 30 ) | ( area << 8 ) | ( number ) | ( sizeof( args ) << 16 ))
-#define OD_IOW(area,number,args) OD_IO(1,area,number,args)
-#define OD_IOR(area,number,args) OD_IO(2,area,number,args)
-#define OD_IORW(area,number,args) OD_IO(3,area,number,args)
+#define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
+
+#define OD_IO(type,number) OD_IOC(0,type,number,0)
+#define OD_IOW(type,number,size) OD_IOC(1,type,number,sizeof(size))
+#define OD_IOR(type,number,size) OD_IOC(2,type,number,sizeof(size))
+#define OD_IORW(type,number,size) OD_IOC(3,type,number,sizeof(size))
class ODeviceData {
public:
QString m_vendorstr;
OVendor m_vendor;
QString m_modelstr;
OModel m_model;
QString m_systemstr;
OSystem m_system;
@@ -147,25 +149,25 @@ void ODevice::init ( )
ODevice::~ODevice ( )
{
delete d;
}
bool ODevice::setPowerButtonHandler ( ODevice::PowerButtonHandler )
{
return false;
}
//#include <linux/apm_bios.h>
-#define APM_IOC_SUSPEND OD_IO( 0, 'A', 2, 0 )
+#define APM_IOC_SUSPEND OD_IO( 'A', 2 )
bool ODevice::suspend ( )
{
if ( d-> m_model == OMODEL_Unknown ) // better don't suspend in qvfb / on unkown devices
return false;
int fd;
bool res = false;
if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) ||
(( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) {
@@ -189,25 +191,25 @@ bool ODevice::suspend ( )
::kill ( -::getpid ( ), SIGCONT ); // continue everything in our process group
}
::close ( fd );
::signal ( SIGTSTP, SIG_DFL );
}
return res;
}
//#include <linux/fb.h> better not rely on kernel headers in userspace ...
-#define FBIOBLANK OD_IO( 0, 'F', 0x11, 0 ) // 0x4611
+#define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611
/* VESA Blanking Levels */
#define VESA_NO_BLANKING 0
#define VESA_VSYNC_SUSPEND 1
#define VESA_HSYNC_SUSPEND 2
#define VESA_POWERDOWN 3
bool ODevice::setDisplayStatus ( bool on )
{
if ( d-> m_model == OMODEL_Unknown )
return false;