Merge pull request #410 from grissiom/lpc43xx

BernardXiong · BernardXiong · commit e395c8c6f0c0 · 2015-01-10T08:45:44.000+08:00
vbus: remove the rt_ prefix in the watermark queue source file
diff --git a/components/vbus/vbus.c b/components/vbus/vbus.c
@@ -162,7 +162,7 @@ rt_inline int _chn_connected(unsigned char chnr)
 }
 
 #ifdef RT_VBUS_USING_FLOW_CONTROL
-#include <rt_watermark_queue.h>
+#include <watermark_queue.h>
 struct rt_watermark_queue _chn_wm_que[RT_VBUS_CHANNEL_NR];
 void rt_vbus_set_post_wm(unsigned char chnr, unsigned int low, unsigned int high)
 {
diff --git a/components/vbus/watermark_queue.c b/components/vbus/watermark_queue.c
@@ -30,7 +30,7 @@
 #include <rthw.h>
 #include <rtthread.h>
 
-#include "rt_watermark_queue.h"
+#include "watermark_queue.h"
 
 void rt_wm_que_set_mark(struct rt_watermark_queue *wg,
                              unsigned int low, unsigned int high)
diff --git a/components/vbus/watermark_queue.h b/components/vbus/watermark_queue.h

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ rt_inline int _chn_connected(unsigned char chnr)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`#ifdef RT_VBUS_USING_FLOW_CONTROL`
`165`		`-#include <rt_watermark_queue.h>`
	`165`	`+#include <watermark_queue.h>`
`166`	`166`	`struct rt_watermark_queue _chn_wm_que[RT_VBUS_CHANNEL_NR];`
`167`	`167`	`void rt_vbus_set_post_wm(unsigned char chnr, unsigned int low, unsigned int high)`
`168`	`168`	`{`