From a60c44ba0b4e02ac93b9bf7e31fe92574cccaaca Mon Sep 17 00:00:00 2001
From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Thu, 20 May 2010 16:48:14 +0000
Subject: [PATCH] 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
---
bertos/drv/lcd_rit128x96.c | 7 +++++--
bertos/drv/lcd_rit128x96.h | 3 ++-
bertos/hw/hw_rit128x96.h | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/bertos/drv/lcd_rit128x96.c b/bertos/drv/lcd_rit128x96.c
index 03140ba5..f917cbb7 100644
--- 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 d5ae7ca3..04b8e388 100644
--- 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 f9c2291a..c24d1a87 100644
--- 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! */
}
--
2.34.1