Merge branch 'master' into chenyong

components/vbus/Kconfig

@@ -18,6 +18,45 @@ if RT_USING_VBUS
         help
             When enable remote shell, the finsh/msh of RT-Thread can be operated from another
             Operating System.
+
+    config RT_VBUS_USING_TESTS
+        bool "Enable tests on VBUS "
+        default n
+
+    config _RT_VBUS_RING_BASE
+        hex "VBUS address"
+        help
+            VBUS ring buffer physical address.
+
+    config _RT_VBUS_RING_SZ
+        int "VBUS ring size"
+        help
+            VBUS size of the ring buffer.
+
+    config RT_VBUS_GUEST_VIRQ
+        int "RT_VBUS_GUEST_VIRQ"
+        help
+            RT_VBUS_GUEST_VIRQ
+        help
+            The interrupt number used to notify the client on a particular system.
+
+    config RT_VBUS_HOST_VIRQ
+        int "RT_VBUS_HOST_VIRQ"
+        help
+            The interrupt be triggered on a particular system when the client notify the host.
+
+    config RT_VBUS_SHELL_DEV_NAME
+        string "RT_VBUS_SHELL_DEV_NAME"
+        default "vbser0"
+        help
+            The name of the UBUS shell device.
+
+    config RT_VBUS_RFS_DEV_NAME
+        string "RT_VBUS_RFS_DEV_NAME"
+        default "rfs"
+        help
+            The name of the UBUS rfs device.
+
 endif
 
 endmenu

components/vbus/share_hdr/vbus_api.h

@@ -1,13 +1,15 @@
 #ifndef __VBUS_API_H__
 #define __VBUS_API_H__
 
-#include "vbus_conf.h"
+#define RT_VBUS_USING_FLOW_CONTROL
 
 #define RT_VBUS_CHANNEL_NR   32
 
 #define RT_VBUS_BLK_HEAD_SZ  4
 #define RT_VBUS_MAX_PKT_SZ   (256 - RT_VBUS_BLK_HEAD_SZ)
 
+#define RT_VMM_RB_BLK_NR (_RT_VBUS_RING_SZ / 64 - 1)
+
 #ifndef __ASSEMBLY__
 #include <stddef.h> /* For size_t */
 

components/vbus/vbus.h

@@ -30,7 +30,6 @@
  * 2015-01-06     Grissiom     version 2.0.3; API change, no functional changes
  */
 
-#include "vbus_local_conf.h"
 #include <vbus_api.h>
 
 int rt_vbus_init(void *outr, void *inr);