From 7957a2f100eb687e63cd3593097c5914539c7406 Mon Sep 17 00:00:00 2001
From: harlekin <harlekin>
Date: Thu, 16 Jan 2003 19:50:06 +0000
Subject: lib a bit more flexible for hciattach arguments

---
(limited to 'noncore')

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
@@ -23,28 +23,30 @@ 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" );
   m_hci = 0;
   m_process = 0;
   m_attached = false;
   m_device = device;
   m_mode = mode;
+  m_speed = speed;
   attach();
 }
 Device::~Device(){
   detach();
 }
 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 ){
     m_output.resize(0);
     qWarning("new process to create" );
     m_process = new OProcess();
     *m_process << "hciattach";
     *m_process << "-p";
-    *m_process << m_device << m_mode;
+    *m_process << m_device << m_mode << m_speed;
     connect(m_process, SIGNAL( processExited(OProcess*) ),
 	    this, SLOT( slotExited(OProcess* ) ) );
     connect(m_process, SIGNAL( receivedStdout(OProcess*, char*, int) ),
@@ -134,7 +136,7 @@ void Device::slotStdOut(OProcess* proc, char* chars, int len)
   qWarning("std out" );
   if( len <1 ){
     qWarning( "len < 1 " );
-    return; 
+    return;
   }
   if(proc == m_process ){
     QCString string( chars, len+1 ); // \0 == +1
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
@@ -11,12 +11,13 @@
 class OProcess;
 namespace OpieTooth {
     /**
-     *  Device takes care of attaching serial 
+     *  Device takes care of attaching serial
      *  devices to the blueZ stack.
      *  After attaching it hciconfig ups it
      */
     class Device : public QObject {
-    Q_OBJECT
+
+        Q_OBJECT
 
     public:
 
@@ -26,8 +27,9 @@ namespace OpieTooth {
      *
      * @param &device QString the device name
      * @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);
 
         /**
          * unloads the device
@@ -77,6 +79,7 @@ namespace OpieTooth {
 	OProcess* m_process;
 	QString m_devId;
 	QString m_mode;
+        QString m_speed;
 	pid_t pid;
 	QCString m_output;
     };
--
cgit v0.9.0.2