summaryrefslogtreecommitdiff
path: root/devel/pikdev/files/patch-pikdev_uparport.cc
blob: d5fa7704e62870b3528e72d8086fd91616c83af8 (plain) (blame)
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
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
--- src/uparport.cc	Sat Jun 24 13:21:15 2006
+++ src/uparport.cc	Sat Jun 24 14:31:29 2006
@@ -25,23 +25,23 @@
 struct parport::pintable parport::pin_table[26] =
     {
         { NA, NA ,0x00, &parport::errimg },		/* pin 0	Invalid pin #	*/
-        { PPRCONTROL, PPWCONTROL,0x01, &parport::controlimg }, /* pin 1	(out)	!strobe	*/
-        { PPRDATA, PPWDATA ,0x01, &parport::dataimg },/* pin 2	(out)	Data 0	*/
-        { PPRDATA, PPWDATA ,0x02, &parport::dataimg },/* pin 3	(out)	Data 1	*/
-        { PPRDATA, PPWDATA ,0x04, &parport::dataimg },/* pin 4	(out)	Data 2	*/
-        { PPRDATA, PPWDATA ,0x08, &parport::dataimg },/* pin 5	(out)	Data 3	*/
-        { PPRDATA, PPWDATA ,0x10, &parport::dataimg },/* pin 6	(out)	Data 4	*/
-        { PPRDATA, PPWDATA ,0x20, &parport::dataimg },/* pin 7	(out)	Data 5	*/
-        { PPRDATA, PPWDATA ,0x40, &parport::dataimg },/* pin 8	(out)	Data 6	*/
-        { PPRDATA, PPWDATA ,0x80, &parport::dataimg },/* pin 9	(out)	Data 7	*/
-        { PPRSTATUS, NA ,0x40, &parport::statusimg },/* pin 10	(in)	!ack	*/
-        { PPRSTATUS, NA ,0x80, &parport::statusimg },	/* pin 11	(in)	busy	*/
-        { PPRSTATUS, NA ,0x20, &parport::statusimg },	/* pin 12	(in)	Pout	*/
-        { PPRSTATUS, NA ,0x10, &parport::statusimg },	/* pin 13	(in)	Select	*/
-        { PPRCONTROL, PPWCONTROL,0x02, &parport::controlimg },/* pin 14	(out)	!feed	*/
-        { PPRSTATUS, NA ,0x08, &parport::statusimg },/* pin 15	(in)	!error	*/
-        { PPRCONTROL, PPWCONTROL,0x04, &parport::controlimg },/* pin 16	(out)	!init	*/
-        { PPRCONTROL, PPWCONTROL,0x08, &parport::controlimg },/* pin 17	(out)	!SI	*/
+        { PPIGCTRL, PPISCTRL ,0x01, &parport::controlimg }, /* pin 1	(out)	!strobe	*/
+        { PPIGDATA, PPISDATA ,0x01, &parport::dataimg },/* pin 2	(out)	Data 0	*/
+        { PPIGDATA, PPISDATA ,0x02, &parport::dataimg },/* pin 3	(out)	Data 1	*/
+        { PPIGDATA, PPISDATA ,0x04, &parport::dataimg },/* pin 4	(out)	Data 2	*/
+        { PPIGDATA, PPISDATA ,0x08, &parport::dataimg },/* pin 5	(out)	Data 3	*/
+        { PPIGDATA, PPISDATA ,0x10, &parport::dataimg },/* pin 6	(out)	Data 4	*/
+        { PPIGDATA, PPISDATA ,0x20, &parport::dataimg },/* pin 7	(out)	Data 5	*/
+        { PPIGDATA, PPISDATA ,0x40, &parport::dataimg },/* pin 8	(out)	Data 6	*/
+        { PPIGDATA, PPISDATA ,0x80, &parport::dataimg },/* pin 9	(out)	Data 7	*/
+        { PPIGSTATUS, NA ,0x40, &parport::statusimg },/* pin 10	(in)	!ack	*/
+        { PPIGSTATUS, NA ,0x80, &parport::statusimg },	/* pin 11	(in)	busy	*/
+        { PPIGSTATUS, NA ,0x20, &parport::statusimg },	/* pin 12	(in)	Pout	*/
+        { PPIGSTATUS, NA ,0x10, &parport::statusimg },	/* pin 13	(in)	Select	*/
+        { PPIGCTRL, PPISCTRL,0x02, &parport::controlimg },/* pin 14	(out)	!feed	*/
+        { PPIGSTATUS, NA ,0x08, &parport::statusimg },/* pin 15	(in)	!error	*/
+        { PPIGCTRL, PPISCTRL,0x04, &parport::controlimg },/* pin 16	(out)	!init	*/
+        { PPIGCTRL, PPISCTRL,0x08, &parport::controlimg },/* pin 17	(out)	!SI	*/
         { NA, NA , 0x00, &parport::errimg  },			/* pin 18	GND		*/
         { NA, NA , 0x00, &parport::errimg  },			/* pin 19	GND		*/
         { NA, NA , 0x00, &parport::errimg  },			/* pin 20	GND		*/
@@ -68,7 +68,6 @@
 int parport::yield()
 {
     if(fd == -1) return -1;
-    return ioctl(fd,PPYIELD) ;
 }
 
 // --------------------------------------------------------
@@ -83,22 +82,15 @@
 
     int k;
 
-    if( ((sscanf(np,"/dev/parport%d",&k) == 1) || (sscanf(np,"/dev/parports/%d",&k) == 1))
+    if( ((sscanf(np,"/dev/ppi%d",&k) == 1) || (sscanf(np,"/dev/ppi/%d",&k) == 1))
     		 && (k >= 0) && (k < 10))
     {
         // seems correct ..
         fd = open(np, O_RDWR) ;
 
-        if( fd != -1)
+        if( fd != 0)
         {
-            if( (k = ioctl(fd, PPCLAIM)) != 0)
-            {
-                char b[200] ;
-                sprintf(b,"parport::setport (%.150s must be rw enabled)", np);
-                perror(b) ;
-                ::close(fd) ;
-                fd = -1 ;
-            }
+		return ;
         }
         else
             perror("Cannot open parallel port") ;
@@ -110,7 +102,7 @@
 
 int parport::writedata(unsigned char x)
 {
-    int s =  ioctl(fd,PPWDATA,&x);
+    int s =  ioctl(fd,PPISDATA,&x);
     if( s )
         perror("parport::writedata") ;
     else
@@ -120,7 +112,7 @@
 
 int parport::readdata(unsigned char& x)
 {
-    int s =  ioctl(fd,PPRDATA,&x);
+    int s =  ioctl(fd,PPIGDATA,&x);
     if( s )
         perror( "parport::readdata")  ;
     else
@@ -131,7 +123,7 @@
 
 int parport::writecontrol(unsigned char x)
 {
-    int s =  ioctl(fd,PPWCONTROL,&x);
+    int s =  ioctl(fd, PPISCTRL,&x);
     if( s ) perror( "parport::writecontrol") ;
     else controlimg = x ;
     return s ;
@@ -139,7 +131,7 @@
 
 int parport::readcontrol(unsigned char& x)
 {
-    int s =  ioctl(fd,PPRCONTROL,&x);
+    int s =  ioctl(fd, PPIGCTRL,&x);
     if( s )
         perror("parport::readcontrol");
     else
@@ -160,7 +152,7 @@
 
 int parport::readstatus(unsigned char& x)
 {
-    int s =  ioctl(fd,PPRSTATUS,&x);
+    int s =  ioctl(fd,PPIGSTATUS,&x);
     if( s )
         perror("parport::readstatus") ;
     else
@@ -235,34 +227,18 @@
 	int fd = open(pname, O_RDWR) ;
 	if( fd == -1 ) return -2 ;
  
-	int k = ioctl(fd, PPCLAIM) ;
-
-	if( k != 0 )
-	{
-			::close(fd) ;
-			return  -1 ;
-	}
-
-  ioctl(fd,PPRELEASE) ;
-	
-  ::close(fd) ;
+	::close(fd) ;
 
 	return 0 ;
-
 }
 /** No descriptions */
 void parport::close()
 {
-		if( fd != -1)
-    {
-        int stat = ioctl(fd,PPRELEASE) ;
-        ::close(fd) ;
-        if( stat != 0)
-        {
-            perror("parport::~parport") ;
-        }
-    }
-    fd = -1 ;
+	if( fd != -1)
+    	{
+		::close(fd) ;
+	}
+	fd = -1 ;
 }
 bool parport::isok()
 {