From 84e8c6568337fee7f6daa936cb1b822c1154b4e6 Mon Sep 17 00:00:00 2001
From: shaojinchun <shaojinchun@rt-thread.com>
Date: Mon, 27 Aug 2018 18:15:38 +0800
Subject: [PATCH] RT_VMM_RB_BLK_NR now is calculated from _RT_VBUS_RING_SZ

---
 bsp/qemu-vexpress-gemini/.config     | 1 -
 bsp/qemu-vexpress-gemini/rtconfig.h  | 1 -
 components/vbus/Kconfig              | 5 -----
 components/vbus/share_hdr/vbus_api.h | 2 ++
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/bsp/qemu-vexpress-gemini/.config b/bsp/qemu-vexpress-gemini/.config
index 572f15f786..a403198e78 100644
--- a/bsp/qemu-vexpress-gemini/.config
+++ b/bsp/qemu-vexpress-gemini/.config
@@ -183,7 +183,6 @@ CONFIG_RT_VBUS_USING_FLOW_CONTROL=y
 CONFIG_RT_VBUS_USING_TESTS=y
 CONFIG__RT_VBUS_RING_BASE=0x6f800000
 CONFIG__RT_VBUS_RING_SZ=2097152
-CONFIG_RT_VMM_RB_BLK_NR=32767
 CONFIG_RT_VBUS_GUEST_VIRQ=14
 CONFIG_RT_VBUS_HOST_VIRQ=15
 CONFIG_RT_VBUS_SHELL_DEV_NAME="vbser0"
diff --git a/bsp/qemu-vexpress-gemini/rtconfig.h b/bsp/qemu-vexpress-gemini/rtconfig.h
index d0c93855aa..a5b23d1604 100644
--- a/bsp/qemu-vexpress-gemini/rtconfig.h
+++ b/bsp/qemu-vexpress-gemini/rtconfig.h
@@ -166,7 +166,6 @@
 #define RT_VBUS_USING_TESTS
 #define _RT_VBUS_RING_BASE 0x6f800000
 #define _RT_VBUS_RING_SZ 2097152
-#define RT_VMM_RB_BLK_NR 32767
 #define RT_VBUS_GUEST_VIRQ 14
 #define RT_VBUS_HOST_VIRQ 15
 #define RT_VBUS_SHELL_DEV_NAME "vbser0"
diff --git a/components/vbus/Kconfig b/components/vbus/Kconfig
index d1b38ec90f..c1afca994f 100644
--- a/components/vbus/Kconfig
+++ b/components/vbus/Kconfig
@@ -39,11 +39,6 @@ if RT_USING_VBUS
         help
             VBUS size of the ring buffer.
 
-    config RT_VMM_RB_BLK_NR
-        int "RT_VMM_RB_BLK_NR"
-        help
-            Number of ring buffer.
-
     config RT_VBUS_GUEST_VIRQ
         int "RT_VBUS_GUEST_VIRQ"
         help
diff --git a/components/vbus/share_hdr/vbus_api.h b/components/vbus/share_hdr/vbus_api.h
index 71fd4165c3..3ad2a9ae68 100644
--- a/components/vbus/share_hdr/vbus_api.h
+++ b/components/vbus/share_hdr/vbus_api.h
@@ -6,6 +6,8 @@
 #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 */
 
-- 
GitLab