even more Jornada 56X updates

1 files changed, 11 insertions, 0 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 8624016..13b4330 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -2379,202 +2379,213 @@ bool Ramses::suspend ( )
 bool Ramses::setDisplayStatus(bool on)
 {
 	qDebug("Ramses::setDisplayStatus(%d)", on);
 #if 0
 	bool res = false;
 	int fd;
 
 	if ((fd = ::open ("/dev/fb/0", O_RDWR)) >= 0) {
 		res = (::ioctl(fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN) == 0);
 		::close(fd);
 	}
 	return res;
 #else
 	return true;
 #endif
 }
 
 
 /*
  * We get something between 0..255 into us
 */
 bool Ramses::setDisplayBrightness(int bright)
 {
 	qDebug("Ramses::setDisplayBrightness(%d)", bright);
 	bool res = false;
 	int fd;
 
 	// pwm1 brighness: 20 steps 500..0 (dunkel->hell)
 
 	if (bright > 255 )
 		bright = 255;
 	if (bright < 0)
 		bright = 0;
 
 	// Turn backlight completely off
 	if ((fd = ::open("/proc/sys/board/lcd_backlight", O_WRONLY)) >= 0) {
 		char writeCommand[10];
 		const int count = sprintf(writeCommand, "%d\n", bright ? 1 : 0);
 		res = (::write(fd, writeCommand, count) != -1);
 		::close(fd);
 	}
 
 	// scale backlight brightness to hardware
 	bright = 500-(bright * 500 / 255);
 	if ((fd = ::open("/proc/sys/board/pwm1", O_WRONLY)) >= 0) {
 		qDebug(" %d -> pwm1", bright);
 		char writeCommand[100];
 		const int count = sprintf(writeCommand, "%d\n", bright);
 		res = (::write(fd, writeCommand, count) != -1);
 		::close(fd);
 	}
 	return res;
 }
 
 
 int Ramses::displayBrightnessResolution() const
 {
 	return 32;
 }
 
 bool Ramses::setDisplayContrast(int contr)
 {
 	qDebug("Ramses::setDisplayContrast(%d)", contr);
 	bool res = false;
 	int fd;
 
 	// pwm0 contrast: 20 steps 79..90 (dunkel->hell)
 
 	if (contr > 255 )
 		contr = 255;
 	if (contr < 0)
 		contr = 0;
 	contr = 90 - (contr * 20 / 255);
 
 	if ((fd = ::open("/proc/sys/board/pwm0", O_WRONLY)) >= 0) {
 		qDebug(" %d -> pwm0", contr);
 		char writeCommand[100];
 		const int count = sprintf(writeCommand, "%d\n", contr);
 		res = (::write(fd, writeCommand, count) != -1);
 		res = true;
 		::close(fd);
 	}
 	return res;
 }
 
 
 int Ramses::displayContrastResolution() const
 {
 	return 20;
 }
 
 
 /**************************************************
  *                                                *
  * Jornada                                        *
  *                                                *
  **************************************************/
 
 
 bool Jornada::isJornada ( )
 {
   QFile f( "/proc/cpuinfo" );
   if ( f. open ( IO_ReadOnly ) ) {
     QTextStream ts ( &f );
     QString line;
     while( line = ts. readLine ( ) ) {
       if ( line. left ( 8 ) == "Hardware" ) {
 	int loc = line. find ( ":" );
 	if ( loc != -1 ) {
 	  QString model =
 	    line. mid ( loc + 2 ). simplifyWhiteSpace( );
 	  return ( model == "HP Jornada 56x" );
 	}
       }
     }
   }
   return false;
 }
 
 void Jornada::init ( )
 {
 	d-> m_vendorstr = "HP";
 	d-> m_vendor = Vendor_HP;
 	d-> m_modelstr = "Jornada 56x";
 	d-> m_model = Model_Jornada_56x;
 	d-> m_systemstr = "Familiar";
 	d-> m_system = System_Familiar;
 	d-> m_rotation = Rot0;
+
+	QFile f ( "/etc/familiar-version" );
+	f. setName ( "/etc/familiar-version" );
+	if ( f. open ( IO_ReadOnly )) {
+
+		QTextStream ts ( &f );
+		d-> m_sysverstr = ts. readLine ( ). mid ( 10 );
+
+		f. close ( );
+	}
 }
 
+
 void Jornada::initButtons ( )
 {
 	if ( d-> m_buttons )
 		return;
 
 	// Simulation uses iPAQ 3660 device buttons
 
 	qDebug ( "init Buttons" );
 	d-> m_buttons = new QValueList <ODeviceButton>;
 
 	for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) {
 		i_button *ib = ipaq_buttons + i;
 		ODeviceButton b;
 
 		if (( ib-> model & Model_iPAQ_H36xx ) == Model_iPAQ_H36xx ) {
 			b. setKeycode ( ib-> code );
 			b. setUserText ( QObject::tr ( "Button", ib-> utext ));
 			b. setPixmap ( Resource::loadPixmap ( ib-> pix ));
 			b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction ));
 			b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction ));
 			d-> m_buttons-> append ( b );
 		}
 	}
 	reloadButtonMapping ( );
 
 	QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
 	connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
 }
 
 int Jornada::displayBrightnessResolution ( ) const
 {
 }
 
 bool Jornada::setDisplayBrightness ( int bright )
 {
 	bool res = false;
 	int fd;
 
 	if ( bright > 255 )
 		bright = 255;
 	if ( bright < 0 )
 		bright = 0;
 
 	if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) {
 		FLITE_IN bl;
 		bl. mode = 1;
 		bl. pwr = bright ? 1 : 0;
 		bl. brightness = ( bright * ( displayBrightnessResolution ( ) - 1 ) + 127 ) / 255;
 		res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 );
 		::close ( fd );
 	}
 	return res;
 }
 
 bool Jornada::setSoftSuspend ( bool soft )
 {
 	bool res = false;
 	int fd;
 
 	if (( fd = ::open ( "/proc/sys/ts/suspend_button_mode", O_WRONLY )) >= 0 ) {
 		if ( ::write ( fd, soft ? "1" : "0", 1 ) == 1 )
 			res = true;
 		else
 			::perror ( "write to /proc/sys/ts/suspend_button_mode" );
 
 		::close ( fd );
 	}
 	else
 		::perror ( "/proc/sys/ts/suspend_button_mode" );
 
 	return res;
 }