author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Wed, 29 Aug 2012 11:05:56 -0700 | |
changeset 957 | 255465c5756f |
parent 165 | 111c46cade93 |
child 1276 | dc3977b83042 |
permissions | -rw-r--r-- |
165
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1 |
--- hplip-3.10.9-orig/scan/sane/scl.c Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
2 |
+++ hplip-3.10.9/scan/sane/scl.c Fri Sep 4 01:06:47 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
3 |
@@ -160,7 +160,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
4 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
5 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
6 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
7 |
-SANE_Status __attribute__ ((visibility ("hidden"))) SclSendCommand(int deviceid, int channelid, int cmd, int param) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
8 |
+SANE_Status SclSendCommand(int deviceid, int channelid, int cmd, int param) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
9 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
10 |
char buffer[LEN_SCL_BUFFER]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
11 |
int datalen, len; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
12 |
@@ -208,7 +208,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
13 |
return SANE_STATUS_GOOD; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
14 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
15 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
16 |
-SANE_Status __attribute__ ((visibility ("hidden"))) SclInquire(int deviceid, int channelid, int cmd, int param, int * pValue, char * buffer, int maxlen) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
17 |
+SANE_Status SclInquire(int deviceid, int channelid, int cmd, int param, int * pValue, char * buffer, int maxlen) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
18 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
19 |
SANE_Status retcode; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
20 |
int lenResponse, len, value; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
21 |
@@ -318,7 +318,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
22 |
* Phase 2 partial rewrite. des 9/26/07 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
23 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
24 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
25 |
-SANE_Status __attribute__ ((visibility ("hidden"))) scl_send_cmd(HPAIO_RECORD *hpaio, const char *buf, int size) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
26 |
+SANE_Status scl_send_cmd(HPAIO_RECORD *hpaio, const char *buf, int size) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
27 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
28 |
int len; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
29 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
30 |
@@ -336,7 +336,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
31 |
return SANE_STATUS_GOOD; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
32 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
33 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
34 |
-SANE_Status __attribute__ ((visibility ("hidden"))) scl_query_int(HPAIO_RECORD *hpaio, const char *buf, int size, int *result) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
35 |
+SANE_Status scl_query_int(HPAIO_RECORD *hpaio, const char *buf, int size, int *result) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
36 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
37 |
char rbuf[256]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
38 |
int len, stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
39 |
--- hplip-3.10.9-orig/scan/sane/xml.c Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
40 |
+++ hplip-3.10.9/scan/sane/xml.c Fri Sep 4 01:07:00 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
41 |
@@ -32,7 +32,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
42 |
#include <string.h> |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
43 |
#include <stdlib.h> |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
44 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
45 |
-int __attribute__ ((visibility ("hidden"))) get_array_size(const char *tag) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
46 |
+int get_array_size(const char *tag) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
47 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
48 |
char *p, *tail; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
49 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
50 |
@@ -43,7 +43,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
51 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
52 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
53 |
/* Get xml element from the buffer. The returned element is zero terminated. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
54 |
-int __attribute__ ((visibility ("hidden"))) get_element(const char *buf, int buf_size, char *element, int element_size, char **tail) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
55 |
+int get_element(const char *buf, int buf_size, char *element, int element_size, char **tail) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
56 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
57 |
int i, j; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
58 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
59 |
@@ -61,7 +61,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
60 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
61 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
62 |
/* Get next xml tag from the buffer. The returned xml tag is zero terminated. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
63 |
-int __attribute__ ((visibility ("hidden"))) get_tag(const char *buf, int buf_size, char *tag, int tag_size, char **tail) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
64 |
+int get_tag(const char *buf, int buf_size, char *tag, int tag_size, char **tail) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
65 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
66 |
int i=0, j=0, dd=0, lf=0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
67 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
68 |
--- hplip-3.10.9-orig/scan/sane/mfpdtf.h Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
69 |
+++ hplip-3.10.9/scan/sane/mfpdtf.h Fri Sep 4 01:05:54 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
70 |
@@ -243,18 +243,18 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
71 |
} __attribute__(( packed) ) array; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
72 |
} __attribute__(( packed) ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
73 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
74 |
-Mfpdtf_t __attribute__ ((visibility ("hidden"))) MfpdtfAllocate(int deviceid, int channelid); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
75 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfDeallocate(Mfpdtf_t mfpdtf); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
76 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfSetChannel(Mfpdtf_t mfpdtf, int channelid); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
77 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfLogToFile(Mfpdtf_t mfpdtf, char * filename); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
78 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetSimulateImageHeaders(Mfpdtf_t mfpdtf); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
79 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadSetSimulateImageHeaders(Mfpdtf_t mfpdtf, int simulateImageHeaders); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
80 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadStart(Mfpdtf_t mfpdtf); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
81 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadService(Mfpdtf_t mfpdtf); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
82 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetLastServiceResult(Mfpdtf_t mfpdtf); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
83 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetVariantHeader(Mfpdtf_t mfpdtf, union MfpdtfVariantHeader_u * buffer, int maxlen); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
84 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetStartPageRecord(Mfpdtf_t mfpdtf, struct MfpdtfImageStartPageRecord_s * buffer, int maxlen); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
85 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadInnerBlock(Mfpdtf_t mfpdtf, unsigned char * buffer, int countdown); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
86 |
+Mfpdtf_t MfpdtfAllocate(int deviceid, int channelid); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
87 |
+int MfpdtfDeallocate(Mfpdtf_t mfpdtf); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
88 |
+int MfpdtfSetChannel(Mfpdtf_t mfpdtf, int channelid); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
89 |
+int MfpdtfLogToFile(Mfpdtf_t mfpdtf, char * filename); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
90 |
+int MfpdtfReadGetSimulateImageHeaders(Mfpdtf_t mfpdtf); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
91 |
+int MfpdtfReadSetSimulateImageHeaders(Mfpdtf_t mfpdtf, int simulateImageHeaders); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
92 |
+int MfpdtfReadStart(Mfpdtf_t mfpdtf); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
93 |
+int MfpdtfReadService(Mfpdtf_t mfpdtf); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
94 |
+int MfpdtfReadGetLastServiceResult(Mfpdtf_t mfpdtf); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
95 |
+int MfpdtfReadGetVariantHeader(Mfpdtf_t mfpdtf, union MfpdtfVariantHeader_u * buffer, int maxlen); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
96 |
+int MfpdtfReadGetStartPageRecord(Mfpdtf_t mfpdtf, struct MfpdtfImageStartPageRecord_s * buffer, int maxlen); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
97 |
+int MfpdtfReadInnerBlock(Mfpdtf_t mfpdtf, unsigned char * buffer, int countdown); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
98 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
99 |
/* |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
100 |
* Phase 2 rewrite. des |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
101 |
@@ -337,6 +337,6 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
102 |
#endif // #if defined(WORDS_BIGENDIAN) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
103 |
#endif // #if !defined(htole16) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
104 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
105 |
-int __attribute__ ((visibility ("hidden"))) read_mfpdtf_block(int device, int channel, char *buf, int bufSize, int timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
106 |
+int read_mfpdtf_block(int device, int channel, char *buf, int bufSize, int timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
107 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
108 |
#endif // _MFPDTF_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
109 |
--- hplip-3.10.9-orig/scan/sane/io.c Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
110 |
+++ hplip-3.10.9/scan/sane/io.c Fri Sep 4 01:04:50 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
111 |
@@ -43,7 +43,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
112 |
DBusError dbus_err; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
113 |
DBusConnection * dbus_conn; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
114 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
115 |
-int __attribute__ ((visibility ("hidden"))) InitDbus(void) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
116 |
+int InitDbus(void) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
117 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
118 |
dbus_error_init(&dbus_err); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
119 |
dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &dbus_err); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
120 |
@@ -62,7 +62,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
121 |
return 1; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
122 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
123 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
124 |
-int __attribute__ ((visibility ("hidden"))) SendScanEvent(char *device_uri, int event) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
125 |
+int SendScanEvent(char *device_uri, int event) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
126 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
127 |
DBusMessage * msg = dbus_message_new_signal(DBUS_PATH, DBUS_INTERFACE, "Event"); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
128 |
char * printer = ""; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
129 |
@@ -104,11 +104,11 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
130 |
return 1; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
131 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
132 |
#else |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
133 |
-int __attribute__ ((visibility ("hidden"))) InitDbus(void) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
134 |
+int InitDbus(void) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
135 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
136 |
return 1; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
137 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
138 |
-int __attribute__ ((visibility ("hidden"))) SendScanEvent(char *device_uri, int event) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
139 |
+int SendScanEvent(char *device_uri, int event) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
140 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
141 |
return 1; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
142 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
143 |
@@ -115,7 +115,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
144 |
#endif /* HAVE_DBUS */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
145 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
146 |
/* Read full requested data length in BUFFER_SIZE chunks. Return number of bytes read. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
147 |
-int __attribute__ ((visibility ("hidden"))) ReadChannelEx(int deviceid, int channelid, unsigned char * buffer, int length, int timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
148 |
+int ReadChannelEx(int deviceid, int channelid, unsigned char * buffer, int length, int timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
149 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
150 |
int n, len, size, total=0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
151 |
enum HPMUD_RESULT stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
152 |
--- hplip-3.10.9-orig/scan/sane/common.c Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
153 |
+++ hplip-3.10.9/scan/sane/common.c Fri Sep 4 01:04:05 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
154 |
@@ -35,7 +35,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
155 |
#define DEBUG_NOT_STATIC |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
156 |
#include "sanei_debug.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
157 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
158 |
-int __attribute__ ((visibility ("hidden"))) bug(const char *fmt, ...) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
159 |
+int bug(const char *fmt, ...) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
160 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
161 |
char buf[256]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
162 |
va_list args; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
163 |
@@ -50,7 +50,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
164 |
return n; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
165 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
166 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
167 |
-void __attribute__ ((visibility ("hidden"))) sysdump(const void *data, int size) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
168 |
+void sysdump(const void *data, int size) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
169 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
170 |
/* Dump size bytes of *data. Output looks like: |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
171 |
* [0000] 75 6E 6B 6E 6F 77 6E 20 30 FF 00 00 00 00 39 00 unknown 0.....9. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
172 |
@@ -97,7 +97,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
173 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
174 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
175 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
176 |
-void __attribute__ ((visibility ("hidden"))) bugdump(const void *data, int size) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
177 |
+void bugdump(const void *data, int size) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
178 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
179 |
/* Dump size bytes of *data. Output looks like: |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
180 |
* [0000] 75 6E 6B 6E 6F 77 6E 20 30 FF 00 00 00 00 39 00 unknown 0.....9. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
181 |
@@ -144,7 +144,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
182 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
183 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
184 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
185 |
-char __attribute__ ((visibility ("hidden"))) *psnprintf(char *buf, int bufSize, const char *fmt, ...) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
186 |
+char *psnprintf(char *buf, int bufSize, const char *fmt, ...) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
187 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
188 |
va_list args; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
189 |
int n; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
190 |
@@ -159,7 +159,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
191 |
return buf; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
192 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
193 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
194 |
-unsigned long __attribute__ ((visibility ("hidden"))) DivideAndShift( int line, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
195 |
+unsigned long DivideAndShift( int line, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
196 |
unsigned long numerator1, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
197 |
unsigned long numerator2, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
198 |
unsigned long denominator, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
199 |
@@ -182,12 +182,12 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
200 |
return result; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
201 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
202 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
203 |
-void __attribute__ ((visibility ("hidden"))) NumListClear( int * list ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
204 |
+void NumListClear( int * list ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
205 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
206 |
memset( list, 0, sizeof( int ) * MAX_LIST_SIZE ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
207 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
208 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
209 |
-int __attribute__ ((visibility ("hidden"))) NumListIsInList( int * list, int n ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
210 |
+int NumListIsInList( int * list, int n ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
211 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
212 |
int i; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
213 |
for( i = 1; i < MAX_LIST_SIZE; i++ ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
214 |
@@ -200,7 +200,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
215 |
return 0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
216 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
217 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
218 |
-int __attribute__ ((visibility ("hidden"))) NumListAdd( int * list, int n ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
219 |
+int NumListAdd( int * list, int n ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
220 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
221 |
if( NumListIsInList( list, n ) ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
222 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
223 |
@@ -215,12 +215,12 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
224 |
return 1; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
225 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
226 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
227 |
-int __attribute__ ((visibility ("hidden"))) NumListGetCount( int * list ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
228 |
+int NumListGetCount( int * list ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
229 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
230 |
return list[0]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
231 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
232 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
233 |
-int __attribute__ ((visibility ("hidden"))) NumListGetFirst( int * list ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
234 |
+int NumListGetFirst( int * list ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
235 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
236 |
int n = list[0]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
237 |
if( n > 0 ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
238 |
@@ -230,12 +230,12 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
239 |
return n; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
240 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
241 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
242 |
-void __attribute__ ((visibility ("hidden"))) StrListClear( const char ** list ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
243 |
+void StrListClear( const char ** list ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
244 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
245 |
memset( list, 0, sizeof( char * ) * MAX_LIST_SIZE ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
246 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
247 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
248 |
-int __attribute__ ((visibility ("hidden"))) StrListIsInList( const char ** list, char * s ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
249 |
+int StrListIsInList( const char ** list, char * s ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
250 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
251 |
while( *list ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
252 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
253 |
@@ -248,7 +248,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
254 |
return 0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
255 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
256 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
257 |
-int __attribute__ ((visibility ("hidden"))) StrListAdd( const char ** list, char * s ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
258 |
+int StrListAdd( const char ** list, char * s ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
259 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
260 |
int i; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
261 |
for( i = 0; i < MAX_LIST_SIZE - 1; i++ ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
262 |
--- hplip-3.10.9-orig/scan/sane/pml.c Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
263 |
+++ hplip-3.10.9/scan/sane/pml.c Fri Sep 4 01:06:11 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
264 |
@@ -36,7 +36,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
265 |
#define DEBUG_DECLARE_ONLY |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
266 |
#include "sanei_debug.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
267 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
268 |
-int __attribute__ ((visibility ("hidden"))) PmlSetID( PmlObject_t obj, char * oid ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
269 |
+int PmlSetID( PmlObject_t obj, char * oid ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
270 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
271 |
int len = 0; /* TODO: Do we need this parameter? */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
272 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
273 |
@@ -137,12 +137,12 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
274 |
return r; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
275 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
276 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
277 |
-int __attribute__ ((visibility ("hidden"))) PmlSetValue( PmlObject_t obj, int type, char * value, int len ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
278 |
+int PmlSetValue( PmlObject_t obj, int type, char * value, int len ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
279 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
280 |
return PmlSetPrefixValue( obj, type, 0, 0, value, len ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
281 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
282 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
283 |
-int __attribute__ ((visibility ("hidden"))) PmlSetIntegerValue( PmlObject_t obj, int type, int value ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
284 |
+int PmlSetIntegerValue( PmlObject_t obj, int type, int value ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
285 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
286 |
char buffer[sizeof( int )]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
287 |
int len = sizeof( int ), i = len - 1; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
288 |
@@ -217,12 +217,12 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
289 |
return len; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
290 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
291 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
292 |
-int __attribute__ ((visibility ("hidden"))) PmlGetValue(PmlObject_t obj, int *pType, char *buffer, int maxlen) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
293 |
+int PmlGetValue(PmlObject_t obj, int *pType, char *buffer, int maxlen) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
294 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
295 |
return PmlGetPrefixValue( obj, pType, 0, 0, buffer, maxlen ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
296 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
297 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
298 |
-int __attribute__ ((visibility ("hidden"))) PmlGetStringValue( PmlObject_t obj, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
299 |
+int PmlGetStringValue( PmlObject_t obj, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
300 |
int * pSymbolSet, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
301 |
char * buffer, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
302 |
int maxlen ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
303 |
@@ -248,7 +248,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
304 |
return len; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
305 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
306 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
307 |
-int __attribute__ ((visibility ("hidden"))) PmlGetIntegerValue( PmlObject_t obj, int * pType, int * pValue ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
308 |
+int PmlGetIntegerValue( PmlObject_t obj, int * pType, int * pValue ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
309 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
310 |
int type; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
311 |
unsigned char svalue[sizeof( int )]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
312 |
@@ -289,7 +289,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
313 |
return obj->status; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
314 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
315 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
316 |
-int __attribute__ ((visibility ("hidden"))) PmlRequestSet( int deviceid, int channelid, PmlObject_t obj ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
317 |
+int PmlRequestSet( int deviceid, int channelid, PmlObject_t obj ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
318 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
319 |
unsigned char data[PML_MAX_DATALEN]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
320 |
int datalen=0, status=ERROR, type, result, pml_result; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
321 |
@@ -308,7 +308,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
322 |
return status; /* OK = valid I/O result */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
323 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
324 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
325 |
-int __attribute__ ((visibility ("hidden"))) PmlRequestSetRetry( int deviceid, int channelid, PmlObject_t obj, int count, int delay ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
326 |
+int PmlRequestSetRetry( int deviceid, int channelid, PmlObject_t obj, int count, int delay ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
327 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
328 |
int stat=ERROR, r; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
329 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
330 |
@@ -346,7 +346,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
331 |
return stat; /* OK = valid I/O result AND PML result */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
332 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
333 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
334 |
-int __attribute__ ((visibility ("hidden"))) PmlRequestGet( int deviceid, int channelid, PmlObject_t obj ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
335 |
+int PmlRequestGet( int deviceid, int channelid, PmlObject_t obj ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
336 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
337 |
unsigned char data[PML_MAX_DATALEN]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
338 |
int datalen=0, stat=ERROR, type, pml_result; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
339 |
@@ -603,7 +603,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
340 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
341 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
342 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
343 |
-int __attribute__ ((visibility ("hidden"))) pml_start(HPAIO_RECORD *hpaio) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
344 |
+int pml_start(HPAIO_RECORD *hpaio) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
345 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
346 |
MFPDTF_FIXED_HEADER *ph; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
347 |
MFPDTF_START_PAGE *ps; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
348 |
@@ -888,7 +888,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
349 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
350 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
351 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
352 |
-int __attribute__ ((visibility ("hidden"))) pml_read(HPAIO_RECORD *hpaio, SANE_Byte *data, SANE_Int maxLength, SANE_Int *pLength) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
353 |
+int pml_read(HPAIO_RECORD *hpaio, SANE_Byte *data, SANE_Int maxLength, SANE_Int *pLength) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
354 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
355 |
MFPDTF_RASTER *pd; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
356 |
int stat=SANE_STATUS_IO_ERROR; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
357 |
@@ -1018,7 +1018,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
358 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
359 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
360 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
361 |
-int __attribute__ ((visibility ("hidden"))) pml_cancel(HPAIO_RECORD *hpaio) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
362 |
+int pml_cancel(HPAIO_RECORD *hpaio) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
363 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
364 |
int oldStuff = (hpaio->preDenali || hpaio->fromDenali || hpaio->denali) ? 1 : 0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
365 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
366 |
--- hplip-3.10.9-orig/scan/sane/hpaio.c Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
367 |
+++ hplip-3.10.9/scan/sane/hpaio.c Fri Sep 4 01:04:29 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
368 |
@@ -324,7 +324,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
369 |
return NULL; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
370 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
371 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
372 |
-SANE_Status __attribute__ ((visibility ("hidden"))) hpaioScannerToSaneError( hpaioScanner_t hpaio ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
373 |
+SANE_Status hpaioScannerToSaneError( hpaioScanner_t hpaio ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
374 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
375 |
SANE_Status retcode; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
376 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
377 |
@@ -438,7 +438,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
378 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
379 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
380 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
381 |
-SANE_Status __attribute__ ((visibility ("hidden"))) hpaioScannerToSaneStatus( hpaioScanner_t hpaio ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
382 |
+SANE_Status hpaioScannerToSaneStatus( hpaioScanner_t hpaio ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
383 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
384 |
//BREAKPOINT; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
385 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
386 |
--- hplip-3.10.9-orig/scan/sane/xml.h Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
387 |
+++ hplip-3.10.9/scan/sane/xml.h Fri Sep 4 01:07:05 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
388 |
@@ -27,10 +27,10 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
389 |
#ifndef _MXML_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
390 |
#define _MXML_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
391 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
392 |
-int __attribute__ ((visibility ("hidden"))) get_array_size(const char *tag); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
393 |
+int get_array_size(const char *tag); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
394 |
/* Get xml element from the buffer. The returned element is zero terminated. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
395 |
-int __attribute__ ((visibility ("hidden"))) get_element(const char *buf, int buf_size, char *element, int element_size, char **tail); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
396 |
+int get_element(const char *buf, int buf_size, char *element, int element_size, char **tail); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
397 |
/* Get next xml tag from the buffer. The returned xml tag is zero terminated. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
398 |
-int __attribute__ ((visibility ("hidden"))) get_tag(const char *buf, int buf_size, char *tag, int tag_size, char **tail); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
399 |
+int get_tag(const char *buf, int buf_size, char *tag, int tag_size, char **tail); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
400 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
401 |
#endif // _MXML_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
402 |
--- hplip-3.10.9-orig/scan/sane/scl.h Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
403 |
+++ hplip-3.10.9/scan/sane/scl.h Fri Sep 4 01:06:54 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
404 |
@@ -176,8 +176,8 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
405 |
//#define LEN_SCL_BUFFER 1024 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
406 |
#define LEN_SCL_BUFFER 256 /* Increase if reading binary data. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
407 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
408 |
-SANE_Status __attribute__ ((visibility ("hidden"))) SclSendCommand(int deviceid, int channelid, int cmd, int param); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
409 |
-SANE_Status __attribute__ ((visibility ("hidden"))) SclInquire(int deviceid, int channelid, int cmd, int param, int *pValue, char *buffer, int maxlen); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
410 |
+SANE_Status SclSendCommand(int deviceid, int channelid, int cmd, int param); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
411 |
+SANE_Status SclInquire(int deviceid, int channelid, int cmd, int param, int *pValue, char *buffer, int maxlen); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
412 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
413 |
/* |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
414 |
* Phase 2 partial rewrite. des 9/26/07 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
415 |
@@ -195,8 +195,8 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
416 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
417 |
struct hpaioScanner_s; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
418 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
419 |
-SANE_Status __attribute__ ((visibility ("hidden"))) scl_send_cmd(struct hpaioScanner_s *hpaio, const char *buf, int size); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
420 |
-SANE_Status __attribute__ ((visibility ("hidden"))) scl_query_int(struct hpaioScanner_s *hpaio, const char *buf, int size, int *result); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
421 |
+SANE_Status scl_send_cmd(struct hpaioScanner_s *hpaio, const char *buf, int size); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
422 |
+SANE_Status scl_query_int(struct hpaioScanner_s *hpaio, const char *buf, int size, int *result); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
423 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
424 |
#endif |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
425 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
426 |
--- hplip-3.10.9-orig/scan/sane/hpaio.h Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
427 |
+++ hplip-3.10.9/scan/sane/hpaio.h Fri Sep 4 01:04:35 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
428 |
@@ -271,8 +271,8 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
429 |
} \ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
430 |
} while(0) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
431 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
432 |
-SANE_Status __attribute__ ((visibility ("hidden"))) hpaioScannerToSaneStatus( hpaioScanner_t hpaio ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
433 |
-SANE_Status __attribute__ ((visibility ("hidden"))) hpaioScannerToSaneError( hpaioScanner_t hpaio ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
434 |
+SANE_Status hpaioScannerToSaneStatus( hpaioScanner_t hpaio ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
435 |
+SANE_Status hpaioScannerToSaneError( hpaioScanner_t hpaio ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
436 |
void sane_hpaio_cancel(SANE_Handle handle); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
437 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
438 |
#endif |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
439 |
--- hplip-3.10.9-orig/scan/sane/mfpdtf.c Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
440 |
+++ hplip-3.10.9/scan/sane/mfpdtf.c Fri Sep 4 01:05:16 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
441 |
@@ -56,7 +56,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
442 |
return seconds; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
443 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
444 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
445 |
-Mfpdtf_t __attribute__ ((visibility ("hidden"))) MfpdtfAllocate( int deviceid, int channelid ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
446 |
+Mfpdtf_t MfpdtfAllocate( int deviceid, int channelid ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
447 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
448 |
int size = sizeof( struct Mfpdtf_s ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
449 |
Mfpdtf_t mfpdtf = malloc( size ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
450 |
@@ -74,7 +74,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
451 |
return mfpdtf; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
452 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
453 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
454 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfDeallocate( Mfpdtf_t mfpdtf ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
455 |
+int MfpdtfDeallocate( Mfpdtf_t mfpdtf ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
456 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
457 |
if( !mfpdtf ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
458 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
459 |
@@ -86,7 +86,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
460 |
return OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
461 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
462 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
463 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfSetChannel( Mfpdtf_t mfpdtf, int channelid ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
464 |
+int MfpdtfSetChannel( Mfpdtf_t mfpdtf, int channelid ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
465 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
466 |
mfpdtf->channelid = channelid; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
467 |
/* If necessary, we can query the device ID string using the |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
468 |
@@ -94,7 +94,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
469 |
return OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
470 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
471 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
472 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfLogToFile( Mfpdtf_t mfpdtf, char * filename ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
473 |
+int MfpdtfLogToFile( Mfpdtf_t mfpdtf, char * filename ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
474 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
475 |
if( mfpdtf->fdLog != -1 ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
476 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
477 |
@@ -114,12 +114,12 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
478 |
return OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
479 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
480 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
481 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetSimulateImageHeaders( Mfpdtf_t mfpdtf ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
482 |
+int MfpdtfReadGetSimulateImageHeaders( Mfpdtf_t mfpdtf ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
483 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
484 |
return mfpdtf->read.simulateImageHeaders; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
485 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
486 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
487 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadSetSimulateImageHeaders( Mfpdtf_t mfpdtf, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
488 |
+int MfpdtfReadSetSimulateImageHeaders( Mfpdtf_t mfpdtf, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
489 |
int simulateImageHeaders ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
490 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
491 |
mfpdtf->read.simulateImageHeaders = simulateImageHeaders; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
492 |
@@ -126,7 +126,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
493 |
return simulateImageHeaders; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
494 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
495 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
496 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadStart( Mfpdtf_t mfpdtf ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
497 |
+int MfpdtfReadStart( Mfpdtf_t mfpdtf ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
498 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
499 |
mfpdtf->read.lastServiceResult = 0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
500 |
mfpdtf->read.dataType = ERROR; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
501 |
@@ -206,7 +206,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
502 |
return r; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
503 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
504 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
505 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadService( Mfpdtf_t mfpdtf ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
506 |
+int MfpdtfReadService( Mfpdtf_t mfpdtf ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
507 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
508 |
int result = 0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
509 |
int datalen, blockLength, headerLength; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
510 |
@@ -408,12 +408,12 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
511 |
RETURN( ( result | mfpdtf->read.fixedHeader.pageFlags ) ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
512 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
513 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
514 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetLastServiceResult( Mfpdtf_t mfpdtf ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
515 |
+int MfpdtfReadGetLastServiceResult( Mfpdtf_t mfpdtf ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
516 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
517 |
return mfpdtf->read.lastServiceResult; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
518 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
519 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
520 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetVariantHeader( Mfpdtf_t mfpdtf, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
521 |
+int MfpdtfReadGetVariantHeader( Mfpdtf_t mfpdtf, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
522 |
union MfpdtfVariantHeader_u * buffer, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
523 |
int maxlen ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
524 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
525 |
@@ -433,7 +433,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
526 |
return maxlen; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
527 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
528 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
529 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadGetStartPageRecord( Mfpdtf_t mfpdtf, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
530 |
+int MfpdtfReadGetStartPageRecord( Mfpdtf_t mfpdtf, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
531 |
struct MfpdtfImageStartPageRecord_s * buffer, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
532 |
int maxlen ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
533 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
534 |
@@ -446,7 +446,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
535 |
return maxlen; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
536 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
537 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
538 |
-int __attribute__ ((visibility ("hidden"))) MfpdtfReadInnerBlock( Mfpdtf_t mfpdtf, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
539 |
+int MfpdtfReadInnerBlock( Mfpdtf_t mfpdtf, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
540 |
unsigned char * buffer, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
541 |
int countdown ) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
542 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
543 |
@@ -502,7 +502,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
544 |
* Phase 2 rewrite. des |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
545 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
546 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
547 |
-int __attribute__ ((visibility ("hidden"))) read_mfpdtf_block(int device, int channel, char *buf, int bufSize, int timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
548 |
+int read_mfpdtf_block(int device, int channel, char *buf, int bufSize, int timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
549 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
550 |
MFPDTF_FIXED_HEADER *phd = (MFPDTF_FIXED_HEADER *)buf; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
551 |
int size, bsize=0, len; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
552 |
--- hplip-3.10.9-orig/scan/sane/io.h Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
553 |
+++ hplip-3.10.9/scan/sane/io.h Fri Sep 4 01:04:55 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
554 |
@@ -31,9 +31,9 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
555 |
#include "sane.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
556 |
#include "hpmud.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
557 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
558 |
-int __attribute__ ((visibility ("hidden"))) InitDbus(void); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
559 |
-int __attribute__ ((visibility ("hidden"))) SendScanEvent(char * device_uri, int event); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
560 |
-int __attribute__ ((visibility ("hidden"))) ReadChannelEx(int deviceid, int channelid, unsigned char * buffer, int length, int timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
561 |
+int InitDbus(void); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
562 |
+int SendScanEvent(char * device_uri, int event); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
563 |
+int ReadChannelEx(int deviceid, int channelid, unsigned char * buffer, int length, int timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
564 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
565 |
#define EVENT_START_SCAN_JOB 2000 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
566 |
#define EVENT_END_SCAN_JOB 2001 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
567 |
--- hplip-3.10.9-orig/scan/sane/common.h Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
568 |
+++ hplip-3.10.9/scan/sane/common.h Fri Sep 4 01:04:21 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
569 |
@@ -169,19 +169,19 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
570 |
pXform++; \ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
571 |
} while(0) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
572 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
573 |
-int __attribute__ ((visibility ("hidden"))) bug(const char *fmt, ...); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
574 |
-void __attribute__ ((visibility ("hidden"))) sysdump(const void *data, int size); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
575 |
-void __attribute__ ((visibility ("hidden"))) bugdump(const void *data, int size); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
576 |
-char __attribute__ ((visibility ("hidden"))) *psnprintf(char *buf, int bufSize, const char *fmt, ...); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
577 |
-unsigned long __attribute__ ((visibility ("hidden"))) DivideAndShift(int line, unsigned long numerator1, unsigned long numerator2, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
578 |
+int bug(const char *fmt, ...); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
579 |
+void sysdump(const void *data, int size); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
580 |
+void bugdump(const void *data, int size); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
581 |
+char *psnprintf(char *buf, int bufSize, const char *fmt, ...); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
582 |
+unsigned long DivideAndShift(int line, unsigned long numerator1, unsigned long numerator2, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
583 |
unsigned long denominator, int shift); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
584 |
-void __attribute__ ((visibility ("hidden"))) NumListClear( int * list ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
585 |
-int __attribute__ ((visibility ("hidden"))) NumListIsInList( int * list, int n ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
586 |
-int __attribute__ ((visibility ("hidden"))) NumListAdd( int * list, int n ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
587 |
-int __attribute__ ((visibility ("hidden"))) NumListGetCount( int * list ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
588 |
-int __attribute__ ((visibility ("hidden"))) NumListGetFirst( int * list ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
589 |
-void __attribute__ ((visibility ("hidden"))) StrListClear( const char ** list ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
590 |
-int __attribute__ ((visibility ("hidden"))) StrListIsInList( const char ** list, char * s ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
591 |
-int __attribute__ ((visibility ("hidden"))) StrListAdd( const char ** list, char * s ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
592 |
+void NumListClear( int * list ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
593 |
+int NumListIsInList( int * list, int n ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
594 |
+int NumListAdd( int * list, int n ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
595 |
+int NumListGetCount( int * list ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
596 |
+int NumListGetFirst( int * list ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
597 |
+void StrListClear( const char ** list ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
598 |
+int StrListIsInList( const char ** list, char * s ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
599 |
+int StrListAdd( const char ** list, char * s ); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
600 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
601 |
#endif |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
602 |
--- hplip-3.10.9-orig/scan/sane/pml.h Tue Aug 4 16:36:06 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
603 |
+++ hplip-3.10.9/scan/sane/pml.h Fri Sep 4 01:06:24 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
604 |
@@ -159,15 +159,15 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
605 |
unsigned char y[4]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
606 |
} __attribute__(( packed)); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
607 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
608 |
-int __attribute__ ((visibility ("hidden"))) PmlSetID(PmlObject_t obj, char * oid); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
609 |
-int __attribute__ ((visibility ("hidden"))) PmlSetValue(PmlObject_t obj, int type, char * value, int len); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
610 |
-int __attribute__ ((visibility ("hidden"))) PmlSetIntegerValue(PmlObject_t obj, int type, int value); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
611 |
-int __attribute__ ((visibility ("hidden"))) PmlGetValue(PmlObject_t obj, int * pType, char * buffer, int maxlen); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
612 |
-int __attribute__ ((visibility ("hidden"))) PmlGetStringValue(PmlObject_t obj, int * pSymbolSet, char * buffer, int maxlen); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
613 |
-int __attribute__ ((visibility ("hidden"))) PmlGetIntegerValue(PmlObject_t obj, int * pType, int * pValue); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
614 |
-int __attribute__ ((visibility ("hidden"))) PmlRequestSet(int deviceid, int channelid, PmlObject_t obj); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
615 |
-int __attribute__ ((visibility ("hidden"))) PmlRequestSetRetry(int deviceid, int channelid, PmlObject_t obj, int count, int delay); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
616 |
-int __attribute__ ((visibility ("hidden"))) PmlRequestGet(int deviceid, int channelid, PmlObject_t obj); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
617 |
+int PmlSetID(PmlObject_t obj, char * oid); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
618 |
+int PmlSetValue(PmlObject_t obj, int type, char * value, int len); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
619 |
+int PmlSetIntegerValue(PmlObject_t obj, int type, int value); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
620 |
+int PmlGetValue(PmlObject_t obj, int * pType, char * buffer, int maxlen); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
621 |
+int PmlGetStringValue(PmlObject_t obj, int * pSymbolSet, char * buffer, int maxlen); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
622 |
+int PmlGetIntegerValue(PmlObject_t obj, int * pType, int * pValue); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
623 |
+int PmlRequestSet(int deviceid, int channelid, PmlObject_t obj); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
624 |
+int PmlRequestSetRetry(int deviceid, int channelid, PmlObject_t obj, int count, int delay); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
625 |
+int PmlRequestGet(int deviceid, int channelid, PmlObject_t obj); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
626 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
627 |
/* |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
628 |
* Phase 2 rewrite. des |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
629 |
@@ -174,8 +174,8 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
630 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
631 |
struct hpaioScanner_s; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
632 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
633 |
-int __attribute__ ((visibility ("hidden"))) pml_start(struct hpaioScanner_s *hpaio); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
634 |
-int __attribute__ ((visibility ("hidden"))) pml_read(struct hpaioScanner_s *hpaio, SANE_Byte *data, SANE_Int maxLength, SANE_Int *pLength); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
635 |
-int __attribute__ ((visibility ("hidden"))) pml_cancel(struct hpaioScanner_s *hpaio); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
636 |
+int pml_start(struct hpaioScanner_s *hpaio); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
637 |
+int pml_read(struct hpaioScanner_s *hpaio, SANE_Byte *data, SANE_Int maxLength, SANE_Int *pLength); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
638 |
+int pml_cancel(struct hpaioScanner_s *hpaio); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
639 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
640 |
#endif // _PML_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
641 |
--- hplip-3.10.9-orig/io/hpmud/pp.h Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
642 |
+++ hplip-3.10.9/io/hpmud/pp.h Fri Sep 4 00:51:13 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
643 |
@@ -76,25 +76,25 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
644 |
struct _mud_device; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
645 |
struct _mud_channel; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
646 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
647 |
-extern struct _mud_device_vf __attribute__ ((visibility ("hidden"))) pp_mud_device_vf; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
648 |
+extern struct _mud_device_vf pp_mud_device_vf; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
649 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
650 |
-int __attribute__ ((visibility ("hidden"))) pp_write(int fd, const void *buf, int size, int usec); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
651 |
-int __attribute__ ((visibility ("hidden"))) pp_read(int fd, void *buf, int size, int usec); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
652 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_open(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
653 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_close(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
654 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_get_device_id(struct _mud_device *pd, char *buf, int size, int *len); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
655 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_get_device_status(struct _mud_device *pd, unsigned int *status); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
656 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_channel_open(struct _mud_device *pd, const char *sn, HPMUD_CHANNEL *cd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
657 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_channel_close(struct _mud_device *pd, struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
658 |
+int pp_write(int fd, const void *buf, int size, int usec); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
659 |
+int pp_read(int fd, void *buf, int size, int usec); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
660 |
+enum HPMUD_RESULT pp_open(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
661 |
+enum HPMUD_RESULT pp_close(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
662 |
+enum HPMUD_RESULT pp_get_device_id(struct _mud_device *pd, char *buf, int size, int *len); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
663 |
+enum HPMUD_RESULT pp_get_device_status(struct _mud_device *pd, unsigned int *status); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
664 |
+enum HPMUD_RESULT pp_channel_open(struct _mud_device *pd, const char *sn, HPMUD_CHANNEL *cd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
665 |
+enum HPMUD_RESULT pp_channel_close(struct _mud_device *pd, struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
666 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
667 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_raw_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
668 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_raw_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
669 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_mlc_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
670 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_mlc_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
671 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_dot4_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
672 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_dot4_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
673 |
+enum HPMUD_RESULT pp_raw_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
674 |
+enum HPMUD_RESULT pp_raw_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
675 |
+enum HPMUD_RESULT pp_mlc_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
676 |
+enum HPMUD_RESULT pp_mlc_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
677 |
+enum HPMUD_RESULT pp_dot4_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
678 |
+enum HPMUD_RESULT pp_dot4_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
679 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
680 |
-int __attribute__ ((visibility ("hidden"))) pp_probe_devices(char *lst, int lst_size, int *cnt); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
681 |
+int pp_probe_devices(char *lst, int lst_size, int *cnt); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
682 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
683 |
#endif // _PP_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
684 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
685 |
--- hplip-3.10.9-orig/io/hpmud/jd.c Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
686 |
+++ hplip-3.10.9/io/hpmud/jd.c Fri Sep 4 00:55:15 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
687 |
@@ -34,7 +34,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
688 |
#include "hpmud.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
689 |
#include "hpmudi.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
690 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
691 |
-mud_device_vf __attribute__ ((visibility ("hidden"))) jd_mud_device_vf = |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
692 |
+mud_device_vf jd_mud_device_vf = |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
693 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
694 |
.open = jd_open, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
695 |
.close = jd_close, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
696 |
@@ -60,7 +60,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
697 |
static const int ScanPort1[] = { 0, 8290, 0, 0 }; /* hack for CLJ28xx */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
698 |
static const int GenericPort1[] = { 0, 8292, 0, 0 }; /* hack for CLJ28xx (fax) */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
699 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
700 |
-const char __attribute__ ((visibility ("hidden"))) *kStatusOID = "1.3.6.1.4.1.11.2.3.9.1.1.7.0"; /* device id snmp oid */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
701 |
+const char *kStatusOID = "1.3.6.1.4.1.11.2.3.9.1.1.7.0"; /* device id snmp oid */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
702 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
703 |
static int ReadReply(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
704 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
705 |
@@ -146,7 +146,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
706 |
* JetDirect mud_device functions. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
707 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
708 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
709 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_open(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
710 |
+enum HPMUD_RESULT jd_open(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
711 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
712 |
char uri_model[128]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
713 |
char model[128]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
714 |
@@ -198,7 +198,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
715 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
716 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
717 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
718 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_close(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
719 |
+enum HPMUD_RESULT jd_close(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
720 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
721 |
enum HPMUD_RESULT stat = HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
722 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
723 |
@@ -209,7 +209,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
724 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
725 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
726 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
727 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_get_device_id(mud_device *pd, char *buf, int size, int *len) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
728 |
+enum HPMUD_RESULT jd_get_device_id(mud_device *pd, char *buf, int size, int *len) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
729 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
730 |
enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
731 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
732 |
@@ -229,13 +229,13 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
733 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
734 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
735 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
736 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_get_device_status(mud_device *pd, unsigned int *status) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
737 |
+enum HPMUD_RESULT jd_get_device_status(mud_device *pd, unsigned int *status) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
738 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
739 |
*status = NFAULT_BIT; /* there is no 8-bit status, so fake it */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
740 |
return HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
741 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
742 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
743 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_channel_write(mud_device *pd, mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
744 |
+enum HPMUD_RESULT jd_channel_write(mud_device *pd, mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
745 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
746 |
enum HPMUD_RESULT stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
747 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
748 |
@@ -245,7 +245,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
749 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
750 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
751 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
752 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_channel_read(mud_device *pd, mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
753 |
+enum HPMUD_RESULT jd_channel_read(mud_device *pd, mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
754 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
755 |
enum HPMUD_RESULT stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
756 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
757 |
@@ -261,7 +261,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
758 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
759 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
760 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
761 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_channel_open(mud_device *pd, const char *sn, HPMUD_CHANNEL *cd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
762 |
+enum HPMUD_RESULT jd_channel_open(mud_device *pd, const char *sn, HPMUD_CHANNEL *cd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
763 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
764 |
int index; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
765 |
enum HPMUD_RESULT stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
766 |
@@ -290,7 +290,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
767 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
768 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
769 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
770 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_channel_close(mud_device *pd, mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
771 |
+enum HPMUD_RESULT jd_channel_close(mud_device *pd, mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
772 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
773 |
enum HPMUD_RESULT stat = HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
774 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
775 |
@@ -306,7 +306,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
776 |
* JetDirect channel functions. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
777 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
778 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
779 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
780 |
+enum HPMUD_RESULT jd_s_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
781 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
782 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
783 |
struct sockaddr_in pin; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
784 |
@@ -480,7 +480,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
785 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
786 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
787 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
788 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
789 |
+enum HPMUD_RESULT jd_s_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
790 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
791 |
if (pc->socket >= 0) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
792 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
793 |
@@ -495,7 +495,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
794 |
return HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
795 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
796 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
797 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_write(mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
798 |
+enum HPMUD_RESULT jd_s_channel_write(mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
799 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
800 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
801 |
int len, size, total=0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
802 |
@@ -555,7 +555,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
803 |
* Channel_read() tries to read "length" bytes from the peripheral. The returned read count may be zero |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
804 |
* (timeout, no data available), less than "length" or equal "length". |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
805 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
806 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_read(mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
807 |
+enum HPMUD_RESULT jd_s_channel_read(mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
808 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
809 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
810 |
int len=0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
811 |
--- hplip-3.10.9-orig/io/hpmud/dot4.c Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
812 |
+++ hplip-3.10.9/io/hpmud/dot4.c Fri Sep 4 00:48:13 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
813 |
@@ -150,7 +150,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
814 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
815 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
816 |
/* Get command from peripheral and processes the reverse command. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
817 |
-int __attribute__ ((visibility ("hidden"))) Dot4ReverseCmd(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
818 |
+int Dot4ReverseCmd(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
819 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
820 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
821 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
822 |
@@ -274,7 +274,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
823 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
824 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
825 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
826 |
-int __attribute__ ((visibility ("hidden"))) Dot4Init(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
827 |
+int Dot4Init(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
828 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
829 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
830 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
831 |
@@ -338,7 +338,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
832 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
833 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
834 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
835 |
-int __attribute__ ((visibility ("hidden"))) Dot4Exit(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
836 |
+int Dot4Exit(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
837 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
838 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
839 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
840 |
@@ -374,7 +374,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
841 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
842 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
843 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
844 |
-int __attribute__ ((visibility ("hidden"))) Dot4GetSocket(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
845 |
+int Dot4GetSocket(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
846 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
847 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
848 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
849 |
@@ -419,7 +419,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
850 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
851 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
852 |
/* Write data to peripheral. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
853 |
-int __attribute__ ((visibility ("hidden"))) Dot4ForwardData(mud_channel *pc, int fd, const void *buf, int size, int usec_timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
854 |
+int Dot4ForwardData(mud_channel *pc, int fd, const void *buf, int size, int usec_timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
855 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
856 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
857 |
int stat=0, len, n; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
858 |
@@ -450,7 +450,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
859 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
860 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
861 |
/* Read data from peripheral. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
862 |
-int __attribute__ ((visibility ("hidden"))) Dot4ReverseData(mud_channel *pc, int fd, void *buf, int length, int usec_timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
863 |
+int Dot4ReverseData(mud_channel *pc, int fd, void *buf, int length, int usec_timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
864 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
865 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
866 |
mud_channel *out_of_bound_channel; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
867 |
@@ -582,7 +582,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
868 |
return total; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
869 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
870 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
871 |
-int __attribute__ ((visibility ("hidden"))) Dot4OpenChannel(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
872 |
+int Dot4OpenChannel(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
873 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
874 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
875 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
876 |
@@ -627,7 +627,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
877 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
878 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
879 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
880 |
-int __attribute__ ((visibility ("hidden"))) Dot4CloseChannel(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
881 |
+int Dot4CloseChannel(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
882 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
883 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
884 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
885 |
@@ -665,7 +665,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
886 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
887 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
888 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
889 |
-int __attribute__ ((visibility ("hidden"))) Dot4Credit(mud_channel *pc, int fd, unsigned short credit) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
890 |
+int Dot4Credit(mud_channel *pc, int fd, unsigned short credit) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
891 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
892 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
893 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
894 |
@@ -706,7 +706,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
895 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
896 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
897 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
898 |
-int __attribute__ ((visibility ("hidden"))) Dot4CreditRequest(mud_channel *pc, int fd, unsigned short credit) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
899 |
+int Dot4CreditRequest(mud_channel *pc, int fd, unsigned short credit) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
900 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
901 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
902 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
903 |
--- hplip-3.10.9-orig/io/hpmud/pml.c Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
904 |
+++ hplip-3.10.9/io/hpmud/pml.c Fri Sep 4 00:54:19 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
905 |
@@ -210,7 +210,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
906 |
return len; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
907 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
908 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
909 |
-int __attribute__ ((visibility ("hidden"))) GetSnmp(const char *ip, int port, const char *szoid, void *buffer, unsigned int size, int *type, int *pml_result, int *result) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
910 |
+int GetSnmp(const char *ip, int port, const char *szoid, void *buffer, unsigned int size, int *type, int *pml_result, int *result) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
911 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
912 |
struct snmp_session session, *ss=NULL; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
913 |
struct snmp_pdu *pdu=NULL; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
914 |
@@ -299,13 +299,13 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
915 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
916 |
#else |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
917 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
918 |
-int __attribute__ ((visibility ("hidden"))) SetSnmp(const char *ip, int port, const char *szoid, int type, void *buffer, unsigned int size, int *pml_result, int *result) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
919 |
+int SetSnmp(const char *ip, int port, const char *szoid, int type, void *buffer, unsigned int size, int *pml_result, int *result) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
920 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
921 |
BUG("no JetDirect support enabled\n"); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
922 |
return 0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
923 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
924 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
925 |
-int __attribute__ ((visibility ("hidden"))) GetSnmp(const char *ip, int port, const char *szoid, void *buffer, unsigned int size, int *type, int *pml_result, int *result) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
926 |
+int GetSnmp(const char *ip, int port, const char *szoid, void *buffer, unsigned int size, int *type, int *pml_result, int *result) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
927 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
928 |
BUG("no JetDirect support enabled\n"); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
929 |
return 0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
930 |
--- hplip-3.10.9-orig/io/hpmud/musb.c Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
931 |
+++ hplip-3.10.9/io/hpmud/musb.c Fri Sep 4 00:54:08 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
932 |
@@ -27,7 +27,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
933 |
#include "hpmud.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
934 |
#include "hpmudi.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
935 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
936 |
-mud_device_vf __attribute__ ((visibility ("hidden"))) musb_mud_device_vf = |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
937 |
+mud_device_vf musb_mud_device_vf = |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
938 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
939 |
.read = musb_read, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
940 |
.write = musb_write, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
941 |
@@ -841,7 +841,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
942 |
* Power up printer if necessary. Most all-in-ones have no power down state (ie: OJ K80), so they are already powered up. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
943 |
* Newer single function printers power-up with the print job. May be called by other mud_device. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
944 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
945 |
-int __attribute__ ((visibility ("hidden"))) power_up(mud_device *pd, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
946 |
+int power_up(mud_device *pd, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
947 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
948 |
const char *pSf; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
949 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
950 |
@@ -955,7 +955,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
951 |
* USB mud_device functions. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
952 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
953 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
954 |
-int __attribute__ ((visibility ("hidden"))) musb_write(int fd, const void *buf, int size, int usec) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
955 |
+int musb_write(int fd, const void *buf, int size, int usec) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
956 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
957 |
int len=-EIO; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
958 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
959 |
@@ -1030,7 +1030,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
960 |
return len; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
961 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
962 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
963 |
-int __attribute__ ((visibility ("hidden"))) musb_read(int fd, void *buf, int size, int usec) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
964 |
+int musb_read(int fd, void *buf, int size, int usec) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
965 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
966 |
struct timeval t1, t2; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
967 |
int total_usec, tmo_usec=usec; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
968 |
@@ -1089,7 +1089,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
969 |
return len; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
970 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
971 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
972 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_open(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
973 |
+enum HPMUD_RESULT musb_open(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
974 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
975 |
int len=0, fd=0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
976 |
enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
977 |
@@ -1138,7 +1138,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
978 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
979 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
980 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
981 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_close(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
982 |
+enum HPMUD_RESULT musb_close(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
983 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
984 |
int i; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
985 |
enum HPMUD_RESULT stat = HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
986 |
@@ -1158,7 +1158,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
987 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
988 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
989 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
990 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_get_device_id(mud_device *pd, char *buf, int size, int *len) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
991 |
+enum HPMUD_RESULT musb_get_device_id(mud_device *pd, char *buf, int size, int *len) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
992 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
993 |
int i, fd=FD_NA; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
994 |
enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
995 |
@@ -1214,7 +1214,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
996 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
997 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
998 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
999 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_get_device_status(mud_device *pd, unsigned int *status) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1000 |
+enum HPMUD_RESULT musb_get_device_status(mud_device *pd, unsigned int *status) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1001 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1002 |
int i, fd=FD_NA; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1003 |
enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1004 |
@@ -1263,7 +1263,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1005 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1006 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1007 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1008 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_channel_write(mud_device *pd, mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1009 |
+enum HPMUD_RESULT musb_channel_write(mud_device *pd, mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1010 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1011 |
enum HPMUD_RESULT stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1012 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1013 |
@@ -1273,7 +1273,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1014 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1015 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1016 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1017 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_channel_read(mud_device *pd, mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1018 |
+enum HPMUD_RESULT musb_channel_read(mud_device *pd, mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1019 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1020 |
enum HPMUD_RESULT stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1021 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1022 |
@@ -1292,7 +1292,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1023 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1024 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1025 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1026 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_channel_open(mud_device *pd, const char *sn, HPMUD_CHANNEL *cd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1027 |
+enum HPMUD_RESULT musb_channel_open(mud_device *pd, const char *sn, HPMUD_CHANNEL *cd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1028 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1029 |
int index; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1030 |
enum HPMUD_RESULT stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1031 |
@@ -1321,7 +1321,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1032 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1033 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1034 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1035 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_channel_close(mud_device *pd, mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1036 |
+enum HPMUD_RESULT musb_channel_close(mud_device *pd, mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1037 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1038 |
enum HPMUD_RESULT stat = HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1039 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1040 |
@@ -1337,7 +1337,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1041 |
* USB raw_channel functions. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1042 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1043 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1044 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1045 |
+enum HPMUD_RESULT musb_raw_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1046 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1047 |
int fd = FD_7_1_2; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1048 |
enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1049 |
@@ -1355,7 +1355,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1050 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1051 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1052 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1053 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1054 |
+enum HPMUD_RESULT musb_raw_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1055 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1056 |
int fd = pc->fd; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1057 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1058 |
@@ -1366,7 +1366,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1059 |
return HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1060 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1061 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1062 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_write(mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1063 |
+enum HPMUD_RESULT musb_raw_channel_write(mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1064 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1065 |
int len, size, total=0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1066 |
enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1067 |
@@ -1404,7 +1404,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1068 |
* Channel_read() tries to read "length" bytes from the peripheral. The returned read count may be zero |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1069 |
* (timeout, no data available), less than "length" or equal "length". |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1070 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1071 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_read(mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1072 |
+enum HPMUD_RESULT musb_raw_channel_read(mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1073 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1074 |
int len=0, usec; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1075 |
enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1076 |
@@ -1441,7 +1441,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1077 |
* USB comp_channel functions. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1078 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1079 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1080 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_comp_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1081 |
+enum HPMUD_RESULT musb_comp_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1082 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1083 |
int fd; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1084 |
enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1085 |
@@ -1490,7 +1490,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1086 |
* USB mlc_channel functions. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1087 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1088 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1089 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_mlc_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1090 |
+enum HPMUD_RESULT musb_mlc_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1091 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1092 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1093 |
enum FD_ID fd; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1094 |
@@ -1558,7 +1558,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1095 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1096 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1097 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1098 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_mlc_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1099 |
+enum HPMUD_RESULT musb_mlc_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1100 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1101 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1102 |
unsigned char nullByte=0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1103 |
@@ -1596,7 +1596,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1104 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1105 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1106 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1107 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_mlc_channel_write(mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1108 |
+enum HPMUD_RESULT musb_mlc_channel_write(mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1109 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1110 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1111 |
int ret, len, size, dlen, total=0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1112 |
@@ -1669,7 +1669,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1113 |
* Note, if a "timeout" occurs one peripheral to host credit is left outstanding. Which means the peripheral |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1114 |
* can send unsolicited data later. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1115 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1116 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_mlc_channel_read(mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1117 |
+enum HPMUD_RESULT musb_mlc_channel_read(mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1118 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1119 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1120 |
enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1121 |
@@ -1710,7 +1710,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1122 |
* USB dot4_channel functions. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1123 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1124 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1125 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_dot4_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1126 |
+enum HPMUD_RESULT musb_dot4_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1127 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1128 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1129 |
enum FD_ID fd; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1130 |
@@ -1799,7 +1799,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1131 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1132 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1133 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1134 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_dot4_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1135 |
+enum HPMUD_RESULT musb_dot4_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1136 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1137 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1138 |
enum HPMUD_RESULT stat = HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1139 |
@@ -1842,7 +1842,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1140 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1141 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1142 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1143 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_dot4_channel_write(mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1144 |
+enum HPMUD_RESULT musb_dot4_channel_write(mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1145 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1146 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1147 |
int ret, len, size, dlen, total=0, cnt=0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1148 |
@@ -1919,7 +1919,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1149 |
* Note, if a "timeout" occurs one peripheral to host credit is left outstanding. Which means the peripheral |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1150 |
* can send unsolicited data later. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1151 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1152 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_dot4_channel_read(mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1153 |
+enum HPMUD_RESULT musb_dot4_channel_read(mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1154 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1155 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1156 |
enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1157 |
@@ -1960,7 +1960,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1158 |
* USB probe devices, walk the USB bus(s) looking for HP products. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1159 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1160 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1161 |
-int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int lst_size, int *cnt) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1162 |
+int musb_probe_devices(char *lst, int lst_size, int *cnt) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1163 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1164 |
struct usb_bus *bus; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1165 |
struct usb_device *dev; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1166 |
--- hplip-3.10.9-orig/io/hpmud/hpmud.c Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1167 |
+++ hplip-3.10.9/io/hpmud/hpmud.c Fri Sep 4 00:59:28 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1168 |
@@ -27,13 +27,13 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1169 |
#include "hpmudi.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1170 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1171 |
/* Client data. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1172 |
-mud_session ms __attribute__ ((visibility ("hidden"))); /* mud session, one per client */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1173 |
-mud_session *msp __attribute__ ((visibility ("hidden"))) = &ms; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1174 |
+mud_session ms ; /* mud session, one per client */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1175 |
+mud_session *msp = &ms; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1176 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1177 |
/* |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1178 |
* sysdump() originally came from http://sws.dett.de/mini/hexdump-c , [email protected] . |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1179 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1180 |
-void __attribute__ ((visibility ("hidden"))) sysdump(const void *data, int size) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1181 |
+void sysdump(const void *data, int size) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1182 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1183 |
/* Dump size bytes of *data. Output looks like: |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1184 |
* [0000] 75 6E 6B 6E 6F 77 6E 20 30 FF 00 00 00 00 39 00 unknown 0.....9. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1185 |
@@ -81,7 +81,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1186 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1187 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1188 |
/* Given the IEEE 1284 device id string, determine if this is a HP product. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1189 |
-int __attribute__ ((visibility ("hidden"))) is_hp(const char *id) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1190 |
+int is_hp(const char *id) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1191 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1192 |
char *pMf; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1193 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1194 |
@@ -100,7 +100,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1195 |
return 0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1196 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1197 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1198 |
-int __attribute__ ((visibility ("hidden"))) generalize_model(const char *sz, char *buf, int bufSize) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1199 |
+int generalize_model(const char *sz, char *buf, int bufSize) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1200 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1201 |
const char *pMd=sz; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1202 |
int i, j, dd=0; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1203 |
@@ -132,7 +132,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1204 |
return j; /* length does not include zero termination */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1205 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1206 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1207 |
-int __attribute__ ((visibility ("hidden"))) generalize_serial(const char *sz, char *buf, int bufSize) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1208 |
+int generalize_serial(const char *sz, char *buf, int bufSize) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1209 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1210 |
const char *pMd=sz; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1211 |
int i, j; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1212 |
@@ -152,7 +152,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1213 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1214 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1215 |
/* Parse serial number from uri string. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1216 |
-int __attribute__ ((visibility ("hidden"))) get_uri_serial(const char *uri, char *buf, int bufSize) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1217 |
+int get_uri_serial(const char *uri, char *buf, int bufSize) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1218 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1219 |
char *p; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1220 |
int i; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1221 |
@@ -172,7 +172,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1222 |
return i; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1223 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1224 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1225 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) service_to_channel(mud_device *pd, const char *sn, HPMUD_CHANNEL *index) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1226 |
+enum HPMUD_RESULT service_to_channel(mud_device *pd, const char *sn, HPMUD_CHANNEL *index) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1227 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1228 |
enum HPMUD_RESULT stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1229 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1230 |
--- hplip-3.10.9-orig/io/hpmud/mlc.h Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1231 |
+++ hplip-3.10.9/io/hpmud/mlc.h Fri Sep 4 00:57:55 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1232 |
@@ -134,17 +134,17 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1233 |
struct _mud_device; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1234 |
struct _mud_channel; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1235 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1236 |
-int __attribute__ ((visibility ("hidden"))) cut_buf(struct _mud_channel *pc, char *buf, int size); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1237 |
-int __attribute__ ((visibility ("hidden"))) MlcInit(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1238 |
-int __attribute__ ((visibility ("hidden"))) MlcExit(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1239 |
-int __attribute__ ((visibility ("hidden"))) MlcConfigSocket(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1240 |
-int __attribute__ ((visibility ("hidden"))) MlcForwardData(struct _mud_channel *pc, int fd, const void *buf, int size, int usec_timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1241 |
-int __attribute__ ((visibility ("hidden"))) MlcReverseData(struct _mud_channel *pc, int fd, void *buf, int length, int usec_timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1242 |
-int __attribute__ ((visibility ("hidden"))) MlcOpenChannel(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1243 |
-int __attribute__ ((visibility ("hidden"))) MlcCloseChannel(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1244 |
-int __attribute__ ((visibility ("hidden"))) MlcCredit(struct _mud_channel *pc, int fd, unsigned short credit); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1245 |
-int __attribute__ ((visibility ("hidden"))) MlcCreditRequest(struct _mud_channel *pc, int fd, unsigned short credit); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1246 |
-int __attribute__ ((visibility ("hidden"))) MlcReverseCmd(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1247 |
+int cut_buf(struct _mud_channel *pc, char *buf, int size); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1248 |
+int MlcInit(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1249 |
+int MlcExit(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1250 |
+int MlcConfigSocket(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1251 |
+int MlcForwardData(struct _mud_channel *pc, int fd, const void *buf, int size, int usec_timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1252 |
+int MlcReverseData(struct _mud_channel *pc, int fd, void *buf, int length, int usec_timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1253 |
+int MlcOpenChannel(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1254 |
+int MlcCloseChannel(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1255 |
+int MlcCredit(struct _mud_channel *pc, int fd, unsigned short credit); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1256 |
+int MlcCreditRequest(struct _mud_channel *pc, int fd, unsigned short credit); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1257 |
+int MlcReverseCmd(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1258 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1259 |
#endif // _MLC_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1260 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1261 |
--- hplip-3.10.9-orig/io/hpmud/hpmudi.h Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1262 |
+++ hplip-3.10.9/io/hpmud/hpmudi.h Fri Sep 4 00:59:05 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1263 |
@@ -190,18 +190,18 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1264 |
pthread_mutex_t mutex; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1265 |
} mud_session; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1266 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1267 |
-extern mud_session *msp __attribute__ ((visibility ("hidden"))); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1268 |
+extern mud_session *msp; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1269 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1270 |
-void __attribute__ ((visibility ("hidden"))) sysdump(const void *data, int size); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1271 |
-int __attribute__ ((visibility ("hidden"))) mm_device_lock(int fd, HPMUD_DEVICE index); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1272 |
-int __attribute__ ((visibility ("hidden"))) mm_device_unlock(int fd, HPMUD_DEVICE index); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1273 |
-int __attribute__ ((visibility ("hidden"))) mm_device_trylock(int fd, HPMUD_DEVICE index); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1274 |
-int __attribute__ ((visibility ("hidden"))) is_hp(const char *id); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1275 |
-int __attribute__ ((visibility ("hidden"))) generalize_model(const char *sz, char *buf, int bufSize); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1276 |
-int __attribute__ ((visibility ("hidden"))) generalize_serial(const char *sz, char *buf, int bufSize); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1277 |
-int __attribute__ ((visibility ("hidden"))) get_uri_model(const char *uri, char *buf, int bufSize); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1278 |
-int __attribute__ ((visibility ("hidden"))) get_uri_serial(const char *uri, char *buf, int bufSize); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1279 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) service_to_channel(mud_device *pd, const char *sn, HPMUD_CHANNEL *index); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1280 |
+void sysdump(const void *data, int size); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1281 |
+int mm_device_lock(int fd, HPMUD_DEVICE index); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1282 |
+int mm_device_unlock(int fd, HPMUD_DEVICE index); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1283 |
+int mm_device_trylock(int fd, HPMUD_DEVICE index); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1284 |
+int is_hp(const char *id); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1285 |
+int generalize_model(const char *sz, char *buf, int bufSize); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1286 |
+int generalize_serial(const char *sz, char *buf, int bufSize); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1287 |
+int get_uri_model(const char *uri, char *buf, int bufSize); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1288 |
+int get_uri_serial(const char *uri, char *buf, int bufSize); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1289 |
+enum HPMUD_RESULT service_to_channel(mud_device *pd, const char *sn, HPMUD_CHANNEL *index); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1290 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1291 |
#endif // _HPMUDI_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1292 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1293 |
--- hplip-3.10.9-orig/io/hpmud/dot4.h Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1294 |
+++ hplip-3.10.9/io/hpmud/dot4.h Fri Sep 4 00:50:05 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1295 |
@@ -172,16 +172,16 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1296 |
typedef DOT4CloseChannelReply DOT4CreditReply; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1297 |
typedef DOT4Exit DOT4GetSocket; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1298 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1299 |
-int __attribute__ ((visibility ("hidden"))) Dot4ReverseCmd(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1300 |
-int __attribute__ ((visibility ("hidden"))) Dot4Init(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1301 |
-int __attribute__ ((visibility ("hidden"))) Dot4Exit(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1302 |
-int __attribute__ ((visibility ("hidden"))) Dot4GetSocket(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1303 |
-int __attribute__ ((visibility ("hidden"))) Dot4ForwardData(struct _mud_channel *pc, int fd, const void *buf, int size, int usec_timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1304 |
-int __attribute__ ((visibility ("hidden"))) Dot4ReverseData(struct _mud_channel *pc, int fd, void *buf, int length, int usec_timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1305 |
-int __attribute__ ((visibility ("hidden"))) Dot4OpenChannel(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1306 |
-int __attribute__ ((visibility ("hidden"))) Dot4CloseChannel(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1307 |
-int __attribute__ ((visibility ("hidden"))) Dot4Credit(struct _mud_channel *pc, int fd, unsigned short credit); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1308 |
-int __attribute__ ((visibility ("hidden"))) Dot4CreditRequest(struct _mud_channel *pc, int fd, unsigned short credit); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1309 |
+int Dot4ReverseCmd(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1310 |
+int Dot4Init(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1311 |
+int Dot4Exit(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1312 |
+int Dot4GetSocket(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1313 |
+int Dot4ForwardData(struct _mud_channel *pc, int fd, const void *buf, int size, int usec_timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1314 |
+int Dot4ReverseData(struct _mud_channel *pc, int fd, void *buf, int length, int usec_timeout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1315 |
+int Dot4OpenChannel(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1316 |
+int Dot4CloseChannel(struct _mud_channel *pc, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1317 |
+int Dot4Credit(struct _mud_channel *pc, int fd, unsigned short credit); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1318 |
+int Dot4CreditRequest(struct _mud_channel *pc, int fd, unsigned short credit); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1319 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1320 |
#endif // _DOT4_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1321 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1322 |
--- hplip-3.10.9-orig/io/hpmud/pp.c Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1323 |
+++ hplip-3.10.9/io/hpmud/pp.c Fri Sep 4 00:51:58 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1324 |
@@ -29,7 +29,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1325 |
#include "hpmud.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1326 |
#include "hpmudi.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1327 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1328 |
-mud_device_vf __attribute__ ((visibility ("hidden"))) pp_mud_device_vf = |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1329 |
+mud_device_vf pp_mud_device_vf = |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1330 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1331 |
.read = pp_read, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1332 |
.write = pp_write, |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1333 |
@@ -724,7 +724,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1334 |
* Parallel port mud_device functions. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1335 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1336 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1337 |
-int __attribute__ ((visibility ("hidden"))) pp_write(int fd, const void *buf, int size, int usec) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1338 |
+int pp_write(int fd, const void *buf, int size, int usec) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1339 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1340 |
int len=0, m; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1341 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1342 |
@@ -745,7 +745,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1343 |
return len; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1344 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1345 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1346 |
-int __attribute__ ((visibility ("hidden"))) pp_read(int fd, void *buf, int size, int usec) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1347 |
+int pp_read(int fd, void *buf, int size, int usec) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1348 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1349 |
int len=0, m; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1350 |
// int sec = usec/1000000; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1351 |
@@ -767,7 +767,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1352 |
return len; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1353 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1354 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1355 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_open(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1356 |
+enum HPMUD_RESULT pp_open(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1357 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1358 |
char dev[255], uriModel[128], model[128]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1359 |
int len, m, fd; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1360 |
@@ -827,7 +827,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1361 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1362 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1363 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1364 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_close(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1365 |
+enum HPMUD_RESULT pp_close(mud_device *pd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1366 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1367 |
enum HPMUD_RESULT stat = HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1368 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1369 |
@@ -844,7 +844,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1370 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1371 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1372 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1373 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_get_device_id(mud_device *pd, char *buf, int size, int *len) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1374 |
+enum HPMUD_RESULT pp_get_device_id(mud_device *pd, char *buf, int size, int *len) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1375 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1376 |
int m, fd = pd->open_fd; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1377 |
enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1378 |
@@ -902,7 +902,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1379 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1380 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1381 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1382 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_get_device_status(mud_device *pd, unsigned int *status) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1383 |
+enum HPMUD_RESULT pp_get_device_status(mud_device *pd, unsigned int *status) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1384 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1385 |
int fd=pd->open_fd; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1386 |
enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1387 |
@@ -958,7 +958,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1388 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1389 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1390 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1391 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_channel_open(mud_device *pd, const char *sn, HPMUD_CHANNEL *cd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1392 |
+enum HPMUD_RESULT pp_channel_open(mud_device *pd, const char *sn, HPMUD_CHANNEL *cd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1393 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1394 |
int index; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1395 |
enum HPMUD_RESULT stat = HPMUD_R_DEVICE_BUSY; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1396 |
@@ -987,7 +987,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1397 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1398 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1399 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1400 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_channel_close(mud_device *pd, mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1401 |
+enum HPMUD_RESULT pp_channel_close(mud_device *pd, mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1402 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1403 |
enum HPMUD_RESULT stat = HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1404 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1405 |
@@ -1003,7 +1003,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1406 |
* Parallel port raw_channel functions. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1407 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1408 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1409 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_raw_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1410 |
+enum HPMUD_RESULT pp_raw_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1411 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1412 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1413 |
if (claim_pp(pd->open_fd)) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1414 |
@@ -1012,7 +1012,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1415 |
return HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1416 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1417 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1418 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_raw_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1419 |
+enum HPMUD_RESULT pp_raw_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1420 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1421 |
if (pc->fd >= 0) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1422 |
release_pp(pc->fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1423 |
@@ -1024,7 +1024,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1424 |
* Parallel port mlc_channel functions. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1425 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1426 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1427 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_mlc_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1428 |
+enum HPMUD_RESULT pp_mlc_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1429 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1430 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1431 |
enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1432 |
@@ -1076,7 +1076,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1433 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1434 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1435 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1436 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_mlc_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1437 |
+enum HPMUD_RESULT pp_mlc_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1438 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1439 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1440 |
enum HPMUD_RESULT stat = HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1441 |
@@ -1116,7 +1116,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1442 |
* Parallel port dot4_channel functions. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1443 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1444 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1445 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_dot4_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1446 |
+enum HPMUD_RESULT pp_dot4_channel_open(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1447 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1448 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1449 |
enum HPMUD_RESULT stat = HPMUD_R_IO_ERROR; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1450 |
@@ -1168,7 +1168,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1451 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1452 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1453 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1454 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) pp_dot4_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1455 |
+enum HPMUD_RESULT pp_dot4_channel_close(mud_channel *pc) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1456 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1457 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1458 |
enum HPMUD_RESULT stat = HPMUD_R_OK; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1459 |
@@ -1208,7 +1208,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1460 |
* Parallel port probe devices, walk the parallel port bus(s) looking for HP products. |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1461 |
*/ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1462 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1463 |
-int __attribute__ ((visibility ("hidden"))) pp_probe_devices(char *lst, int lst_size, int *cnt) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1464 |
+int pp_probe_devices(char *lst, int lst_size, int *cnt) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1465 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1466 |
struct hpmud_model_attributes ma; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1467 |
char dev[HPMUD_LINE_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1468 |
--- hplip-3.10.9-orig/io/hpmud/jd.h Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1469 |
+++ hplip-3.10.9/io/hpmud/jd.h Fri Sep 4 00:58:24 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1470 |
@@ -34,23 +34,23 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1471 |
struct _mud_device; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1472 |
struct _mud_channel; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1473 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1474 |
-extern const char __attribute__ ((visibility ("hidden"))) *kStatusOID; /* device id snmp oid */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1475 |
+extern const char *kStatusOID; /* device id snmp oid */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1476 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1477 |
-extern struct _mud_device_vf __attribute__ ((visibility ("hidden"))) jd_mud_device_vf; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1478 |
+extern struct _mud_device_vf jd_mud_device_vf; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1479 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1480 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_open(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1481 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_close(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1482 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_get_device_id(struct _mud_device *pd, char *buf, int size, int *len); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1483 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_get_device_status(struct _mud_device *pd, unsigned int *status); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1484 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_channel_open(struct _mud_device *pd, const char *sn, HPMUD_CHANNEL *cd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1485 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_channel_close(struct _mud_device *pd, struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1486 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_channel_write(struct _mud_device *pd, struct _mud_channel *pc, const void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1487 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_channel_read(struct _mud_device *pd, struct _mud_channel *pc, void *buf, int length, int timeout, int *bytes_read); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1488 |
+enum HPMUD_RESULT jd_open(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1489 |
+enum HPMUD_RESULT jd_close(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1490 |
+enum HPMUD_RESULT jd_get_device_id(struct _mud_device *pd, char *buf, int size, int *len); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1491 |
+enum HPMUD_RESULT jd_get_device_status(struct _mud_device *pd, unsigned int *status); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1492 |
+enum HPMUD_RESULT jd_channel_open(struct _mud_device *pd, const char *sn, HPMUD_CHANNEL *cd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1493 |
+enum HPMUD_RESULT jd_channel_close(struct _mud_device *pd, struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1494 |
+enum HPMUD_RESULT jd_channel_write(struct _mud_device *pd, struct _mud_channel *pc, const void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1495 |
+enum HPMUD_RESULT jd_channel_read(struct _mud_device *pd, struct _mud_channel *pc, void *buf, int length, int timeout, int *bytes_read); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1496 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1497 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1498 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1499 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_write(struct _mud_channel *pc, const void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1500 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) jd_s_channel_read(struct _mud_channel *pc, void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1501 |
+enum HPMUD_RESULT jd_s_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1502 |
+enum HPMUD_RESULT jd_s_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1503 |
+enum HPMUD_RESULT jd_s_channel_write(struct _mud_channel *pc, const void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1504 |
+enum HPMUD_RESULT jd_s_channel_read(struct _mud_channel *pc, void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1505 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1506 |
#endif // _JD_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1507 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1508 |
--- hplip-3.10.9-orig/io/hpmud/mlc.c Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1509 |
+++ hplip-3.10.9/io/hpmud/mlc.c Fri Sep 4 00:55:47 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1510 |
@@ -26,7 +26,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1511 |
#include "hpmud.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1512 |
#include "hpmudi.h" |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1513 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1514 |
-int __attribute__ ((visibility ("hidden"))) cut_buf(mud_channel *pc, char *buf, int size) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1515 |
+int cut_buf(mud_channel *pc, char *buf, int size) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1516 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1517 |
int len; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1518 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1519 |
@@ -157,7 +157,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1520 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1521 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1522 |
/* Get command from peripheral and processes the reverse command. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1523 |
-int __attribute__ ((visibility ("hidden"))) MlcReverseCmd(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1524 |
+int MlcReverseCmd(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1525 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1526 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1527 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1528 |
@@ -303,7 +303,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1529 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1530 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1531 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1532 |
-int __attribute__ ((visibility ("hidden"))) MlcInit(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1533 |
+int MlcInit(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1534 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1535 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1536 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1537 |
@@ -365,7 +365,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1538 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1539 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1540 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1541 |
-int __attribute__ ((visibility ("hidden"))) MlcExit(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1542 |
+int MlcExit(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1543 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1544 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1545 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1546 |
@@ -400,7 +400,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1547 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1548 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1549 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1550 |
-int __attribute__ ((visibility ("hidden"))) MlcConfigSocket(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1551 |
+int MlcConfigSocket(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1552 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1553 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1554 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1555 |
@@ -446,7 +446,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1556 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1557 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1558 |
/* Write data to peripheral. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1559 |
-int __attribute__ ((visibility ("hidden"))) MlcForwardData(mud_channel *pc, int fd, const void *buf, int size, int usec_timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1560 |
+int MlcForwardData(mud_channel *pc, int fd, const void *buf, int size, int usec_timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1561 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1562 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1563 |
int stat=0, len, n; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1564 |
@@ -477,7 +477,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1565 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1566 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1567 |
/* Read data from peripheral. */ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1568 |
-int __attribute__ ((visibility ("hidden"))) MlcReverseData(mud_channel *pc, int fd, void *buf, int length, int usec_timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1569 |
+int MlcReverseData(mud_channel *pc, int fd, void *buf, int length, int usec_timeout) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1570 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1571 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1572 |
mud_channel *out_of_bound_channel; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1573 |
@@ -610,7 +610,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1574 |
return total; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1575 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1576 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1577 |
-int __attribute__ ((visibility ("hidden"))) MlcOpenChannel(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1578 |
+int MlcOpenChannel(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1579 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1580 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1581 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1582 |
@@ -651,7 +651,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1583 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1584 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1585 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1586 |
-int __attribute__ ((visibility ("hidden"))) MlcCloseChannel(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1587 |
+int MlcCloseChannel(mud_channel *pc, int fd) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1588 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1589 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1590 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1591 |
@@ -688,7 +688,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1592 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1593 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1594 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1595 |
-int __attribute__ ((visibility ("hidden"))) MlcCredit(mud_channel *pc, int fd, unsigned short credit) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1596 |
+int MlcCredit(mud_channel *pc, int fd, unsigned short credit) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1597 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1598 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1599 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1600 |
@@ -728,7 +728,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1601 |
return stat; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1602 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1603 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1604 |
-int __attribute__ ((visibility ("hidden"))) MlcCreditRequest(mud_channel *pc, int fd, unsigned short credit) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1605 |
+int MlcCreditRequest(mud_channel *pc, int fd, unsigned short credit) |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1606 |
{ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1607 |
mud_device *pd = &msp->device[pc->dindex]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1608 |
unsigned char buf[HPMUD_BUFFER_SIZE]; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1609 |
--- hplip-3.10.9-orig/io/hpmud/pml.h Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1610 |
+++ hplip-3.10.9/io/hpmud/pml.h Fri Sep 4 00:53:19 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1611 |
@@ -71,7 +71,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1612 |
PML_DT_UNKNOWN = 0xff |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1613 |
}; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1614 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1615 |
-int __attribute__ ((visibility ("hidden"))) GetSnmp(const char *ip, int port, const char *szoid, void *buffer, unsigned int size, int *type, int *pml_result, int *result); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1616 |
+int GetSnmp(const char *ip, int port, const char *szoid, void *buffer, unsigned int size, int *type, int *pml_result, int *result); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1617 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1618 |
#endif // _PML_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1619 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1620 |
--- hplip-3.10.9-orig/io/hpmud/musb.h Tue Aug 4 16:37:25 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1621 |
+++ hplip-3.10.9/io/hpmud/musb.h Fri Sep 4 00:53:13 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1622 |
@@ -80,38 +80,38 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1623 |
struct _mud_device; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1624 |
struct _mud_channel; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1625 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1626 |
-extern struct _mud_device_vf __attribute__ ((visibility ("hidden"))) musb_mud_device_vf; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1627 |
+extern struct _mud_device_vf musb_mud_device_vf; |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1628 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1629 |
-int __attribute__ ((visibility ("hidden"))) musb_write(int fd, const void *buf, int size, int usec_timout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1630 |
-int __attribute__ ((visibility ("hidden"))) musb_read(int fd, void *buf, int size, int usec_timout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1631 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_open(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1632 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_close(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1633 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_get_device_id(struct _mud_device *pd, char *buf, int size, int *len); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1634 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_get_device_status(struct _mud_device *pd, unsigned int *status); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1635 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_channel_open(struct _mud_device *pd, const char *sn, HPMUD_CHANNEL *cd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1636 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_channel_close(struct _mud_device *pd, struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1637 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_channel_write(struct _mud_device *pd, struct _mud_channel *pc, const void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1638 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_channel_read(struct _mud_device *pd, struct _mud_channel *pc, void *buf, int length, int timeout, int *bytes_read); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1639 |
+int musb_write(int fd, const void *buf, int size, int usec_timout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1640 |
+int musb_read(int fd, void *buf, int size, int usec_timout); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1641 |
+enum HPMUD_RESULT musb_open(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1642 |
+enum HPMUD_RESULT musb_close(struct _mud_device *pd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1643 |
+enum HPMUD_RESULT musb_get_device_id(struct _mud_device *pd, char *buf, int size, int *len); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1644 |
+enum HPMUD_RESULT musb_get_device_status(struct _mud_device *pd, unsigned int *status); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1645 |
+enum HPMUD_RESULT musb_channel_open(struct _mud_device *pd, const char *sn, HPMUD_CHANNEL *cd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1646 |
+enum HPMUD_RESULT musb_channel_close(struct _mud_device *pd, struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1647 |
+enum HPMUD_RESULT musb_channel_write(struct _mud_device *pd, struct _mud_channel *pc, const void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1648 |
+enum HPMUD_RESULT musb_channel_read(struct _mud_device *pd, struct _mud_channel *pc, void *buf, int length, int timeout, int *bytes_read); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1649 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1650 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1651 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1652 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_write(struct _mud_channel *pc, const void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1653 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_raw_channel_read(struct _mud_channel *pc, void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1654 |
+enum HPMUD_RESULT musb_raw_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1655 |
+enum HPMUD_RESULT musb_raw_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1656 |
+enum HPMUD_RESULT musb_raw_channel_write(struct _mud_channel *pc, const void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1657 |
+enum HPMUD_RESULT musb_raw_channel_read(struct _mud_channel *pc, void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1658 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1659 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_comp_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1660 |
+enum HPMUD_RESULT musb_comp_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1661 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1662 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_mlc_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1663 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_mlc_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1664 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_mlc_channel_write(struct _mud_channel *pc, const void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1665 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_mlc_channel_read(struct _mud_channel *pc, void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1666 |
+enum HPMUD_RESULT musb_mlc_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1667 |
+enum HPMUD_RESULT musb_mlc_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1668 |
+enum HPMUD_RESULT musb_mlc_channel_write(struct _mud_channel *pc, const void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1669 |
+enum HPMUD_RESULT musb_mlc_channel_read(struct _mud_channel *pc, void *buf, int length, int timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1670 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1671 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_dot4_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1672 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_dot4_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1673 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_dot4_channel_write(struct _mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1674 |
-enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) musb_dot4_channel_read(struct _mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1675 |
+enum HPMUD_RESULT musb_dot4_channel_open(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1676 |
+enum HPMUD_RESULT musb_dot4_channel_close(struct _mud_channel *pc); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1677 |
+enum HPMUD_RESULT musb_dot4_channel_write(struct _mud_channel *pc, const void *buf, int length, int sec_timeout, int *bytes_wrote); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1678 |
+enum HPMUD_RESULT musb_dot4_channel_read(struct _mud_channel *pc, void *buf, int length, int sec_timeout, int *bytes_read); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1679 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1680 |
-int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int lst_size, int *cnt); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1681 |
-int __attribute__ ((visibility ("hidden"))) power_up(struct _mud_device *pd, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1682 |
+int musb_probe_devices(char *lst, int lst_size, int *cnt); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1683 |
+int power_up(struct _mud_device *pd, int fd); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1684 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1685 |
#endif // _MUSB_H |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1686 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1687 |
--- hplip-3.10.9/prnt/hpijs/hpijsfax.cpp.orig Thu Oct 1 14:09:21 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1688 |
+++ hplip-3.10.9/prnt/hpijs/hpijsfax.cpp Thu Oct 1 14:09:39 2009 |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1689 |
@@ -587,7 +587,7 @@ |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1690 |
ijs_server_done (ctx); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1691 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1692 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1693 |
- exit(status); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1694 |
+ return(status); |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1695 |
} |
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1696 |
|
111c46cade93
7018146 move hplip to userland
sonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>
parents:
diff
changeset
|
1697 |
// GrayLevel = (5/16)R + (9/16)G + (2/16)B |