From e3d8ac1ce502e5a5f9dc762da301b0060b641811 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 07 十二月 2020 15:56:42 +0800
Subject: [PATCH] 修改适配新的版本接口

---
 libcbhomebus_func.h |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/libcbhomebus_func.h b/libcbhomebus_func.h
index 83d663d..0479a28 100644
--- a/libcbhomebus_func.h
+++ b/libcbhomebus_func.h
@@ -127,7 +127,7 @@
  *
  * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 */
-typedef int  (*tfn_net_mod_socket_start_bus)(void * _socket);
+//typedef int  (*tfn_net_mod_socket_start_bus)(void * _socket);
 
 
  /**
@@ -147,10 +147,10 @@
  * @size 涓婚闀垮害
  * @key 鎬荤嚎绔彛
  */
-typedef int  (*tfn_net_mod_socket_sub)(void * _socket, void *topic, int size, int key);
+typedef int  (*tfn_net_mod_socket_sub)(void * _socket, void *topic, int size);
 // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-typedef int  (*tfn_net_mod_socket_sub_timeout)(void * _socket, void *topic, int size, int key, int sec, int nsec);
-typedef int  (*tfn_net_mod_socket_sub_nowait)(void * _socket, void *topic, int size, int key);
+typedef int  (*tfn_net_mod_socket_sub_timeout)(void * _socket, void *topic, int size, int sec, int nsec);
+typedef int  (*tfn_net_mod_socket_sub_nowait)(void * _socket, void *topic, int size);
 
 
 /**
@@ -159,10 +159,10 @@
  * @size 涓婚闀垮害
  * @key 鎬荤嚎绔彛
  */
-typedef int  (*tfn_net_mod_socket_desub)(void * _socket, void *topic, int size, int key);
+typedef int  (*tfn_net_mod_socket_desub)(void * _socket, void *topic, int size);
 // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-typedef int  (*tfn_net_mod_socket_desub_timeout)(void * _socket, void *topic, int size, int key, int sec, int nsec);
-typedef int  (*tfn_net_mod_socket_desub_nowait)(void * _socket, void *topic, int size, int key);
+typedef int  (*tfn_net_mod_socket_desub_timeout)(void * _socket, void *topic, int size, int sec, int nsec);
+typedef int  (*tfn_net_mod_socket_desub_nowait)(void * _socket, void *topic, int size);
 
 
 /**
@@ -190,6 +190,7 @@
  */
 typedef int(*tfn_shm_mod_socket_remove_keys) (int*, int);
 
+
 /**
  * 鍒涘缓
  */
@@ -205,6 +206,21 @@
  */
 typedef int (*tfn_net_mod_server_socket_start)(void *_sockt);
 
+/**
+ * bus鍒涘缓
+ */
+typedef void *(*tfn_bus_server_socket_wrapper_open)() ;
+
+/**
+ * bus鍏抽棴
+ */
+typedef void (*tfn_bus_server_socket_wrapper_close)(void *_sockt) ;
+
+/**
+ * bus鍚姩
+ */
+typedef int (*tfn_bus_server_socket_wrapper_start_bus)(void *_sockt);
+
 #ifdef __cplusplus
 }
 #endif

--
Gitblit v1.8.0