summaryrefslogtreecommitdiff
authorzecke <zecke>2002-06-15 23:07:12 (UTC)
committer zecke <zecke>2002-06-15 23:07:12 (UTC)
commit0675d8e8ea5f599af9f433e1e86b63953b26639d (patch) (side-by-side diff)
treefb3aaa512aa8f4600de119574999749758d38139
parent3f49c8a3006c4c51cf7d4a2f84a3926efd3e1820 (diff)
downloadopie-0675d8e8ea5f599af9f433e1e86b63953b26639d.zip
opie-0675d8e8ea5f599af9f433e1e86b63953b26639d.tar.gz
opie-0675d8e8ea5f599af9f433e1e86b63953b26639d.tar.bz2
fix it
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp2
-rw-r--r--noncore/net/opietooth/lib/device.cc11
-rw-r--r--noncore/net/opietooth/lib/lib.pro2
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
@@ -73,13 +73,13 @@ 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 {
if (btDevice) {
delete btDevice;
}
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
@@ -10,12 +10,13 @@ using namespace OpieTooth;
namespace {
int parsePid( const QCString& par ){
int id=0;
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;
}
}
return id;
@@ -75,13 +76,15 @@ QString Device::devName()const {
return QString::fromLatin1("hci0");
};
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" );
qWarning("Output: %s", m_output.data() );
pid = parsePid( m_output );
qWarning("Pid = %d", pid );
@@ -96,12 +99,13 @@ void Device::slotExited( OProcess* proc)
if(!m_hci->start() ){
qWarning("could not start" );
m_attached = false;
emit device("hci0", false );
}
}else{
+ qWarning("crass" );
m_attached = false;
emit device("hci0", false );
}
}
delete m_process;
@@ -125,18 +129,21 @@ void Device::slotExited( OProcess* proc)
m_hci = 0;
}
}
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
@@ -2,8 +2,8 @@ TEMPLATE = lib
CONFIG += qte warn_on release
HEADERS = device.h manager.h remotedevice.h services.h
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