Switch from GPLv2 to GPLv2+

[fw/altos] / src / cc1111 / ao_lcd_port.c

diff --git a/src/cc1111/ao_lcd_port.c b/src/cc1111/ao_lcd_port.c
index 324cc3d39855a46956b0c8adcc5ddbf648f9b837..9b5880903589225998016b05e208f9990e5b9216 100644 (file)
--- a/src/cc1111/ao_lcd_port.c
+++ b/src/cc1111/ao_lcd_port.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
@@ -17,15 +18,24 @@
 
 #include "ao.h"
 
+static void
+ao_lcd_port_delay(void)
+{
+       uint8_t i;
+
+       for (i = 0; i < 100; i++)
+               ao_arch_nop();
+}
+
 void
 ao_lcd_port_put_nibble(uint8_t rs, uint8_t nibble)
 {
        P0 = (P0 & 0xf0) | (nibble & 0x0f);
        P1_1 = rs;
        P1_0 = 1;
-       ao_delay(1);
+       ao_lcd_port_delay();
        P1_0 = 0;
-       ao_delay(1);
+       ao_lcd_port_delay();
 }
 
 void