{
while (count--)
{
-#if !CONFIG_LCD_4BIT
LCD_WRITE(*buf++);
/* Dummy read to drain the FIFO */
(void)LCD_READ;
-#else
- LCD_WRITE_H(*buf);
- LCD_WRITE_L(*buf++);
- (void)LCD_READ_H;
- (void)LCD_READ_L;
-#endif
}
}
#define LCD_LM3S_H
#include <gfx/gfx.h> /* Bitmap */
-#include <hw/hw_lcd.h>
+#include "hw/hw_rit128x96.h"
#define LCD_WIDTH 128
#define LCD_HEIGHT 96
--- /dev/null
+/**
+ * \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 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief LM3S1986: OLED-RIT-128x96 (P14201) low-level hardware macros
+ *
+ * \author Andrea Righi <arighi@develer.com>
+ */
+
+#ifndef HW_RIT128x96_H
+#define HW_RIT128x96_H
+
+#include "cfg/macros.h" /* BV() */
+#include "cfg/debug.h"
+
+#include <cpu/attr.h>
+#include <cpu/irq.h>
+#include <cpu/types.h>
+
+/**
+ * \name LCD I/O pins/ports
+ * @{
+ */
+/* OLED Data/Command control pin */
+#define GPIO_OLEDDC_PIN 0 /* Implement me! */
+
+/* OLED enable pin */
+#define GPIO_OLEDEN_PIN 0 /* Implement me! */
+/*@}*/
+
+/**
+ * \name LCD bus control macros
+ * @{
+ */
+/* Enter command mode */
+#define LCD_SET_COMMAND() /* Implement me! */
+
+/* Enter data mode */
+#define LCD_SET_DATA() /* Implement me! */
+
+/* Send data to the display */
+#define LCD_WRITE(x) ((void)x)/* Implement me! */
+
+/* Read data from the display */
+#define LCD_READ (0 /* Implement me! */ )
+/*@}*/
+
+INLINE void lcd_bus_init(void)
+{
+ /* Implement me! */
+}
+
+#endif /* HW_RIT128x96_H */
+++ /dev/null
-/**
- * \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 2010 Develer S.r.l. (http://www.develer.com/)
- *
- * -->
- *
- * \brief LM3S1986: OLED-RIT-128x96 (P14201) low-level hardware macros
- *
- * \author Andrea Righi <arighi@develer.com>
- */
-
-#ifndef HW_LCD_H
-#define HW_LCD_H
-
-#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>
-#include <cpu/types.h>
-
-#include <drv/clock_lm3s.h>
-#include <drv/ssi_lm3s.h>
-#include <drv/gpio_lm3s.h>
-
-#include <drv/lcd_rit128x96.h>
-
-/**
- * \name LCD I/O pins/ports
- * @{
- */
-/* OLED Data/Command control pin */
-#define GPIO_OLEDDC_PIN BV(2)
-
-/* OLED enable pin */
-#define GPIO_OLEDEN_PIN BV(3)
-/*@}*/
-
-/**
- * \name LCD bus control macros
- * @{
- */
-/* Enter command mode */
-#define LCD_SET_COMMAND() \
- lm3s_gpioPinWrite(GPIO_PORTH_BASE, GPIO_OLEDDC_PIN, 0)
-
-/* Enter data mode */
-#define LCD_SET_DATA() \
- lm3s_gpioPinWrite(GPIO_PORTH_BASE, GPIO_OLEDDC_PIN, GPIO_OLEDDC_PIN)
-
-/* Send data to the display */
-#define LCD_WRITE(x) lm3s_ssiWriteFrame(SSI0_BASE, x)
-
-/* Read data from the display */
-#define LCD_READ \
- ({ \
- uint32_t frame; \
- lm3s_ssiReadFrame(SSI0_BASE, &frame); \
- frame; \
- })
-/*@}*/
-
-INLINE void lcd_bus_init(void)
-{
- cpu_flags_t flags;
- uint32_t dummy;
-
- IRQ_SAVE_DISABLE(flags);
-
- /* Enable the peripheral clock */
- SYSCTL_RCGC1_R |= SYSCTL_RCGC1_SSI0;
- SYSCTL_RCGC2_R |= SYSCTL_RCGC2_GPIOA;
- SYSCTL_RCGC2_R |= SYSCTL_RCGC2_GPIOH;
- lm3s_busyWait(512);
-
- /* Configure the SSI0CLK and SSIOTX pins for SSI operation. */
- lm3s_gpioPinConfig(GPIO_PORTA_BASE, BV(2) | BV(3) | BV(5),
- GPIO_DIR_MODE_HW, GPIO_STRENGTH_8MA, GPIO_PIN_TYPE_STD_WPU);
- /*
- * Configure the GPIO port pin used as a D/C# signal (data/command
- * control) for OLED device, and the port pin used to enable power to
- * the OLED panel.
- */
- lm3s_gpioPinConfig(GPIO_PORTH_BASE, GPIO_OLEDDC_PIN | GPIO_OLEDEN_PIN,
- GPIO_DIR_MODE_OUT, GPIO_STRENGTH_8MA, GPIO_PIN_TYPE_STD);
- lm3s_gpioPinWrite(GPIO_PORTH_BASE, GPIO_OLEDDC_PIN | GPIO_OLEDEN_PIN,
- GPIO_OLEDDC_PIN | GPIO_OLEDEN_PIN);
-
- /* Configure the SSI0 port for master mode */
- lm3s_ssiOpen(SSI0_BASE, SSI_FRF_MOTO_MODE_2,
- SSI_MODE_MASTER, CPU_FREQ / 2, 8);
- /*
- * Configure the GPIO port pin used as a D/Cn signal for OLED device,
- * and the port pin used to enable power to the OLED panel.
- */
- lm3s_gpioPinConfig(GPIO_PORTA_BASE, GPIO_OLEDEN_PIN,
- GPIO_DIR_MODE_HW, GPIO_STRENGTH_8MA, GPIO_PIN_TYPE_STD_WPU);
-
- /* Drain the SSI RX FIFO */
- while (lm3s_ssiReadFrameNonBlocking(SSI0_BASE, &dummy));
-
- IRQ_RESTORE(flags);
-}
-
-#endif /* HW_LCD_H */
--- /dev/null
+/**
+ * \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 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief LM3S1986: OLED-RIT-128x96 (P14201) low-level hardware macros
+ *
+ * \author Andrea Righi <arighi@develer.com>
+ */
+
+#ifndef HW_RIT128x96_H
+#define HW_RIT128x96_H
+
+#include "cfg/macros.h" /* BV() */
+#include "cfg/debug.h"
+
+#include <cpu/attr.h>
+#include <cpu/irq.h>
+#include <cpu/types.h>
+
+#include <drv/clock_lm3s.h>
+#include <drv/ssi_lm3s.h>
+#include <drv/gpio_lm3s.h>
+
+/**
+ * \name LCD I/O pins/ports
+ * @{
+ */
+/* OLED Data/Command control pin */
+#define GPIO_OLEDDC_PIN BV(2)
+
+/* OLED enable pin */
+#define GPIO_OLEDEN_PIN BV(3)
+/*@}*/
+
+/**
+ * \name LCD bus control macros
+ * @{
+ */
+/* Enter command mode */
+#define LCD_SET_COMMAND() \
+ lm3s_gpioPinWrite(GPIO_PORTH_BASE, GPIO_OLEDDC_PIN, 0)
+
+/* Enter data mode */
+#define LCD_SET_DATA() \
+ lm3s_gpioPinWrite(GPIO_PORTH_BASE, GPIO_OLEDDC_PIN, GPIO_OLEDDC_PIN)
+
+/* Send data to the display */
+#define LCD_WRITE(x) lm3s_ssiWriteFrame(SSI0_BASE, x)
+
+/* Read data from the display */
+#define LCD_READ \
+ ({ \
+ uint32_t frame; \
+ lm3s_ssiReadFrame(SSI0_BASE, &frame); \
+ frame; \
+ })
+/*@}*/
+
+INLINE void lcd_bus_init(void)
+{
+ cpu_flags_t flags;
+ uint32_t dummy;
+
+ IRQ_SAVE_DISABLE(flags);
+
+ /* Enable the peripheral clock */
+ SYSCTL_RCGC1_R |= SYSCTL_RCGC1_SSI0;
+ SYSCTL_RCGC2_R |= SYSCTL_RCGC2_GPIOA;
+ SYSCTL_RCGC2_R |= SYSCTL_RCGC2_GPIOH;
+ lm3s_busyWait(512);
+
+ /* Configure the SSI0CLK and SSIOTX pins for SSI operation. */
+ lm3s_gpioPinConfig(GPIO_PORTA_BASE, BV(2) | BV(3) | BV(5),
+ GPIO_DIR_MODE_HW, GPIO_STRENGTH_8MA, GPIO_PIN_TYPE_STD_WPU);
+ /*
+ * Configure the GPIO port pin used as a D/C# signal (data/command
+ * control) for OLED device, and the port pin used to enable power to
+ * the OLED panel.
+ */
+ lm3s_gpioPinConfig(GPIO_PORTH_BASE, GPIO_OLEDDC_PIN | GPIO_OLEDEN_PIN,
+ GPIO_DIR_MODE_OUT, GPIO_STRENGTH_8MA, GPIO_PIN_TYPE_STD);
+ lm3s_gpioPinWrite(GPIO_PORTH_BASE, GPIO_OLEDDC_PIN | GPIO_OLEDEN_PIN,
+ GPIO_OLEDDC_PIN | GPIO_OLEDEN_PIN);
+
+ /* Configure the SSI0 port for master mode */
+ lm3s_ssiOpen(SSI0_BASE, SSI_FRF_MOTO_MODE_2,
+ SSI_MODE_MASTER, CPU_FREQ / 2, 8);
+ /*
+ * Configure the GPIO port pin used as a D/Cn signal for OLED device,
+ * and the port pin used to enable power to the OLED panel.
+ */
+ lm3s_gpioPinConfig(GPIO_PORTA_BASE, GPIO_OLEDEN_PIN,
+ GPIO_DIR_MODE_HW, GPIO_STRENGTH_8MA, GPIO_PIN_TYPE_STD_WPU);
+
+ /* Drain the SSI RX FIFO */
+ while (lm3s_ssiReadFrameNonBlocking(SSI0_BASE, &dummy));
+
+ IRQ_RESTORE(flags);
+}
+
+#endif /* HW_RIT128x96_H */
#include <cpu/irq.h>
#include <drv/timer.h>
#include <drv/ser.h>
+#include <drv/lcd_rit128x96.h>
#include <gfx/gfx.h>
#include <gfx/font.h>
#include <gfx/text.h>
#include "cfg/compiler.h"
#include "cfg/cfg_gfx.h"
-#include "hw/hw_lcd.h"
+#include "hw/hw_rit128x96.h"
#define PROC_STACK_SIZE KERN_MINSTACKSIZE
projects / bertos.git / commitdiff