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