Update of /cvsroot/blob/blob/include/blob
In directory usw-pr-cvs1:/tmp/cvs-serv6782/include/blob
Modified Files:
Makefile.am lcd.h sa1111.h
Log Message:
make it compile on all platforms with --enable-all-features enabled
lcd_test() can be a static function
Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am 2001/10/09 17:50:27 1.7
+++ Makefile.am 2001/10/09 19:24:54 1.8
@@ -28,6 +28,7 @@
param_block.h \
reboot.h \
sa1100.h \
+ sa1111.h \
serial.h \
terminal.h \
time.h \
@@ -36,4 +37,4 @@
uucodec.h
-CLEANFILES = *~
+CLEANFILES = ${srcdir}/*~
Index: lcd.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/lcd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lcd.h 2001/10/09 18:15:07 1.2
+++ lcd.h 2001/10/09 19:24:54 1.3
@@ -22,8 +22,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef INC_LCD_H
-#define INC_LCD_H 1
+#ifndef BLOB_LCD_H
+#define BLOB_LCD_H
#if defined(CONFIG_LCD_SUPPORT)
@@ -45,9 +45,11 @@
# define LCD_VIDEORAM_DMA_ADR (LCD_PALETTE_DMA_ADR + LCD_PALETTE_SIZE + LCD_VIDEORAM_OFFSET)
#else
-# error "define lcd register values for your platform"
+# error "Cowardly refusing to break your LCD, please supply correct LCD parameters."
#endif
+#endif
+
int lcd_power_up( void );
int lcd_power_down( void );
@@ -63,9 +65,5 @@
int lcd_contrast( int );
int lcd_brightness( int );
-
-int lcd_test( void );
-
-#endif
#endif
Index: sa1111.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/sa1111.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sa1111.h 2001/10/09 18:11:00 1.1
+++ sa1111.h 2001/10/09 19:24:54 1.2
@@ -1,7 +1,9 @@
/*
* sa1111.h: wrapper file to include asm/arch-sa1100/SA-1111.h
*
- * Copyright (C) 2001 Erik Mouw (J.A...@it...)
+ * Copyright (C) 2001 Stefan Eletzhofer <ste...@ww...>
+ *
+ * $Id$
*
* 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
|