1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
GCC4 fixes, see bug #147388.
Patch from upstream SVN
--- /trunk/drv_SimpleLCD.c (revision 547)
+++ /trunk/drv_SimpleLCD.c (revision 581)
@@ -1,3 +1,3 @@
-/* $Id: drv_SimpleLCD.c,v 1.4 2005/05/08 04:32:44 reinelt Exp $
+/* $Id: drv_SimpleLCD.c,v 1.5 2005/07/06 04:40:18 reinelt Exp $
*
* driver for a simple serial terminal.
@@ -23,4 +23,7 @@
*
* $Log: drv_SimpleLCD.c,v $
+ * Revision 1.5 2005/07/06 04:40:18 reinelt
+ * GCC-4 fixes
+ *
* Revision 1.4 2005/05/08 04:32:44 reinelt
* CodingStyle added and applied
@@ -199,4 +202,5 @@
{
int rows = -1, cols = -1;
+ int value;
unsigned int flags = 0;
char *s;
@@ -210,7 +214,8 @@
}
- cfg_number(section, "BarCharValue", 0, 0, 255, &flags);
- bar_char = flags;
- cfg_number(section, "Options", 0, 0, 0xffff, &flags);
+ cfg_number(section, "BarCharValue", 0, 0, 255, &value);
+ bar_char = value;
+ cfg_number(section, "Options", 0, 0, 0xffff, &value);
+ flags = value;
if (drv_generic_serial_open(section, Name, flags) < 0)
return -1;
Index: /trunk/lcd4linux_i2c.h
===================================================================
--- /trunk/lcd4linux_i2c.h (revision 562)
+++ /trunk/lcd4linux_i2c.h (revision 581)
@@ -1,3 +1,3 @@
-/* $Id: lcd4linux_i2c.h,v 1.2 2005/06/01 12:09:13 reinelt Exp $
+/* $Id: lcd4linux_i2c.h,v 1.3 2005/07/06 04:40:18 reinelt Exp $
*
* user space i2c sturctures and defines, taken from the official kernel i2c
@@ -33,4 +33,7 @@
*
* $Log: lcd4linux_i2c.h,v $
+ * Revision 1.3 2005/07/06 04:40:18 reinelt
+ * GCC-4 fixes
+ *
* Revision 1.2 2005/06/01 12:09:13 reinelt
* removed ^M from lcd4linux_i2c.h; indent.sh run
@@ -79,5 +82,5 @@
/* Transfer num messages.
*/
-extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num);
+extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num);
/*
|
GitWeb
