Switch from GPLv2 to GPLv2+

[fw/altos] / src / drivers / ao_lcd.c

diff --git a/src/drivers/ao_lcd.c b/src/drivers/ao_lcd.c
index e62247aecacbcf4c69ccceecaed922de8872f467..c35093bced0fa909c1d1b3d690a778cc61358145 100644 (file)
--- a/src/drivers/ao_lcd.c
+++ b/src/drivers/ao_lcd.c
@@ -3,7 +3,8 @@
  *
  * This program 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; version 2 of the License.
+ * 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
@@ -19,6 +20,8 @@
 
 static uint16_t        ao_lcd_time = 3;
 
+static __xdata uint8_t ao_lcd_mutex;
+
 static void
 ao_lcd_delay(void)
 {
@@ -39,7 +42,7 @@ ao_lcd_send_ins(uint8_t ins)
        ao_lcd_port_put_nibble(0, ins & 0xf);
 }
 
-void
+static void
 ao_lcd_put_byte(uint8_t c)
 {
 //     printf ("send data %02x\n", c);
@@ -54,8 +57,10 @@ ao_lcd_putstring(char *string)
 {
        char    c;
 
+       ao_mutex_get(&ao_lcd_mutex);
        while ((c = (uint8_t) *string++))
                ao_lcd_put_byte((uint8_t) c);
+       ao_mutex_put(&ao_lcd_mutex);
 }
 
 #define AO_LCD_POWER_CONTROL   0x54
@@ -63,24 +68,46 @@ ao_lcd_putstring(char *string)
 void
 ao_lcd_contrast_set(uint8_t contrast)
 {
+       ao_mutex_get(&ao_lcd_mutex);
        ao_lcd_send_ins(AO_LCD_POWER_CONTROL | ((contrast >> 4) & 0x3));
        ao_lcd_send_ins(0x70 | (contrast & 0xf));
+       ao_mutex_put(&ao_lcd_mutex);
+}
+
+void
+ao_lcd_cursor_on(void)
+{
+       ao_mutex_get(&ao_lcd_mutex);
+       ao_lcd_send_ins(0x08 | 0x04 | 0x02 | 0x01);
+       ao_mutex_put(&ao_lcd_mutex);
+}
+
+void
+ao_lcd_cursor_off(void)
+{
+       ao_mutex_get(&ao_lcd_mutex);
+       ao_lcd_send_ins(0x08 | 0x04);
+       ao_mutex_put(&ao_lcd_mutex);
 }
 
 void
 ao_lcd_clear(void)
 {
+       ao_mutex_get(&ao_lcd_mutex);
        ao_lcd_send_ins(0x01);
        ao_delay(1);
        /* Entry mode */
        ao_lcd_send_ins(0x04 | 0x02);
+       ao_mutex_put(&ao_lcd_mutex);
 }
 
 void
 ao_lcd_goto(uint8_t addr)
 {
+       ao_mutex_get(&ao_lcd_mutex);
        ao_lcd_send_ins(0x80 | addr);
        ao_lcd_send_ins(0x04 | 0x02);
+       ao_mutex_put(&ao_lcd_mutex);
 }
 
 void
@@ -117,79 +144,8 @@ ao_lcd_start(void)
        ao_lcd_clear();
 }
 
-void
-ao_lcd_contrast(void)
-{
-       ao_cmd_hex();
-       if (ao_cmd_status == ao_cmd_success) {
-               printf("setting contrast to %02x\n", ao_cmd_lex_i);
-               ao_lcd_contrast_set(ao_cmd_lex_i & 0x3f);
-       }
-}
-
-static uint8_t
-ao_cmd_hex_nibble(void)
-{
-       if ('0' <= ao_cmd_lex_c && ao_cmd_lex_c <= '9')
-               return ao_cmd_lex_c - '0';
-       if ('a' <= ao_cmd_lex_c && ao_cmd_lex_c <= 'f')
-               return ao_cmd_lex_c - ('a' - 10);
-       if ('A' <= ao_cmd_lex_c && ao_cmd_lex_c <= 'F')
-               return ao_cmd_lex_c - ('A' - 10);
-       ao_cmd_status = ao_cmd_syntax_error;
-       return 0;
-}
-
-void
-ao_lcd_string(void)
-{
-       uint8_t col = 0;
-       char    c;
-
-       ao_cmd_decimal();
-       if (ao_cmd_status != ao_cmd_success)
-               return;
-       ao_lcd_send_ins(0x80 | (ao_cmd_lex_i ? 0x40 : 0x00));
-       ao_cmd_white();
-       while (ao_cmd_lex_c != '\n') {
-               c = ao_cmd_lex_c;
-               if (c == '\\') {
-                       ao_cmd_lex();
-                       c = ao_cmd_hex_nibble() << 4;
-                       ao_cmd_lex();
-                       c |= ao_cmd_hex_nibble();
-               }
-               ao_lcd_put_byte(c);
-               ao_cmd_lex();
-               col++;
-       }
-       while (col < 16) {
-               ao_lcd_put_byte(' ');
-               col++;
-       }
-}
-
-void
-ao_lcd_delay_set(void)
-{
-       ao_cmd_decimal();
-       if (ao_cmd_status == ao_cmd_success) {
-               printf("setting LCD delay to %d\n", ao_cmd_lex_i);
-               ao_lcd_time = ao_cmd_lex_i;
-       }
-}
-
-__code struct ao_cmds ao_lcd_cmds[] = {
-       { ao_lcd_start, "S\0Start LCD" },
-       { ao_lcd_contrast, "C <contrast>\0Set LCD contrast" },
-       { ao_lcd_string, "s <line> <string>\0Send string to LCD" },
-       { ao_lcd_delay_set, "t <delay>\0Set LCD delay" },
-       { 0, NULL },
-};
-
 void
 ao_lcd_init(void)
 {
        ao_lcd_port_init();
-       ao_cmd_register(&ao_lcd_cmds[0]);
 }