From 0504ee9ed470e3b4705065736efd5943b5023dbf Mon Sep 17 00:00:00 2001 From: asterix Date: Wed, 19 May 2010 12:33:10 +0000 Subject: [PATCH] Remove lcd configuration files, and add the lcd_hd44 configuration files. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3722 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cfg/{cfg_lcd.h => cfg_lcd_hd44.h} | 15 --------------- bertos/hw/{hw_lcd.h => hw_lcd_hd44.h} | 19 +++++++------------ 2 files changed, 7 insertions(+), 27 deletions(-) rename bertos/cfg/{cfg_lcd.h => cfg_lcd_hd44.h} (85%) rename bertos/hw/{hw_lcd.h => hw_lcd_hd44.h} (94%) diff --git a/bertos/cfg/cfg_lcd.h b/bertos/cfg/cfg_lcd_hd44.h similarity index 85% rename from bertos/cfg/cfg_lcd.h rename to bertos/cfg/cfg_lcd_hd44.h index 079473a0..78f1f20b 100644 --- a/bertos/cfg/cfg_lcd.h +++ b/bertos/cfg/cfg_lcd_hd44.h @@ -51,20 +51,5 @@ */ #define CONFIG_LCD_ADDRESS_FAST 1 -/** - * LCD setting for 32122A (AVR implementation). - * $WIZ$ type = "boolean" - * $WIZ$ supports = "avr and False" - */ -#define CONFIG_LCD_SOFTINT_REFRESH 0 - -/** - * LCD setting for 32122A (AVR implementation). - * $WIZ$ type = "boolean" - * $WIZ$ supports = "avr and False" - */ -#define CONFIG_LCD_WAIT 1 - - #endif /* CFG_LCD_H */ diff --git a/bertos/hw/hw_lcd.h b/bertos/hw/hw_lcd_hd44.h similarity index 94% rename from bertos/hw/hw_lcd.h rename to bertos/hw/hw_lcd_hd44.h index 21b64d4e..dfebbcab 100644 --- a/bertos/hw/hw_lcd.h +++ b/bertos/hw/hw_lcd_hd44.h @@ -33,23 +33,18 @@ * * \brief LCD low-level hardware macros * - * \version $Id$ - * * \author Bernie Innocenti * \author Stefano Fedrigo * */ -#ifndef HW_LCD_H -#define HW_LCD_H +#ifndef HW_LCD_HD44_H +#define HW_LCD_HD44_H -#include "cfg/cfg_lcd.h" /* CONFIG_LCD_4BIT */ -#include /* BV() */ -#include +#include "cfg/cfg_lcd_hd44.h" /* CONFIG_LCD_4BIT */ -#include -#include #include +#include #warning TODO:This is an example implementation, you must implement it! @@ -117,7 +112,6 @@ /** Set data bus direction to input (read from display) */ #define LCD_DB_IN /* Implement me! */ - /** Delay for write (Enable pulse width, 220ns) */ #define LCD_DELAY_WRITE \ do { \ @@ -138,7 +132,8 @@ } while (0) -INLINE void lcd_bus_init(void) + +INLINE void lcd_hd44_hw_bus_init(void) { cpu_flags_t flags; IRQ_SAVE_DISABLE(flags); @@ -159,4 +154,4 @@ INLINE void lcd_bus_init(void) IRQ_RESTORE(flags); } -#endif /* HW_LCD_H */ +#endif /* HW_LCD_HD44_H */ -- 2.25.1