---
apps/ircp/ircp_client.c | 10 ++++++----
apps/ircp/ircp_server.c | 11 ++++++-----
apps/irobex_palm3.c | 4 ++--
apps/irxfer.c | 4 ++--
apps/lib/obex_put_common.c | 5 +++--
apps/lib/obex_put_common.h | 4 ++--
apps/obex_find.c | 7 ++++---
apps/obex_tcp.c | 4 ++--
apps/obex_test/obex_test.c | 19 ++++++++++---------
apps/obex_test/obex_test_client.c | 2 +-
apps/obex_test/obex_test_server.c | 2 +-
udev/obex-check-device.c | 7 ++++---
12 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/apps/ircp/ircp_client.c b/apps/ircp/ircp_client.c
index 9035c2c..ed49096 100644
--- a/apps/ircp/ircp_client.c
+++ b/apps/ircp/ircp_client.c
@@ -87,7 +87,9 @@ static int cli_fillstream(ircp_client_t *cli, obex_object_t
*object)
//
// Incoming event from OpenOBEX.
//
-static void cli_obex_event(obex_t *handle, obex_object_t *object, int mode,
int event, int obex_cmd, int obex_rsp)
+static void cli_obex_event(obex_t *handle, obex_object_t *object,
+ enum obex_mode mode, enum obex_event event,
+ uint8_t obex_cmd, uint8_t obex_rsp)
{
ircp_client_t *cli;
@@ -132,7 +134,7 @@ static int cli_sync_request(ircp_client_t *cli,
obex_object_t *object)
OBEX_Request(cli->obexhandle, object);
while(cli->finished == FALSE) {
- ret = OBEX_HandleInput(cli->obexhandle, 20);
+ ret = OBEX_Work(cli->obexhandle, 20*1000);
DEBUG(4, "ret = %d\n", ret);
if (ret <= 0)
@@ -164,9 +166,9 @@ ircp_client_t *ircp_cli_open(ircp_info_cb_t infocb)
cli->fd = -1;
#ifdef DEBUG_TCP
- cli->obexhandle = OBEX_Init(OBEX_TRANS_INET, cli_obex_event, 0);
+ cli->obexhandle = OBEX_New(OBEX_TRANS_INET, cli_obex_event, 0);
#else
- cli->obexhandle = OBEX_Init(OBEX_TRANS_IRDA, cli_obex_event, 0);
+ cli->obexhandle = OBEX_New(OBEX_TRANS_IRDA, cli_obex_event, 0);
#endif
if(cli->obexhandle == NULL) {
diff --git a/apps/ircp/ircp_server.c b/apps/ircp/ircp_server.c
index 749a84e..41bbe83 100644
--- a/apps/ircp/ircp_server.c
+++ b/apps/ircp/ircp_server.c
@@ -27,8 +27,9 @@
//
// Incoming event from OpenOBEX
//
-static void srv_obex_event(obex_t *handle, obex_object_t *object, int mode,
- int event, int obex_cmd, int obex_rsp)
+static void srv_obex_event(obex_t *handle, obex_object_t *object,
+ enum obex_mode mode, enum obex_event event,
+ uint8_t obex_cmd, uint8_t obex_rsp)
{
ircp_server_t *srv;
int ret;
@@ -125,7 +126,7 @@ static int ircp_srv_sync_wait(ircp_server_t *srv)
{
int ret;
while(srv->finished == FALSE) {
- ret = OBEX_HandleInput(srv->obexhandle, 1);
+ ret = OBEX_Work(srv->obexhandle, 1000);
if (ret < 0)
return -1;
}
@@ -314,9 +315,9 @@ ircp_server_t *ircp_srv_open(ircp_info_cb_t infocb)
srv->infocb = infocb;
#ifdef DEBUG_TCP
- srv->obexhandle = OBEX_Init(OBEX_TRANS_INET, srv_obex_event, 0);
+ srv->obexhandle = OBEX_New(OBEX_TRANS_INET, srv_obex_event, 0);
#else
- srv->obexhandle = OBEX_Init(OBEX_TRANS_IRDA, srv_obex_event, 0);
+ srv->obexhandle = OBEX_New(OBEX_TRANS_IRDA, srv_obex_event, 0);
#endif
if(srv->obexhandle == NULL) {
diff --git a/apps/irobex_palm3.c b/apps/irobex_palm3.c
index a819363..e06fe6c 100644
--- a/apps/irobex_palm3.c
+++ b/apps/irobex_palm3.c
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
if ((argc < 1) || (argc > 4)) {
return usage(argv);
}
- handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0);
+ handle = OBEX_New(OBEX_TRANS_IRDA, obex_event, 0);
if (argc == 1) {
/* We are server*/
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
IrOBEX_ServerRegister(handle, "OBEX");
while (!finished)
- OBEX_HandleInput(handle, 1);
+ OBEX_Work(handle, 1000);
}
else {
/* We are a client */
diff --git a/apps/irxfer.c b/apps/irxfer.c
index c42bca1..99d54cb 100644
--- a/apps/irxfer.c
+++ b/apps/irxfer.c
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
return -1;
}
- handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0);
+ handle = OBEX_New(OBEX_TRANS_IRDA, obex_event, 0);
obex_protocol_type = OBEX_PROTOCOL_WIN95_IRXFER;
if (argc == 1) {
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
IrOBEX_ServerRegister(handle, "OBEX:IrXfer");
while (!finished) {
- OBEX_HandleInput(handle, 1);
+ OBEX_Work(handle, 1000);
}
} else {
/* We are a client */
diff --git a/apps/lib/obex_put_common.c b/apps/lib/obex_put_common.c
index cb48910..e18bf1e 100644
--- a/apps/lib/obex_put_common.c
+++ b/apps/lib/obex_put_common.c
@@ -158,7 +158,8 @@ static void client_done(obex_object_t *object, int
obex_cmd, int obex_rsp)
* Called by the obex-layer when some event occurs.
*
*/
-void obex_event(obex_t *handle, obex_object_t *object, int mode, int event,
int obex_cmd, int obex_rsp)
+void obex_event(obex_t *handle, obex_object_t *object, enum obex_mode mode,
+ enum obex_event event, uint8_t obex_cmd, uint8_t obex_rsp)
{
switch (event) {
case OBEX_EV_PROGRESS:
@@ -212,7 +213,7 @@ static int wait_for_rsp()
while(!finished) {
//printf("wait_for_rsp()\n");
- ret = OBEX_HandleInput(handle, 10);
+ ret = OBEX_Work(handle, 10*1000);
if (ret < 0)
return ret;
}
diff --git a/apps/lib/obex_put_common.h b/apps/lib/obex_put_common.h
index 92e45cb..8383502 100644
--- a/apps/lib/obex_put_common.h
+++ b/apps/lib/obex_put_common.h
@@ -23,6 +23,6 @@
#define OBEX_PUT_COMMON_H
int do_sync_request(obex_t *handle, obex_object_t *object, int async);
-void obex_event(obex_t *handle, obex_object_t *object, int mode, int event,
int obex_cmd, int obex_rsp);
-
+void obex_event(obex_t *handle, obex_object_t *object, enum obex_mode mode,
+ enum obex_event event, uint8_t obex_cmd, uint8_t obex_rsp);
#endif
diff --git a/apps/obex_find.c b/apps/obex_find.c
index 598ce7d..9198bb1 100644
--- a/apps/obex_find.c
+++ b/apps/obex_find.c
@@ -34,8 +34,9 @@
static int verbose = 0;
-static void obex_event_cb(obex_t *handle, obex_object_t *obj, int mode,
- int event, int obex_cmd, int obex_rsp)
+static void obex_event_cb(obex_t *handle, obex_object_t *obj,
+ enum obex_mode mode, enum obex_event event,
+ uint8_t obex_cmd, uint8_t obex_rsp)
{
}
@@ -103,7 +104,7 @@ static void find_devices(int trans, int flags)
return;
}
- handle = OBEX_Init(trans, obex_event_cb, flags);
+ handle = OBEX_New(trans, obex_event_cb, flags);
found = OBEX_EnumerateInterfaces(handle);
printf("Found %d %s devices.\n", found, descr);
for (; i < found; ++i) {
diff --git a/apps/obex_tcp.c b/apps/obex_tcp.c
index a9036ff..058eb2b 100644
--- a/apps/obex_tcp.c
+++ b/apps/obex_tcp.c
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
return -1;
}
- handle = OBEX_Init(OBEX_TRANS_INET, obex_event, 0);
+ handle = OBEX_New(OBEX_TRANS_INET, obex_event, 0);
if (argc == 1) {
printf("Waiting for files\n");
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
}
while (!finished) {
- ret = OBEX_HandleInput(handle, 10);
+ ret = OBEX_Work(handle, 10*1000);
if (ret == 0) {
printf("Timeout waiting for connection\n");
break;
diff --git a/apps/obex_test/obex_test.c b/apps/obex_test/obex_test.c
index 4b9b0b2..8142d4b 100644
--- a/apps/obex_test/obex_test.c
+++ b/apps/obex_test/obex_test.c
@@ -70,8 +70,9 @@ int str2ba(const char *str, bdaddr_t *ba) {
//
// Called by the obex-layer when some event occurs.
//
-static void obex_event(obex_t *handle, obex_object_t *object, int mode,
- int event, int obex_cmd, int obex_rsp)
+static void obex_event(obex_t *handle, obex_object_t *object,
+ enum obex_mode mode, enum obex_event event,
+ uint8_t obex_cmd, uint8_t obex_rsp)
{
switch (event) {
case OBEX_EV_PROGRESS:
@@ -245,7 +246,7 @@ int main (int argc, char *argv[])
return -1;
}
- handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0);
+ handle = OBEX_New(OBEX_TRANS_CUSTOM, obex_event, 0);
if (!handle) {
perror( "OBEX_Init failed");
return -1;
@@ -286,7 +287,7 @@ int main (int argc, char *argv[])
switch (btobex) {
case 1:
printf("Using Bluetooth RFCOMM transport\n");
- handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0);
+ handle = OBEX_New(OBEX_TRANS_BLUETOOTH, obex_event, 0);
if (channel_arg)
channel = (atoi(channel_arg) & 0xFF);
else
@@ -295,7 +296,7 @@ int main (int argc, char *argv[])
case 2:
printf("Using Bluetooth L2CAP transport\n");
- handle = OBEX_Init(OBEX_TRANS_BT_L2CAP, obex_event, 0);
+ handle = OBEX_New(OBEX_TRANS_BT_L2CAP, obex_event, 0);
if (channel_arg)
channel = atoi(channel_arg);
channel = (channel | 0x1001) & 0xFFFF;
@@ -315,7 +316,7 @@ int main (int argc, char *argv[])
case 2:
printf("Using USB transport, "
"querying available interfaces\n");
- handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0);
+ handle = OBEX_New(OBEX_TRANS_USB, obex_event, 0);
if (!handle) {
perror( "OBEX_Init failed");
exit(0);
@@ -343,7 +344,7 @@ int main (int argc, char *argv[])
case 3:
intf_num = atoi(argv[2]);
printf("Using USB transport \n");
- handle = OBEX_Init(OBEX_TRANS_USB, obex_event, 0);
+ handle = OBEX_New(OBEX_TRANS_USB, obex_event, 0);
if (!handle) {
perror( "OBEX_Init failed");
exit(0);
@@ -366,7 +367,7 @@ int main (int argc, char *argv[])
if (tcpobex) {
printf("Using TCP transport\n");
- handle = OBEX_Init(OBEX_TRANS_INET, obex_event, 0);
+ handle = OBEX_New(OBEX_TRANS_INET, obex_event, 0);
if (!handle) {
perror( "OBEX_Init failed");
exit(0);
@@ -374,7 +375,7 @@ int main (int argc, char *argv[])
} else {
printf("Using IrDA transport\n");
- handle = OBEX_Init(OBEX_TRANS_IRDA, obex_event, 0);
+ handle = OBEX_New(OBEX_TRANS_IRDA, obex_event, 0);
if (!handle) {
perror( "OBEX_Init failed");
exit(0);
diff --git a/apps/obex_test/obex_test_client.c
b/apps/obex_test/obex_test_client.c
index d9714b4..cf2dab4 100644
--- a/apps/obex_test/obex_test_client.c
+++ b/apps/obex_test/obex_test_client.c
@@ -72,7 +72,7 @@ static void syncwait(obex_t *handle)
while(!gt->clientdone) {
//printf("syncwait()\n");
- ret = OBEX_HandleInput(handle, 10);
+ ret = OBEX_Work(handle, 10*1000);
if(ret < 0) {
printf("Error while doing OBEX_HandleInput()\n");
break;
diff --git a/apps/obex_test/obex_test_server.c
b/apps/obex_test/obex_test_server.c
index 38014da..b2fb41f 100644
--- a/apps/obex_test/obex_test_server.c
+++ b/apps/obex_test/obex_test_server.c
@@ -238,7 +238,7 @@ void server_do(obex_t *handle)
gt->serverdone = FALSE;
while(!gt->serverdone) {
- ret = OBEX_HandleInput(handle, 60);
+ ret = OBEX_Work(handle, 60*1000);
if(ret < 0) {
printf("Error while doing OBEX_HandleInput()\n");
break;
diff --git a/udev/obex-check-device.c b/udev/obex-check-device.c
index 9eb4769..2ab6ad8 100644
--- a/udev/obex-check-device.c
+++ b/udev/obex-check-device.c
@@ -24,8 +24,9 @@
#include <string.h>
#include <stdlib.h>
-static void obex_event_cb(obex_t *handle, obex_object_t *obj, int mode,
- int event, int obex_cmd, int obex_rsp)
+static void obex_event_cb(obex_t *handle, obex_object_t *obj,
+ enum obex_mode mode, enum obex_event event,
+ uint8_t cmd, uint8_t rsp)
{
}
@@ -42,7 +43,7 @@ static int find_usb_device(uint16_t vendor, uint16_t product)
int matched = 0;
int i = 0;
- handle = OBEX_Init(OBEX_TRANS_USB, obex_event_cb, 0);
+ handle = OBEX_New(OBEX_TRANS_USB, obex_event_cb, 0);
if (!handle)
return 0;
--
1.7.5.4
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Openobex-users mailing list
Openobex-users@lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/openobex-users
