| -rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 2 | ||||
| -rw-r--r-- | noncore/net/opietooth/lib/device.cc | 11 | ||||
| -rw-r--r-- | noncore/net/opietooth/lib/lib.pro | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index a380ac7..6e5ee82 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp @@ -76,7 +76,7 @@ namespace OpieTooth { int BluezApplet::setBluezStatus(int c) { if (c == 1) { - btDevice = new Device("/dev/ttySB0", "scr" ); + btDevice = new Device("/dev/ttySB0", "csr" ); // system("hciattach /dev/ttySB0 csr"); //system("hcid"); } else { diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc index 5234996..5edfc03 100644 --- a/noncore/net/opietooth/lib/device.cc +++ b/noncore/net/opietooth/lib/device.cc @@ -13,6 +13,7 @@ namespace { QString string( par ); QStringList list = QStringList::split( '\n', string ); for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ + qWarning("parsePID: %s", (*it).latin1() ); if( !(*it).startsWith("CSR") ){ id = (*it).toInt(); break; @@ -78,7 +79,9 @@ void Device::slotExited( OProcess* proc) { qWarning("prcess exited" ); if(proc== m_process ){ + qWarning("proc == m_process" ); if( m_process->normalExit() ){ // normal exit + qWarning("normalExit" ); int ret = m_process->exitStatus(); if( ret == 0 ){ // attached qWarning("attached" ); @@ -99,6 +102,7 @@ void Device::slotExited( OProcess* proc) emit device("hci0", false ); } }else{ + qWarning("crass" ); m_attached = false; emit device("hci0", false ); @@ -128,15 +132,18 @@ void Device::slotExited( OProcess* proc) void Device::slotStdOut(OProcess* proc, char* chars, int len) { qWarning("std out" ); - if( len <1 ) + if( len <1 ){ + qWarning( "len < 1 " ); return; + } if(proc == m_process ){ QCString string( chars, len+1 ); // \0 == +1 qWarning("output: %s", string.data() ); m_output.append( string.data() ); } } -void Device::slotStdErr(OProcess*, char*, int ) +void Device::slotStdErr(OProcess* proc, char* chars, int len) { qWarning("std err" ); + slotStdOut( proc, chars, len ); } diff --git a/noncore/net/opietooth/lib/lib.pro b/noncore/net/opietooth/lib/lib.pro index f2cde06..ce36d66 100644 --- a/noncore/net/opietooth/lib/lib.pro +++ b/noncore/net/opietooth/lib/lib.pro @@ -5,5 +5,5 @@ SOURCES = device.cc manager.cc remotedevice.cc services.cc TARGET = opietooth INCLUDEPATH += $(OPIEDIR)/include DESTDIR = $(QTDIR)/lib$(PROJMAK) -LIBS = -lopie +LIBS += -lopie #VERSION = 0.0.0 |