projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add rotating hash init function.
[bertos.git]
/
drv
/
lcd_text.c
diff --git
a/drv/lcd_text.c
b/drv/lcd_text.c
index 0527e520696d2e542c825fab2f21b1d4e873d281..2dbd4132887963fadad5661b56ef3797687b227a 100755
(executable)
--- a/
drv/lcd_text.c
+++ b/
drv/lcd_text.c
@@
-1,4
+1,4
@@
-/*
!
+/*
*
* \file
* <!--
* Copyright 2005 Develer S.r.l. (http://www.develer.com/)
* \file
* <!--
* Copyright 2005 Develer S.r.l. (http://www.develer.com/)
@@
-14,6
+14,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.4 2006/09/20 20:02:43 marco
+ *#* Replaced ISLISTEMPTY with LIST_EMPTY
+ *#*
+ *#* Revision 1.3 2006/07/19 12:56:25 bernie
+ *#* Convert to new Doxygen style.
+ *#*
*#* Revision 1.2 2006/02/24 00:27:14 bernie
*#* Use new naming convention for list macros.
*#*
*#* Revision 1.2 2006/02/24 00:27:14 bernie
*#* Use new naming convention for list macros.
*#*
@@
-46,17
+52,18
@@
#include "lcd_hd44.h"
#include <drv/timer.h> // timer_delay()
#include <mware/formatwr.h> // _formatted_write()
#include "lcd_hd44.h"
#include <drv/timer.h> // timer_delay()
#include <mware/formatwr.h> // _formatted_write()
+#include <mware/list.h> // LIST_EMPTY()
#include <cfg/macros.h> // BV()
#include <cfg/debug.h>
#include <string.h> // strlen()
#include <cfg/macros.h> // BV()
#include <cfg/debug.h>
#include <string.h> // strlen()
-/*
!
Maximum number of layers. */
+/*
*
Maximum number of layers. */
#define LCD_LAYERS 6
#if CONFIG_KERNEL
#define LCD_LAYERS 6
#if CONFIG_KERNEL
- /*
!
Semaphore to arbitrate access to the display. */
+ /*
*
Semaphore to arbitrate access to the display. */
static struct Semaphore lcd_semaphore;
#define LOCK_LCD sem_obtain(&lcd_semaphore)
#define UNLOCK_LCD sem_release(&lcd_semaphore)
static struct Semaphore lcd_semaphore;
#define LOCK_LCD sem_obtain(&lcd_semaphore)
#define UNLOCK_LCD sem_release(&lcd_semaphore)
@@
-72,14
+79,14
@@
static Layer lcd_LayersPool[LCD_LAYERS];
static LIST_TYPE(Layer) lcd_Layers;
static LIST_TYPE(Layer) lcd_FreeLayers;
static LIST_TYPE(Layer) lcd_Layers;
static LIST_TYPE(Layer) lcd_FreeLayers;
-/*
!
+/*
*
* Current cursor status.
*
* One of LCD_CMD_CURSOR_OFF, LCD_CMD_CURSOR_BLOCK or LCD_CMD_CURSOR_LINE.
*/
static uint8_t lcd_CursorStatus;
* Current cursor status.
*
* One of LCD_CMD_CURSOR_OFF, LCD_CMD_CURSOR_BLOCK or LCD_CMD_CURSOR_LINE.
*/
static uint8_t lcd_CursorStatus;
-/*
!
Current cursor position, encoded as a Cursor position and status. */
+/*
*
Current cursor position, encoded as a Cursor position and status. */
static lcdpos_t lcd_CursorAddr;
static lcdpos_t lcd_CursorAddr;
@@
-108,7
+115,7
@@
void lcd_unlock(void)
#endif /* CONFIG_KERNEL */
#endif /* CONFIG_KERNEL */
-/*
!
+/*
*
* Write one character to the display at the current
* cursor prosition, then move the cursor right. The
* cursor is wrapped to the next line when it moves
* Write one character to the display at the current
* cursor prosition, then move the cursor right. The
* cursor is wrapped to the next line when it moves
@@
-280,7
+287,7
@@
int lcd_printf(Layer *layer, lcdpos_t addr, uint8_t mode, const char *format, ..
}
}
-/*
!
+/*
*
* Internal function to move a layer between two positions.
*
* \note The layer must be *already* enqueued in some list.
* Internal function to move a layer between two positions.
*
* \note The layer must be *already* enqueued in some list.
@@
-313,7
+320,7
@@
Layer *lcd_newLayer(char pri)
LOCK_LCD;
LOCK_LCD;
- if (
ISLIST
EMPTY(&lcd_FreeLayers))
+ if (
LIST_
EMPTY(&lcd_FreeLayers))
{
UNLOCK_LCD;
//ASSERT(false);
{
UNLOCK_LCD;
//ASSERT(false);
@@
-330,7
+337,7
@@
Layer *lcd_newLayer(char pri)
return layer;
}
return layer;
}
-/*
!
+/*
*
* Redraw the display (internal).
*
* \note The display must be already locked.
* Redraw the display (internal).
*
* \note The display must be already locked.
@@
-363,7
+370,7
@@
static void lcd_refresh(void)
}
}
}
}
-/*
!
+/*
*
* Rearrange layer depth and refresh display accordingly.
*
* \note Setting a priority of LAYER_HIDDEN makes the layer invisible.
* Rearrange layer depth and refresh display accordingly.
*
* \note Setting a priority of LAYER_HIDDEN makes the layer invisible.