-Check m_model to allow suspending. ODevice doesn't suspend on UnknownModel

-Comments
-map 0-255 brightness to 0-100 for Assabat Frontlight Control
-Change return value for display on and off

1 files changed, 52 insertions, 7 deletions

diff --git a/libopie2/opiecore/device/odevice_beagle.cpp b/libopie2/opiecore/device/odevice_beagle.cpp
index 9cf640a..ac12ca6 100644
--- a/libopie2/opiecore/device/odevice_beagle.cpp
+++ b/libopie2/opiecore/device/odevice_beagle.cpp
@@ -39,5 +39,7 @@
 
 
-
+/*
+ * Intel Assabat FrontLight Control
+ */
 #define _SA1100_FL_IOCTL_ON		1
 #define _SA1100_FL_IOCTL_OFF		2
@@ -51,4 +53,7 @@
 #define _SA1100_FL_IOCTL_AUTOLIGHT		10
 
+/*
+ * The device
+ */
 #define FL_MAJOR   60
 #define FL_NAME   "sa1100-fl"
@@ -70,6 +75,16 @@ struct b_button {
 };
 
+
+/*
+ * The MVista Beagle kernel maps the action
+ * buttons to the Qt keymap
+ */
 struct b_button beagle_buttons [] = {
     { Model_Beagle_PA100,
+      Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Record Button"),
+      "devicebuttons/beagle_record",
+      "QPE/VMemo", "toggleRecord()",
+      "sound", "raise()" },
+    { Model_Beagle_PA100,
       Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
       "devicebuttons/beagle_calendar",
@@ -94,10 +109,11 @@ struct b_button beagle_buttons [] = {
 
 
-Beagle::Beagle()
-{
-    qWarning( "Created Beagle" );
-}
+Beagle::Beagle()  {}
+
 Beagle::~Beagle() {}
 
+/*
+ * Simply set the Tradesquare.NL data
+ */
 void Beagle::init( const QString&) {
     /*
@@ -108,6 +124,16 @@ void Beagle::init( const QString&) {
     d->m_modelstr = "Tuxpda 1";
     d->m_rotation = Rot0;
+    d->m_model = Model_Beagle_PA100;
 }
 
+
+/*
+ * Initialize the Buttons. We only do it
+ * if not yet initialized.
+ * We go through our hardware button array
+ * and set the 'Factory' Pressed and Held Action
+ * reloadButtonMapping will then apply the user
+ * configuration to the buttons
+ */
 void Beagle::initButtons() {
     if ( d->m_buttons )
@@ -130,4 +156,7 @@ void Beagle::initButtons() {
 }
 
+/*
+ * Turn the display on. We do it by ioctl on FL_FILE
+ */
 bool Beagle::setDisplayStatus( bool on ) {
     int fd = ::open(FL_FILE, O_WRONLY);
@@ -136,12 +165,28 @@ bool Beagle::setDisplayStatus( bool on ) {
         return false;
 
-    return ( ::ioctl(fd, on ? _SA1100_FL_IOCTL_ON : _SA1100_FL_IOCTL_OFF, 0 ) == -1 );
+    return ( ::ioctl(fd, on ? _SA1100_FL_IOCTL_ON : _SA1100_FL_IOCTL_OFF, 0 ) == 0 );
 }
 
+/*
+ * 0-100 are legal steps of the frontlight.
+ */
 int Beagle::displayBrightnessResolution()const {
     return 100;
 }
 
+/*
+ * Opie uses the values 0-255 for the frontlight
+ * intensity and we need to map it to the range
+ * of 0-100.
+ * But first we do some sanity of the range of brightness
+ *
+ */
 bool Beagle::setDisplayBrightness( int brightness ) {
+    if ( brightness > 255 )
+        brightness = 255;
+    else if ( brightness < 0 )
+        brightness = 0;
+    brightness = (100*brightness)/255;
+
     int fd = ::open(FL_FILE, O_WRONLY);
 
@@ -149,5 +194,5 @@ bool Beagle::setDisplayBrightness( int brightness ) {
         return false;
 
-    return ( ::ioctl(fd, _SA1100_FL_IOCTL_INTENSITY, brightness%101 ) == 0 );
+    return ( ::ioctl(fd, _SA1100_FL_IOCTL_INTENSITY, brightness ) == 0 );
 }