-rw-r--r-- | core/obex/btobex.cpp | 2 | ||||
-rw-r--r-- | core/obex/obex.cpp | 3 | ||||
-rw-r--r-- | core/obex/obex.h | 3 | ||||
-rw-r--r-- | core/obex/obexserver.cpp | 24 | ||||
-rw-r--r-- | core/obex/obexserver.h | 4 |
5 files changed, 21 insertions, 15 deletions
diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp index 212a084..4e078b0 100644 --- a/core/obex/btobex.cpp +++ b/core/obex/btobex.cpp | |||
@@ -67,3 +67,3 @@ void BtObex::receive() { | |||
67 | ObexBase::receive(); | 67 | ObexBase::receive(); |
68 | m_rec = new ObexServer(); | 68 | m_rec = new ObexServer(OBEX_TRANS_BLUETOOTH); |
69 | 69 | ||
diff --git a/core/obex/obex.cpp b/core/obex/obex.cpp index 95c561a..e4a3c31 100644 --- a/core/obex/obex.cpp +++ b/core/obex/obex.cpp | |||
@@ -59,4 +59,3 @@ void Obex::receive() { | |||
59 | ObexBase::receive(); | 59 | ObexBase::receive(); |
60 | m_rec = new OProcess(); | 60 | m_rec = new ObexServer(OBEX_TRANS_IRDA); |
61 | *m_rec << "irobex_palm3"; | ||
62 | // connect to the necessary slots | 61 | // connect to the necessary slots |
diff --git a/core/obex/obex.h b/core/obex/obex.h index 36ff29a..b948ce4 100644 --- a/core/obex/obex.h +++ b/core/obex/obex.h | |||
@@ -36,2 +36,3 @@ | |||
36 | #include <qobject.h> | 36 | #include <qobject.h> |
37 | #include "obexserver.h" | ||
37 | 38 | ||
@@ -86,3 +87,3 @@ namespace OpieObex { | |||
86 | Opie::Core::OProcess *m_send; | 87 | Opie::Core::OProcess *m_send; |
87 | Opie::Core::OProcess *m_rec; | 88 | ObexServer* m_rec; //The OBEX server |
88 | bool m_receive : 1; | 89 | bool m_receive : 1; |
diff --git a/core/obex/obexserver.cpp b/core/obex/obexserver.cpp index 95196de..25d8224 100644 --- a/core/obex/obexserver.cpp +++ b/core/obex/obexserver.cpp | |||
@@ -50,5 +50,6 @@ using namespace OpieObex; | |||
50 | 50 | ||
51 | ObexServer::ObexServer() : | 51 | ObexServer::ObexServer(int trans) : |
52 | OProcess(tr("ObexServer"), 0, "ObexServer") | 52 | OProcess(tr("ObexServer"), 0, "ObexServer") |
53 | { | 53 | { |
54 | transport = trans; | ||
54 | m_obex = NULL; | 55 | m_obex = NULL; |
@@ -331,3 +332,3 @@ int ObexServer::initObex(void) | |||
331 | return 0; | 332 | return 0; |
332 | m_obex = ::OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0); | 333 | m_obex = ::OBEX_Init(transport, obex_event, 0); |
333 | if (!m_obex) { | 334 | if (!m_obex) { |
@@ -336,10 +337,13 @@ int ObexServer::initObex(void) | |||
336 | } | 337 | } |
337 | ::BtOBEX_ServerRegister(m_obex, NULL, channel); | 338 | if (transport == OBEX_TRANS_BLUETOOTH) { |
338 | m_session = addOpushSvc(channel, "OBEX push service"); | 339 | ::BtOBEX_ServerRegister(m_obex, NULL, channel); |
339 | if (!m_session) { | 340 | m_session = addOpushSvc(channel, "OBEX push service"); |
340 | printf("OBEX registration error %d\n", errno); | 341 | if (!m_session) { |
341 | ::OBEX_Cleanup(m_obex); | 342 | printf("OBEX registration error %d\n", errno); |
342 | m_obex = NULL; | 343 | ::OBEX_Cleanup(m_obex); |
343 | return -1; | 344 | m_obex = NULL; |
344 | } | 345 | return -1; |
346 | } | ||
347 | } else if (transport == OBEX_TRANS_IRDA) | ||
348 | ::IrOBEX_ServerRegister(m_obex, "OBEX"); | ||
345 | return 0; | 349 | return 0; |
diff --git a/core/obex/obexserver.h b/core/obex/obexserver.h index 8567105..28577e2 100644 --- a/core/obex/obexserver.h +++ b/core/obex/obexserver.h | |||
@@ -55,2 +55,4 @@ namespace OpieObex { | |||
55 | Q_OBJECT | 55 | Q_OBJECT |
56 | private: | ||
57 | int transport; //The OBEX transport type | ||
56 | public: | 58 | public: |
@@ -59,3 +61,3 @@ namespace OpieObex { | |||
59 | */ | 61 | */ |
60 | ObexServer(); | 62 | ObexServer(int trans); |
61 | /** | 63 | /** |