5 files changed, 40 insertions, 3 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index e747a19..07ef15c 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -410,20 +410,24 @@ int VMemo::openDSP() {
   if(systemZaurus) {
     dsp = open("/dev/dsp1", O_RDONLY); //Zaurus needs /dev/dsp1
     channels=1; //zaurus has one input channel
   }  else {
+#ifdef QT_QWS_DEVFS
+    dsp = open("/dev/sound/dsp", O_RDONLY);
+#else
     dsp = open("/dev/dsp", O_RDONLY);
+#endif
   }
 
-  if(dsp == -1)  {
+  if (dsp == -1)  {
       msgLabel->close();
       msgLabel=0;
       delete msgLabel;
 
       perror("open(\"/dev/dsp\")");
       errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno);
-    QMessageBox::critical(0, "vmemo", errorMsg, "Abort");
-    return -1;
+      QMessageBox::critical(0, "vmemo", errorMsg, "Abort");
+      return -1;
   }
 
   if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1)  {
     perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp
index aec63c3..7832ee0 100644
--- a/core/applets/vtapplet/vt.cpp
+++ b/core/applets/vtapplet/vt.cpp
@@ -79,9 +79,13 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const
 {
     odebug << "VTApplet::popup" << oendl;
 
     struct vt_stat vtstat;
+#ifdef QT_QWS_DEVFS
+    int fd = ::open( "/dev/vc/0", O_RDWR );
+#else
     int fd = ::open( "/dev/tty0", O_RDWR );
+#endif
     if ( fd == -1 ) return 0;
     if ( ioctl( fd, VT_GETSTATE, &vtstat ) == -1 ) return 0;
 
     m_subMenu = new QPopupMenu( parent );
@@ -103,9 +107,13 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const
 void VTApplet::changeVT( int index )
 {
     //odebug << "VTApplet::changeVT( " << index-500 << " )" << oendl;
 
+#ifdef QT_QWS_DEVFS
+    int fd = ::open("/dev/vc/0", O_RDWR);
+#else
     int fd = ::open("/dev/tty0", O_RDWR);
+#endif
     if ( fd == -1 ) return;
     ioctl( fd, VT_ACTIVATE, index-500 );
 }
 
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 21070bf..9d0bbbf 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -594,9 +594,13 @@ bool ODevice::setDisplayStatus ( bool on )
 
         bool res = false;
         int fd;
 
+#ifdef QT_QWS_DEVFS
+        if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) {
+#else
         if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) {
+#endif
                 res = ( ::ioctl ( fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN ) == 0 );
                 ::close ( fd );
         }
         return res;
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp
index 763ff65..17e5cb0 100644
--- a/libopie2/opiemm/osoundsystem.cpp
+++ b/libopie2/opiemm/osoundsystem.cpp
@@ -136,10 +136,15 @@ OSoundCard::~OSoundCard()
 
 
 void OSoundCard::init()
 {
+#ifdef QT_QWS_DEVFS
+    _audio = new OAudioInterface( this, "/dev/sound/dsp" );
+    _mixer = new OMixerInterface( this, "/dev/sound/mixer" );
+#else
     _audio = new OAudioInterface( this, "/dev/dsp" );
     _mixer = new OMixerInterface( this, "/dev/mixer" );
+#endif
 }
 
 
 /*======================================================================================
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index c6d9cfd..ca90427 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -564,9 +564,13 @@ static void setVolume( int t = 0, int percent = -1 )
                 if ( percent < 0 )
                     percent = cfg.readNumEntry( "VolumePercent", 50 );
 #ifndef QT_NO_SOUND
                 int fd = 0;
+#ifdef QT_QWS_DEVFS
+                if ( ( fd = open( "/dev/sound/mixer", O_RDWR ) ) >= 0 ) {
+#else
                 if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
+#endif
                     int vol = muted ? 0 : percent;
                     // set both channels to same volume
                     vol |= vol << 8;
                     ioctl( fd, MIXER_WRITE( SOUND_MIXER_VOLUME ), &vol );
@@ -589,9 +593,13 @@ static void setMic( int t = 0, int percent = -1 )
 
 #ifndef QT_NO_SOUND
                 int fd = 0;
                 int mic = micMuted ? 0 : percent;
+#ifdef QT_QWS_DEVFS
+                if ( ( fd = open( "/dev/sound/mixer", O_RDWR ) ) >= 0 ) {
+#else
                 if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
+#endif
                     ioctl( fd, MIXER_WRITE( SOUND_MIXER_MIC ), &mic );
                     ::close( fd );
                 }
 #endif
@@ -612,9 +620,13 @@ static void setBass( int t = 0, int percent = -1 )
 
 #ifndef QT_NO_SOUND
                 int fd = 0;
                 int bass = percent;
+#ifdef QT_QWS_DEVFS
+                                if ( ( fd = open( "/dev/sound/mixer", O_RDWR ) ) >= 0 ) {
+#else
                                 if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
+#endif
                     ioctl( fd, MIXER_WRITE( SOUND_MIXER_BASS ), &bass );
                     ::close( fd );
                 }
 #endif
@@ -635,9 +647,13 @@ static void setTreble( int t = 0, int percent = -1 )
 
 #ifndef QT_NO_SOUND
                 int fd = 0;
                 int treble = percent;
+#ifdef QT_QWS_DEVFS
+                if ( ( fd = open( "/dev/sound/mixer", O_RDWR ) ) >= 0 ) {
+#else
                 if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
+#endif
                     ioctl( fd, MIXER_WRITE( SOUND_MIXER_TREBLE ), &treble );
                     ::close( fd );
                 }
 #endif