rit128x96: fix nightly_test warnings.

Fix the following nightly test warnings:
 ./bertos/drv/lcd_rit128x96.h:39:28: warning: drv/clock_lm3s.h: No such file or directory
 ./bertos/drv/lcd_rit128x96.h:40:26: warning: drv/ssi_lm3s.h: No such file or directory
 ./bertos/drv/lcd_rit128x96.h:41:27: warning: drv/gpio_lm3s.h: No such file or directory
 ./bertos/drv/lcd_rit128x96.c:110: warning: implicit declaration of function 'LCD_WRITE'
 ./bertos/drv/lcd_rit128x96.c:112: warning: implicit declaration of function 'LCD_READ'
 ./bertos/drv/lcd_rit128x96.c:122: warning: implicit declaration of function 'LCD_SET_COMMAND'
 ./bertos/drv/lcd_rit128x96.c:162: warning: implicit declaration of function 'LCD_SET_DATA'

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

diff --git a/bertos/drv/lcd_rit128x96.c b/bertos/drv/lcd_rit128x96.c
index 216237d82aac25ce48e0755e9174d102c27d7478..7e538327f2a008aed1b2875e5e1ab9a65ae2d732 100644 (file)
--- a/bertos/drv/lcd_rit128x96.c
+++ b/bertos/drv/lcd_rit128x96.c
@@ -107,9 +107,16 @@ static void lcd_dataWrite(const uint8_t *buf, size_t count)
 {
        while (count--)
        {
+#if !CONFIG_LCD_4BIT
                LCD_WRITE(*buf++);
                /* Dummy read to drain the FIFO */
-               (void)LCD_READ();
+               (void)LCD_READ;
+#else
+               LCD_WRITE_H(*buf);
+               LCD_WRITE_L(*buf++);
+               (void)LCD_READ_H;
+               (void)LCD_READ_L;
+#endif
        }
 }
 

diff --git a/bertos/drv/lcd_rit128x96.h b/bertos/drv/lcd_rit128x96.h
index aaebd48a2ed7aa9d592946cf1c19d4df3e36ed96..7f6074737b68e988b262c3b3a827a3a7987f5154 100644 (file)
--- a/bertos/drv/lcd_rit128x96.h
+++ b/bertos/drv/lcd_rit128x96.h
@@ -36,9 +36,6 @@
 #ifndef LCD_LM3S_H
 #define LCD_LM3S_H
 
-#include <drv/clock_lm3s.h>
-#include <drv/ssi_lm3s.h>
-#include <drv/gpio_lm3s.h>
 #include <gfx/gfx.h> /* Bitmap */
 #include <hw/hw_lcd.h>
 

diff --git a/bertos/hw/hw_lcd.h b/bertos/hw/hw_lcd.h
index 3a206a0f5df48e0ef69fdd3d3935b6357142c204..21b64d4e99e047626e57bc9ce1c9f5d867074627 100644 (file)
--- a/bertos/hw/hw_lcd.h
+++ b/bertos/hw/hw_lcd.h
@@ -95,6 +95,12 @@
 #define LCD_CLR_E       /* Implement me! */
 #define LCD_SET_E       /* Implement me! */
 
+/* Enter command mode */
+#define LCD_SET_COMMAND() /* Implement me! */
+
+/* Enter data mode */
+#define LCD_SET_DATA() /* Implement me! */
+
 #if CONFIG_LCD_4BIT
        #define LCD_WRITE_H(x)  ((void)x)/* Implement me! */
        #define LCD_WRITE_L(x)  ((void)x)/* Implement me! */

diff --git a/examples/lm3s1968/cfg/cfg_lcd.h b/examples/lm3s1968/cfg/cfg_lcd.h
new file mode 100644 (file)
index 0000000..d48fa5d
--- /dev/null
+++ b/examples/lm3s1968/cfg/cfg_lcd.h
@@ -0,0 +1,68 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2008 Develer S.r.l. (http://www.develer.com/)
+ * All Rights Reserved.
+ * -->
+ *
+ * \brief Configuration file for lcd display module.
+ */
+
+#ifndef CFG_LCD_H
+#define CFG_LCD_H
+
+/**
+ * Use 4 bit addressing mode.
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_LCD_4BIT            0
+
+/**
+ * Use a table to speed up LCD memory addressing.
+ * This will use about 100 bytes of RAM.
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_LCD_ADDRESS_FAST    0
+
+/**
+ * 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            0
+
+
+#endif /* CFG_LCD_H */
+

diff --git a/examples/lm3s1968/hw/hw_lcd.h b/examples/lm3s1968/hw/hw_lcd.h
index dd2d88d79d6bb45ec8a01ff4e3f7801f6d54b67b..4a6ceb9d163f48a63006c9162b1032c5a6d29494 100644 (file)
--- a/examples/lm3s1968/hw/hw_lcd.h
+++ b/examples/lm3s1968/hw/hw_lcd.h
@@ -40,6 +40,7 @@
 
 #include "cfg/macros.h"   /* BV() */
 #include "cfg/debug.h"
+#include "cfg/cfg_lcd.h" /* CONFIG_LCD_4BIT */
 
 #include <cpu/attr.h>
 #include <cpu/irq.h>
@@ -78,7 +79,7 @@
 #define LCD_WRITE(x)   lm3s_ssiWriteFrame(SSI0_BASE, x)
 
 /* Read data from the display */
-#define LCD_READ()                                     \
+#define LCD_READ                                       \
        ({                                              \
                uint32_t frame;                         \
                lm3s_ssiReadFrame(SSI0_BASE, &frame);   \