summaryrefslogtreecommitdiff
path: root/package/madwifi/patches/102-multicall_binary.patch
blob: 3fa40eb708b0d4c386cb6f8047250b7aefd5bd92 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
Index: madwifi-trunk-r3314/tools/80211debug.c
===================================================================
--- madwifi-trunk-r3314.orig/tools/80211debug.c	2008-05-19 13:58:46.000000000 +0200
+++ madwifi-trunk-r3314/tools/80211debug.c	2008-05-19 14:15:10.000000000 +0200
@@ -48,6 +48,7 @@
 #include <ctype.h>
 #include <getopt.h>
 #include <err.h>
+#include "do_multi.h"
 
 #undef ARRAY_SIZE
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
@@ -185,7 +186,7 @@
 #endif /* __linux__ */
 
 int
-main(int argc, char *argv[])
+CMD(a80211debug)(int argc, char *argv[])
 {
 	const char *ifname = "ath0";
 	const char *cp, *tp;
Index: madwifi-trunk-r3314/tools/80211stats.c
===================================================================
--- madwifi-trunk-r3314.orig/tools/80211stats.c	2008-05-19 13:58:46.000000000 +0200
+++ madwifi-trunk-r3314/tools/80211stats.c	2008-05-19 14:16:17.000000000 +0200
@@ -59,6 +59,7 @@
 #include "net80211/ieee80211.h"
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
+#include "do_multi.h"
 
 #ifndef SIOCG80211STATS
 #define	SIOCG80211STATS	(SIOCDEVPRIVATE + 2)
@@ -240,7 +241,7 @@
 }
 
 int
-main(int argc, char *argv[])
+CMD(a80211stats)(int argc, char *argv[])
 {
 	int c, len;
 	struct ieee80211req_sta_info *si;
Index: madwifi-trunk-r3314/tools/athchans.c
===================================================================
--- madwifi-trunk-r3314.orig/tools/athchans.c	2008-05-19 13:58:46.000000000 +0200
+++ madwifi-trunk-r3314/tools/athchans.c	2008-05-19 14:15:28.000000000 +0200
@@ -58,6 +58,7 @@
 #include "net80211/ieee80211.h"
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
+#include "do_multi.h"
 
 static	int s = -1;
 static const char *progname;
@@ -140,8 +141,9 @@
 }
 
 #define	MAXCHAN	((int)(sizeof(struct ieee80211req_chanlist) * NBBY))
+
 int
-main(int argc, char *argv[])
+CMD(athchans)(int argc, char *argv[])
 {
 	const char *ifname = "wifi0";
 	struct ieee80211req_chanlist chanlist;
Index: madwifi-trunk-r3314/tools/athctrl.c
===================================================================
--- madwifi-trunk-r3314.orig/tools/athctrl.c	2008-05-19 13:58:46.000000000 +0200
+++ madwifi-trunk-r3314/tools/athctrl.c	2008-05-19 14:15:44.000000000 +0200
@@ -52,6 +52,7 @@
 #include <err.h>
 
 #include <net/if.h>
+#include "do_multi.h"
 
 static int
 setsysctrl(const char *dev, const char *control , u_long value)
@@ -88,7 +89,7 @@
 }
 
 int
-main(int argc, char *argv[])
+CMD(athctrl)(int argc, char *argv[])
 {
 	char device[IFNAMSIZ + 1];
 	int distance = -1;
Index: madwifi-trunk-r3314/tools/athdebug.c
===================================================================
--- madwifi-trunk-r3314.orig/tools/athdebug.c	2008-05-19 13:58:46.000000000 +0200
+++ madwifi-trunk-r3314/tools/athdebug.c	2008-05-19 14:15:59.000000000 +0200
@@ -51,6 +51,7 @@
 #include <ctype.h>
 #include <getopt.h>
 #include <err.h>
+#include "do_multi.h"
 
 #undef ARRAY_SIZE
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
@@ -194,7 +195,7 @@
 #endif /* __linux__ */
 
 int
-main(int argc, char *argv[])
+CMD(athdebug)(int argc, char *argv[])
 {
 #ifdef __linux__
 	const char *ifname = "wifi0";
Index: madwifi-trunk-r3314/tools/athkey.c
===================================================================
--- madwifi-trunk-r3314.orig/tools/athkey.c	2008-05-19 13:58:46.000000000 +0200
+++ madwifi-trunk-r3314/tools/athkey.c	2008-05-19 14:13:06.000000000 +0200
@@ -58,6 +58,7 @@
 #include "net80211/ieee80211.h"
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
+#include "do_multi.h"
 
 static int s = -1;
 static const char *progname;
@@ -213,8 +214,7 @@
 	exit(-1);
 }
 
-int
-main(int argc, char *argv[])
+int CMD(athkey)(int argc, char *argv[])
 {
 	const char *ifname = "wifi0";
 	struct ieee80211req_key setkey;
Index: madwifi-trunk-r3314/tools/athstats.c
===================================================================
--- madwifi-trunk-r3314.orig/tools/athstats.c	2008-05-19 13:58:46.000000000 +0200
+++ madwifi-trunk-r3314/tools/athstats.c	2008-05-19 14:13:44.000000000 +0200
@@ -65,6 +65,7 @@
 
 #undef ARRAY_SIZE
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#include "do_multi.h"
 
 static const struct {
 	u_int		phyerr;
@@ -228,7 +229,7 @@
 }
 
 int
-main(int argc, char *argv[])
+CMD(athstats)(int argc, char *argv[])
 {
 #ifdef __linux__
 	const char *ifname = "wifi0";
Index: madwifi-trunk-r3314/tools/do_multi.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ madwifi-trunk-r3314/tools/do_multi.c	2008-05-19 14:56:28.000000000 +0200
@@ -0,0 +1,32 @@
+#include <string.h>
+#include "do_multi.h"
+
+int
+main(int argc, char *argv[])
+{
+    char *progname;
+    int ret = 0;
+
+    progname = basename(argv[0]);
+
+    if(strcmp(progname, "80211debug") == 0)
+	ret = a80211debug_init(argc, argv);
+    if(strcmp(progname, "80211stats") == 0)
+	ret = a80211stats_init(argc, argv);
+    if(strcmp(progname, "athchans") == 0)
+	ret = athchans_init(argc, argv);
+    if(strcmp(progname, "athctrl") == 0)
+	ret =  athctrl_init(argc, argv);
+    if(strcmp(progname, "athdebug") == 0)
+	ret =  athdebug_init(argc, argv);
+    if(strcmp(progname, "athkey") == 0)
+	ret =  athkey_init(argc, argv);
+    if(strcmp(progname, "athstats") == 0)
+	ret =  athstats_init(argc, argv);
+    if(strcmp(progname, "wlanconfig") == 0)
+	ret =  wlanconfig_init(argc, argv);
+    if(strcmp(progname, "ath_info") == 0)
+	ret =  athinfo_init(argc, argv);
+
+    return ret;
+}
Index: madwifi-trunk-r3314/tools/do_multi.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ madwifi-trunk-r3314/tools/do_multi.h	2008-05-19 14:42:44.000000000 +0200
@@ -0,0 +1,15 @@
+#ifdef DO_MULTI
+int a80211debug_init(int argc, char *argv[]);
+int a80211stats_init(int argc, char *argv[]);
+int athchans_init(int argc, char *argv[]);
+int athctrl_init(int argc, char *argv[]);
+int athdebug_init(int argc, char *argv[]);
+int athkey_init(int argc, char *argv[]);
+int athstats_init(int argc, char *argv[]);
+int wlanconfig_init(int argc, char *argv[]);
+int athinfo_init(int argc, char *argv[]);
+
+#define CMD(name) name##_init
+#else
+#define CMD(name) main
+#endif
Index: madwifi-trunk-r3314/tools/Makefile
===================================================================
--- madwifi-trunk-r3314.orig/tools/Makefile	2008-05-19 13:58:46.000000000 +0200
+++ madwifi-trunk-r3314/tools/Makefile	2008-05-19 14:56:55.000000000 +0200
@@ -46,56 +46,55 @@
 HAL=   $(TOP)/hal
 endif
 
+all: compile
 
-ALL=	athstats 80211stats athkey athchans athctrl \
+ALLPROGS=	athstats 80211stats athkey athchans athctrl \
 	athdebug 80211debug wlanconfig ath_info
 
-all:	$(ALL)
+OBJS=	$(patsubst %,%.o,$(ALLPROGS))
 
-INCS=	-I. -I$(HAL) -I$(TOP) -I$(ATH_HAL)
+INCS=	-I. -I../ath -I$(HAL) -I$(TOP) -I$(ATH_HAL)
 CFLAGS=	-g -O2 -Wall
 ALL_CFLAGS= $(CFLAGS) $(INCS)
 LDFLAGS=
 
-all:	$(ALL)
 
-athstats: athstats.c
-	$(CC) -o athstats $(ALL_CFLAGS) -I$(TOP)/ath $(LDFLAGS) athstats.c
-80211stats: 80211stats.c
-	$(CC) -o 80211stats $(ALL_CFLAGS) $(LDFLAGS) 80211stats.c
-athkey: athkey.c
-	$(CC) -o athkey $(ALL_CFLAGS) $(LDFLAGS) athkey.c
-athchans: athchans.c
-	$(CC) -o athchans $(ALL_CFLAGS) $(LDFLAGS) athchans.c
-athctrl: athctrl.c
-	$(CC) -o athctrl $(ALL_CFLAGS) $(LDFLAGS) athctrl.c
-athdebug: athdebug.c
-	$(CC) -o athdebug $(ALL_CFLAGS) $(LDFLAGS) athdebug.c
-wlanconfig: wlanconfig.c
-	$(CC) -o wlanconfig $(ALL_CFLAGS) $(LDFLAGS) wlanconfig.c
-80211debug: 80211debug.c
-	$(CC) -o 80211debug $(ALL_CFLAGS) $(LDFLAGS) 80211debug.c
-ath_info: ath_info.c
-	$(CC) -o ath_info $(CFLAGS) ath_info.c
+ifneq ($(DO_MULTI),)
+ALL_CFLAGS += -DDO_MULTI=1
+%.o: %.c
+	${CC} $(ALL_CFLAGS) -c -o $@  $<
+
+madwifi_multi: $(OBJS) do_multi.o
+	$(CC) -o $@ $^
+
+compile: madwifi_multi
+	for i in $(ALLPROGS); do \
+		ln -s -f madwifi_multi $$i; \
+	done
+else
+$(ALLPROGS):
+	$(CC) $(ALL_CFLAGS) -o $@ $@.c
+
+compile: $(ALLPROGS)
+endif
 
 
 install: $(ALL) 
 	install -d $(DESTDIR)$(BINDIR)
-	for i in $(ALL); do \
+	for i in $(ALLPROGS) $(if $(DO_MULTI),madwifi_multi); do \
 		install $$i $(DESTDIR)$(BINDIR)/$$i; \
-		$(STRIP) $(DESTDIR)$(BINDIR)/$$i; \
 	done
 	install -d $(DESTDIR)$(MANDIR)/man8
 	install -m 0644 man/*.8 $(DESTDIR)$(MANDIR)/man8
 	install $(TOP)/scripts/madwifi-unload $(DESTDIR)$(BINDIR)/madwifi-unload
 
 uninstall:
-	for i in $(ALL); do \
+	for i in $(ALLPROGS) $(if $(DO_MULTI),madwifi_multi); do \
 		rm -f $(DESTDIR)$(BINDIR)/$$i; \
 	done
-	for i in $(ALL:=.8); do \
-		rm -f $(DESTDIR)$(MANDIR)/man8/$$i; \
+	for i in $(ALLPROGS); do \
+		rm -f $(DESTDIR)$(MANDIR)/man8/$$i.8; \
 	done
 
 clean:
-	rm -f $(ALL) core a.out
+	rm -f $(ALLPROGS) madwifi_multi *.o core a.out
Index: madwifi-trunk-r3314/tools/wlanconfig.c
===================================================================
--- madwifi-trunk-r3314.orig/tools/wlanconfig.c	2008-05-19 13:58:46.000000000 +0200
+++ madwifi-trunk-r3314/tools/wlanconfig.c	2008-05-19 14:14:07.000000000 +0200
@@ -61,6 +61,7 @@
 #include "net80211/ieee80211.h"
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
+#include "do_multi.h"
 
 /*
  * These are taken from ieee80211_node.h
@@ -100,7 +101,7 @@
 static int verbose = 0;
 
 int
-main(int argc, char *argv[])
+CMD(wlanconfig)(int argc, char *argv[])
 {
 	const char *ifname, *cmd;
 	unsigned char bnounit = 0;
Index: madwifi-trunk-r3314/tools/ath_info.c
===================================================================
--- madwifi-trunk-r3314.orig/tools/ath_info.c	2008-05-19 13:58:46.000000000 +0200
+++ madwifi-trunk-r3314/tools/ath_info.c	2008-05-19 14:44:45.000000000 +0200
@@ -98,6 +98,7 @@
 #include <sys/mman.h>
 #include <endian.h>
 #include <byteswap.h>
+#include "do_multi.h"
 
 #undef ARRAY_SIZE
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
@@ -738,7 +739,8 @@
 		"unlawful radio transmissions!\n\n");
 }
 
-int main(int argc, char *argv[])
+int
+CMD(athinfo)(int argc, char *argv[])
 {
 	u_int32_t dev_addr;
 	u_int16_t eeprom_header, srev, phy_rev_5ghz, phy_rev_2ghz;