lib a bit more flexible for hciattach arguments

2 files changed, 13 insertions, 8 deletions

diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc
index 5edfc03..bae1c47 100644
--- a/noncore/net/opietooth/lib/device.cc
+++ b/noncore/net/opietooth/lib/device.cc
@@ -25,4 +25,5 @@ namespace {
 
-Device::Device(const QString &device, const QString &mode )
-  : QObject(0, "device" ) {
+Device::Device(const QString &device, const QString &mode, const QString &speed )
+  : QObject(0, "device") {
+
   qWarning("OpieTooth::Device create" );
@@ -33,2 +34,3 @@ Device::Device(const QString &device, const QString &mode )
   m_mode = mode;
+  m_speed = speed;
   attach();
@@ -39,3 +41,3 @@ Device::~Device(){
 void Device::attach(){
-  qWarning("attaching %s %s", m_device.latin1(), m_mode.latin1() );
+  qWarning("attaching %s %s %s", m_device.latin1(), m_mode.latin1(), m_speed.latin1() );
   if(m_process == 0 ){
@@ -46,3 +48,3 @@ void Device::attach(){
     *m_process << "-p";
-    *m_process << m_device << m_mode;
+    *m_process << m_device << m_mode << m_speed;
     connect(m_process, SIGNAL( processExited(OProcess*) ),
@@ -136,3 +138,3 @@ void Device::slotStdOut(OProcess* proc, char* chars, int len)
     qWarning( "len < 1 " );
-    return; 
+    return;
   }
diff --git a/noncore/net/opietooth/lib/device.h b/noncore/net/opietooth/lib/device.h
index c0e2658..ce7fccc 100644
--- a/noncore/net/opietooth/lib/device.h
+++ b/noncore/net/opietooth/lib/device.h
@@ -13,3 +13,3 @@ namespace OpieTooth {
     /**
-     *  Device takes care of attaching serial 
+     *  Device takes care of attaching serial
      *  devices to the blueZ stack.
@@ -18,3 +18,4 @@ namespace OpieTooth {
     class Device : public QObject {
-    Q_OBJECT
+
+        Q_OBJECT
 
@@ -28,4 +29,5 @@ namespace OpieTooth {
      * @param &mode QString the mode
+     * @param &speed QString the speed of the device, can be left blank
      */
-    Device(const QString &device, const QString& mode);
+    Device(const QString &device, const QString& mode, const QString& speed);
 
@@ -79,2 +81,3 @@ namespace OpieTooth {
         QString m_mode;
+        QString m_speed;
         pid_t pid;