1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
--- baycomusb-0.10.orig/Makefile.am
+++ baycomusb-0.10/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = intl po firmware fpga directx kerneldrv wdmdrv misc usbdrv trxapi \
- trxctrl flexdrv trxclient winserv diag trxapp coinstaller
+SUBDIRS = firmware fpga directx kerneldrv wdmdrv misc usbdrv trxapi \
+ flexdrv winserv diag coinstaller
INCLUDES = $(GTK_CFLAGS) -DCONFIGDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" \
-I$(top_srcdir) -I$(top_srcdir)/directx/include -I$(top_srcdir)/directx/include/directx6
--- baycomusb-0.10.orig/baycomusb.initscript
+++ baycomusb-0.10/baycomusb.initscript
@@ -25,7 +25,7 @@
RETVAL=0
-function start()
+start()
{
rm -f /var/hamradio/transceivers/*
#/sbin/modprobe baycom_usb
@@ -36,7 +36,7 @@ function start()
[ "$RETVAL" = 0 ] && touch /var/lock/subsys/baycomusb
}
-function stop()
+stop()
{
echo -n "Stopping baycomusbserv:"
killproc /usr/sbin/baycomusbserv
--- baycomusb-0.10.orig/firmware/ihex2hdr.c
+++ baycomusb-0.10/firmware/ihex2hdr.c
@@ -121,6 +121,7 @@ int main(int argc, char *argv[])
}
memcpy(mem+u, buf+4, buf[0]);
nextline:
+ continue;
}
fclose(fin);
strftime(buf, sizeof(buf), "%Y%m%d", localtime(&tm));
--- baycomusb-0.10.orig/flexdrv/Makefile.am
+++ baycomusb-0.10/flexdrv/Makefile.am
@@ -6,6 +6,8 @@ INCLUDES = @ORBIT_CFLAGS@ -I$(top_srcdir
noinst_DATA = libtrxapi.a libusb.a
+CLEANFILES = libtrxapi.a libusb.a
+
if WIN32
if DIRECTX
--- baycomusb-0.10.orig/trxapi/server.c
+++ baycomusb-0.10/trxapi/server.c
@@ -54,8 +54,8 @@
typedef struct trx_thread_state impl_POA_Trx_Control;
-static CORBA_ORB orb;
-static PortableServer_POA poa;
+CORBA_ORB orb;
+PortableServer_POA poa;
/* --------------------------------------------------------------------- */
--- baycomusb-0.10.orig/trxclient/client.c
+++ baycomusb-0.10/trxclient/client.c
@@ -45,8 +45,6 @@
/* --------------------------------------------------------------------- */
-static unsigned int verboselevel = 0;
-
#if defined(WIN32)
#define UINT64_FORMAT "I64u"
#else
--- baycomusb-0.10.orig/usbdrv/usbdevice_fs.h
+++ baycomusb-0.10/usbdrv/usbdevice_fs.h
@@ -90,11 +90,9 @@ struct usbdevfs_connectinfo {
unsigned char slow;
};
-#define USBDEVFS_USB_DISABLE_SPD 0x0001
-#define USBDEVFS_USB_ISO_ASAP 0x0002
-#define USBDEVFS_USB_QUEUE_BULK 0x0010
-#define USBDEVFS_USB_NO_FSBR 0x0020
-#define USBDEVFS_USB_ZERO_PACKET 0x0040
+
+#define USBDEVFS_URB_SHORT_NOT_OK 1
+#define USBDEVFS_URB_ISO_ASAP 2
#define USBDEVFS_URB_TYPE_ISO 0
#define USBDEVFS_URB_TYPE_INTERRUPT 1
|
