-rw-r--r-- | noncore/net/opietooth/lib/device.cc | 12 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/device.h | 9 |
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 { | |||
25 | 25 | ||
26 | Device::Device(const QString &device, const QString &mode ) | 26 | Device::Device(const QString &device, const QString &mode, const QString &speed ) |
27 | : QObject(0, "device" ) { | 27 | : QObject(0, "device") { |
28 | |||
28 | qWarning("OpieTooth::Device create" ); | 29 | qWarning("OpieTooth::Device create" ); |
@@ -33,2 +34,3 @@ Device::Device(const QString &device, const QString &mode ) | |||
33 | m_mode = mode; | 34 | m_mode = mode; |
35 | m_speed = speed; | ||
34 | attach(); | 36 | attach(); |
@@ -39,3 +41,3 @@ Device::~Device(){ | |||
39 | void Device::attach(){ | 41 | void Device::attach(){ |
40 | qWarning("attaching %s %s", m_device.latin1(), m_mode.latin1() ); | 42 | qWarning("attaching %s %s %s", m_device.latin1(), m_mode.latin1(), m_speed.latin1() ); |
41 | if(m_process == 0 ){ | 43 | if(m_process == 0 ){ |
@@ -46,3 +48,3 @@ void Device::attach(){ | |||
46 | *m_process << "-p"; | 48 | *m_process << "-p"; |
47 | *m_process << m_device << m_mode; | 49 | *m_process << m_device << m_mode << m_speed; |
48 | connect(m_process, SIGNAL( processExited(OProcess*) ), | 50 | connect(m_process, SIGNAL( processExited(OProcess*) ), |
@@ -136,3 +138,3 @@ void Device::slotStdOut(OProcess* proc, char* chars, int len) | |||
136 | qWarning( "len < 1 " ); | 138 | qWarning( "len < 1 " ); |
137 | return; | 139 | return; |
138 | } | 140 | } |
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 { | |||
13 | /** | 13 | /** |
14 | * Device takes care of attaching serial | 14 | * Device takes care of attaching serial |
15 | * devices to the blueZ stack. | 15 | * devices to the blueZ stack. |
@@ -18,3 +18,4 @@ namespace OpieTooth { | |||
18 | class Device : public QObject { | 18 | class Device : public QObject { |
19 | Q_OBJECT | 19 | |
20 | Q_OBJECT | ||
20 | 21 | ||
@@ -28,4 +29,5 @@ namespace OpieTooth { | |||
28 | * @param &mode QString the mode | 29 | * @param &mode QString the mode |
30 | * @param &speed QString the speed of the device, can be left blank | ||
29 | */ | 31 | */ |
30 | Device(const QString &device, const QString& mode); | 32 | Device(const QString &device, const QString& mode, const QString& speed); |
31 | 33 | ||
@@ -79,2 +81,3 @@ namespace OpieTooth { | |||
79 | QString m_mode; | 81 | QString m_mode; |
82 | QString m_speed; | ||
80 | pid_t pid; | 83 | pid_t pid; |