added support for DEVFS

2 files changed, 15 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
@@ -411,18 +411,22 @@ int VMemo::openDSP() {
     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)  {
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
@@ -80,7 +80,11 @@ 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;
 
@@ -104,7 +108,11 @@ 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 );
 }