summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 8498afc..787abc6 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -117,48 +117,52 @@ namespace OpieTooth {
117 } 117 }
118 } else { 118 } else {
119 odebug << "btDevice is ZERO" << oendl; 119 odebug << "btDevice is ZERO" << oendl;
120 return false; 120 return false;
121 } 121 }
122 } 122 }
123 123
124 int BluezApplet::setBluezStatus(int c, bool sync) { 124 int BluezApplet::setBluezStatus(int c, bool sync) {
125 125
126 if ( c == 1 ) { 126 if ( c == 1 ) {
127 switch ( ODevice::inst()->model() ) { 127 switch ( ODevice::inst()->model() ) {
128 case Model_iPAQ_H39xx: 128 case Model_iPAQ_H39xx:
129 btDevice = new Device( "/dev/tts/1", "bcsp", "921600" ); 129 btDevice = new Device( "/dev/tts/1", "bcsp", "921600" );
130 break; 130 break;
131 131
132 case Model_iPAQ_H5xxx: 132 case Model_iPAQ_H5xxx:
133 btDevice = new Device( "/dev/tts/1", "any", "921600" ); 133 btDevice = new Device( "/dev/tts/1", "any", "921600" );
134 break; 134 break;
135 135
136#if OPIE_VERSION >= 102010 136#if OPIE_VERSION >= 102010
137 case Model_MyPal_716: 137 case Model_MyPal_716:
138 btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" ); 138 btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" );
139 break; 139 break;
140#endif 140#endif
141 case Model_HTC_Universal:
142 btDevice = new Device( "/dev/ttyS1", "texas", "115200" );
143 break;
144
141 case Model_iPAQ_H22xx: 145 case Model_iPAQ_H22xx:
142 btDevice = new Device( "/dev/tts/3", "any", "921600" ); 146 btDevice = new Device( "/dev/tts/3", "any", "921600" );
143 break; 147 break;
144 148
145 default: 149 default:
146 btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" ); 150 btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" );
147 break; 151 break;
148 } 152 }
149 m_sync = sync; 153 m_sync = sync;
150 connect(btDevice, SIGNAL(device(const QString&, bool)), 154 connect(btDevice, SIGNAL(device(const QString&, bool)),
151 this, SLOT(slotDevice(const QString&, bool))); 155 this, SLOT(slotDevice(const QString&, bool)));
152 156
153 } else { 157 } else {
154 setObexRecieveStatus(0); 158 setObexRecieveStatus(0);
155 ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null"); 159 ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null");
156 if ( btManager ) { 160 if ( btManager ) {
157 delete btManager; 161 delete btManager;
158 btManager = 0; 162 btManager = 0;
159 } 163 }
160 if ( btDevice ) { 164 if ( btDevice ) {
161 delete btDevice; 165 delete btDevice;
162 btDevice = 0; 166 btDevice = 0;
163 } 167 }
164 } 168 }