1 | --- io/hpmud/hpmud.c.orig 2011-07-06 19:14:07.000000000 +0200 |
---|
2 | +++ io/hpmud/hpmud.c 2011-07-06 19:16:49.000000000 +0200 |
---|
3 | @@ -35,7 +35,7 @@ |
---|
4 | /* |
---|
5 | * sysdump() originally came from http://sws.dett.de/mini/hexdump-c , steffen@dett.de . |
---|
6 | */ |
---|
7 | -void __attribute__ ((visibility ("hidden"))) sysdump(const void *data, int size) |
---|
8 | +void __attribute__ ((visibility ("hidden"))) sysdumpr(const void *data, int size) |
---|
9 | { |
---|
10 | /* Dump size bytes of *data. Output looks like: |
---|
11 | * [0000] 75 6E 6B 6E 6F 77 6E 20 30 FF 00 00 00 00 39 00 unknown 0.....9. |
---|
12 | --- io/hpmud/hpmudi.h.orig 2010-12-19 22:15:45.000000000 +0100 |
---|
13 | +++ io/hpmud/hpmudi.h 2010-12-19 22:16:07.000000000 +0100 |
---|
14 | @@ -69,7 +69,7 @@ |
---|
15 | #ifdef HPMUD_DEBUG |
---|
16 | #define DBG(args...) syslog(LOG_INFO, __FILE__ " " STRINGIZE(__LINE__) ": " args) |
---|
17 | // #define DBG(args...) fprintf(stderr, __FILE__ " " STRINGIZE(__LINE__) ": " args) |
---|
18 | - #define DBG_DUMP(data, size) sysdump((data), (size)) |
---|
19 | + #define DBG_DUMP(data, size) sysdumpr((data), (size)) |
---|
20 | #define DBG_SZ(args...) syslog(LOG_INFO, args) |
---|
21 | #else |
---|
22 | #define DBG(args...) |
---|
23 | @@ -199,7 +199,7 @@ |
---|
24 | |
---|
25 | extern mud_session *msp __attribute__ ((visibility ("hidden"))); |
---|
26 | |
---|
27 | -void __attribute__ ((visibility ("hidden"))) sysdump(const void *data, int size); |
---|
28 | +void __attribute__ ((visibility ("hidden"))) sysdumpr(const void *data, int size); |
---|
29 | int __attribute__ ((visibility ("hidden"))) mm_device_lock(int fd, HPMUD_DEVICE index); |
---|
30 | int __attribute__ ((visibility ("hidden"))) mm_device_unlock(int fd, HPMUD_DEVICE index); |
---|
31 | int __attribute__ ((visibility ("hidden"))) mm_device_trylock(int fd, HPMUD_DEVICE index); |
---|
32 | @@ -209,8 +209,8 @@ |
---|
33 | int __attribute__ ((visibility ("hidden"))) get_uri_model(const char *uri, char *buf, int bufSize); |
---|
34 | int __attribute__ ((visibility ("hidden"))) get_uri_serial(const char *uri, char *buf, int bufSize); |
---|
35 | enum HPMUD_RESULT __attribute__ ((visibility ("hidden"))) service_to_channel(mud_device *pd, const char *sn, HPMUD_CHANNEL *index); |
---|
36 | -int (*getSIData)(char **pData , int *pDataLen, char **pModeSwitch, int *pModeSwitchLen); |
---|
37 | -void (*freeSIData)(char *pData, char *pModeSwitch); |
---|
38 | +//int (*getSIData)(char **pData , int *pDataLen, char **pModeSwitch, int *pModeSwitchLen); |
---|
39 | +//void (*freeSIData)(char *pData, char *pModeSwitch); |
---|
40 | |
---|
41 | #endif // _HPMUDI_H |
---|
42 | |
---|
43 | --- io/hpmud/musb.h.orig 2012-09-25 23:51:25.000000000 +0200 |
---|
44 | +++ io/hpmud/musb.h 2012-09-25 23:51:54.000000000 +0200 |
---|
45 | @@ -30,7 +30,7 @@ |
---|
46 | #ifdef HAVE_LIBUSB01 |
---|
47 | #include <usb.h> |
---|
48 | #else |
---|
49 | -#include <libusb.h> |
---|
50 | +#include <libusb-1.0/libusb.h> |
---|
51 | #endif |
---|
52 | |
---|
53 | #include "hpmud.h" |
---|