Use univoc name for low level init module. Fixed include.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3756 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/drv/lcd_rit128x96.c b/bertos/drv/lcd_rit128x96.c
index 03140ba5b43f41665fa7e4a4971c430186bd53d4..f917cbb71b1ddf6bde38c264ea1c639e2a35f4da 100644 (file)
--- a/bertos/drv/lcd_rit128x96.c
+++ b/bertos/drv/lcd_rit128x96.c
@@ -35,10 +35,13 @@
  * \author Andrea Righi <arighi@develer.com>
  */
 
+#include "lcd_rit128x96.h"
+
+#include "hw/hw_rit128x96.h"
+
 #include <cfg/debug.h>
 #include <cfg/macros.h>
 
-#include "lcd_rit128x96.h"
 
 /*
  * Hard-coded command initialization sequence.
@@ -201,7 +204,7 @@ void rit128x96_blitBitmap(const Bitmap *bm)
 void rit128x96_init(void)
 {
        /* Initialize the communication bus */
-       lcd_bus_init();
+       lcd_rit128x96_hw_bus_init();
 
        /* Turn on the OLED display */
        rit128x96_on();

diff --git a/bertos/drv/lcd_rit128x96.h b/bertos/drv/lcd_rit128x96.h
index d5ae7ca314a70a9d84a477a2f6c40c1138c7439e..04b8e38810bf30c8586e48553f3a71c422c8e648 100644 (file)
--- a/bertos/drv/lcd_rit128x96.h
+++ b/bertos/drv/lcd_rit128x96.h
@@ -40,7 +40,8 @@
 #define LCD_LM3S_H
 
 #include <gfx/gfx.h> /* Bitmap */
-#include "hw/hw_rit128x96.h"
+
+#include <cpu/types.h>
 
 #define LCD_WIDTH      128
 #define LCD_HEIGHT     96

diff --git a/bertos/hw/hw_rit128x96.h b/bertos/hw/hw_rit128x96.h
index f9c2291a870e6f098d367c5e8539e995cf92a651..c24d1a87b8883fecbb00d9dae610a02c9fb03663 100644 (file)
--- a/bertos/hw/hw_rit128x96.h
+++ b/bertos/hw/hw_rit128x96.h
@@ -70,7 +70,7 @@
 #define LCD_WRITE(x)    ((void)x)/* Implement me! */
 /*@}*/
 
-INLINE void lcd_bus_init(void)
+INLINE void lcd_rit128x96_hw_bus_init(void)
 {
        /* Implement me! */
 }