Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [853] OE/com.hackndev/packages/libopie/libopie2/palm. patch
|
From: <mar...@us...> - 2007-02-20 10:14:39
|
Revision: 853
http://svn.sourceforge.net/hackndev/?rev=853&view=rev
Author: marex_z71
Date: 2007-02-20 02:14:36 -0800 (Tue, 20 Feb 2007)
Log Message:
-----------
OE: fixes libopie to compile again
Modified Paths:
--------------
OE/com.hackndev/packages/libopie/libopie2/palm.patch
Modified: OE/com.hackndev/packages/libopie/libopie2/palm.patch
===================================================================
--- OE/com.hackndev/packages/libopie/libopie2/palm.patch 2007-02-20 09:58:11 UTC (rev 852)
+++ OE/com.hackndev/packages/libopie/libopie2/palm.patch 2007-02-20 10:14:36 UTC (rev 853)
@@ -1,6 +1,6 @@
diff -Naur libopie2-orig/opiecore/device/device.pro libopie2/opiecore/device/device.pro
---- libopie2-orig/opiecore/device/device.pro 2007-02-19 22:46:30.000000000 +0100
-+++ libopie2/opiecore/device/device.pro 2007-02-19 22:46:54.000000000 +0100
+--- libopie2-orig/opiecore/device/device.pro 2006-05-19 14:22:12.000000000 +0200
++++ libopie2/opiecore/device/device.pro 2007-02-20 11:10:13.000000000 +0100
@@ -11,7 +11,8 @@
device/odevice_yopy.h \
device/odevice_mypal.h \
@@ -20,8 +20,8 @@
+ device/odevice_palm.cpp
diff -Naur libopie2-orig/opiecore/device/odevice.cpp libopie2/opiecore/device/odevice.cpp
---- libopie2-orig/opiecore/device/odevice.cpp 2007-02-19 22:45:55.000000000 +0100
-+++ libopie2/opiecore/device/odevice.cpp 2007-02-19 22:48:15.000000000 +0100
+--- libopie2-orig/opiecore/device/odevice.cpp 2006-05-19 14:22:12.000000000 +0200
++++ libopie2/opiecore/device/odevice.cpp 2007-02-20 11:10:13.000000000 +0100
@@ -39,6 +39,7 @@
#include "odevice_genuineintel.h"
#include "odevice_htc.h"
@@ -39,8 +39,8 @@
else qWarning( "ODevice() - unknown hardware - using default." );
break;
diff -Naur libopie2-orig/opiecore/device/odevice.h libopie2/opiecore/device/odevice.h
---- libopie2-orig/opiecore/device/odevice.h 2007-02-19 22:45:55.000000000 +0100
-+++ libopie2/opiecore/device/odevice.h 2007-02-19 22:50:21.000000000 +0100
+--- libopie2-orig/opiecore/device/odevice.h 2006-08-02 21:12:39.000000000 +0200
++++ libopie2/opiecore/device/odevice.h 2007-02-20 11:10:13.000000000 +0100
@@ -138,6 +138,19 @@
Model_Motorola_All = ( Model_Motorola | 0xffff ),
Model_Motorola_EZX = ( Model_Motorola | 0x0001 ),
@@ -71,7 +71,7 @@
/**
diff -Naur libopie2-orig/opiecore/device/odevice_palm.cpp libopie2/opiecore/device/odevice_palm.cpp
--- libopie2-orig/opiecore/device/odevice_palm.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ libopie2/opiecore/device/odevice_palm.cpp 2007-02-19 22:54:23.000000000 +0100
++++ libopie2/opiecore/device/odevice_palm.cpp 2007-02-20 11:05:48.000000000 +0100
@@ -0,0 +1,294 @@
+/*
+ This file is part of the Opie Project
@@ -306,6 +306,7 @@
+int Palm::displayBrightnessResolution() const
+{
+ int res = 1;
++ int fd;
+
+ switch ( d->m_model )
+ {
@@ -316,8 +317,7 @@
+ case Model_Palm_TX:
+ case Model_Palm_Z71:
+ case Model_Palm_Z72:
-+ int fd = ::open( m_backlightdev + "max_brightness", O_RDONLY|O_NONBLOCK );
-+ if ( fd )
++ if (( fd = ::open( m_backlightdev + "max_brightness", O_RDONLY|O_NONBLOCK )) >= 0 )
+ {
+ char buf[100];
+ if ( ::read( fd, &buf[0], sizeof buf ) ) ::sscanf( &buf[0], "%d", &res );
@@ -336,6 +336,7 @@
+bool Palm::setDisplayBrightness( int bright )
+{
+ bool res = false;
++ int fd;
+
+ if ( bright > 255 ) bright = 255;
+ if ( bright < 0 ) bright = 0;
@@ -353,8 +354,7 @@
+ case Model_Palm_TX:
+ case Model_Palm_Z71:
+ case Model_Palm_Z72:
-+ int fd = ::open( m_backlightdev + "brightness", O_WRONLY|O_NONBLOCK );
-+ if ( fd )
++ if (( fd = ::open( m_backlightdev + "brightness", O_WRONLY|O_NONBLOCK )) >= 0 )
+ {
+ char buf[100];
+ int len = ::snprintf( &buf[0], sizeof buf, "%d", val );
@@ -369,7 +369,7 @@
+}
diff -Naur libopie2-orig/opiecore/device/odevice_palm.h libopie2/opiecore/device/odevice_palm.h
--- libopie2-orig/opiecore/device/odevice_palm.h 1970-01-01 01:00:00.000000000 +0100
-+++ libopie2/opiecore/device/odevice_palm.h 2007-02-19 22:52:58.000000000 +0100
++++ libopie2/opiecore/device/odevice_palm.h 2007-02-20 11:10:13.000000000 +0100
@@ -0,0 +1,72 @@
+/*
+\xA0 \xA0 \xA0 \xA0 \xA0 \xA0 \xA0 \xA0 This file is part of the Opie Project
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
