diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2020-02-20 18:52:35 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-02-20 15:32:27 -0800 |
commit | 7449a3e08389a0c50cdf17bc16995ef1678dc2d2 (patch) | |
tree | eafa9cd22721cedce9ba4cb7ca1cb2a41e800121 | |
parent | 6902dcd2edc3a08f6929e19e9a9c18493883f9d2 (diff) | |
download | meta-openembedded-7449a3e08389a0c50cdf17bc16995ef1678dc2d2.tar.gz |
s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: remove old recipes
* I don't expect anyone nowadays actually using these recipes which I've
imported from meta-smartphone in 2011.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 files changed, 4 insertions, 851 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index d2e8ea4af..0bda9469f 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |||
@@ -254,13 +254,13 @@ RDEPENDS_packagegroup-meta-oe-support ="\ | |||
254 | multipath-tools nano neon nmon numactl onig openct openldap \ | 254 | multipath-tools nano neon nmon numactl onig openct openldap \ |
255 | opensc wbxml2 p910nd pcsc-lite picocom libotr pidgin \ | 255 | opensc wbxml2 p910nd pcsc-lite picocom libotr pidgin \ |
256 | pngcheck poco poppler poppler-data portaudio-v19 pps-tools \ | 256 | pngcheck poco poppler poppler-data portaudio-v19 pps-tools \ |
257 | pv pxaregs raptor2 rdfind read-edid rsnapshot s3c24xx-gpio s3c64xx-gpio \ | 257 | pv pxaregs raptor2 rdfind read-edid rsnapshot \ |
258 | sjf2410-linux-native satyr sdparm pty-forward-native serial-forward \ | 258 | satyr sdparm pty-forward-native serial-forward \ |
259 | sg3-utils sharutils smem spitools srecord ssiapi stm32flash \ | 259 | sg3-utils sharutils smem spitools srecord ssiapi stm32flash \ |
260 | syslog-ng system-config-keyboard tbb thin-provisioning-tools tokyocabinet \ | 260 | syslog-ng system-config-keyboard tbb thin-provisioning-tools tokyocabinet \ |
261 | tree uhubctl unixodbc uriparser usb-modeswitch \ | 261 | tree uhubctl unixodbc uriparser usb-modeswitch \ |
262 | usb-modeswitch-data usbpath uthash utouch-evemu utouch-frame \ | 262 | usb-modeswitch-data uthash utouch-evemu utouch-frame \ |
263 | vim vim-tiny websocketpp wmiconfig xdelta3 xdg-user-dirs xmlstarlet \ | 263 | vim vim-tiny websocketpp xdelta3 xdg-user-dirs xmlstarlet \ |
264 | zbar zile \ | 264 | zbar zile \ |
265 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis toscoterm uim synergy utouch-mtview links-x11 fltk pidgin-otr", "", d)} \ | 265 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis toscoterm uim synergy utouch-mtview links-x11 fltk pidgin-otr", "", d)} \ |
266 | libcanberra \ | 266 | libcanberra \ |
diff --git a/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch b/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch deleted file mode 100644 index 4e6c25041..000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/files/0001-ppt.c-Do-not-include-sys-io.h.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From fd244ae648789591f0fb79e74d2b8f6c5b15d6e8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 6 Aug 2019 00:47:14 +0000 | ||
4 | Subject: [PATCH] ppt.c: Do not include sys/io.h | ||
5 | |||
6 | newer versions of glibc has removed it | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | ppt.c | 1 - | ||
12 | 1 file changed, 1 deletion(-) | ||
13 | |||
14 | diff --git a/ppt.c b/ppt.c | ||
15 | index 0bae2d0..0ef279f 100644 | ||
16 | --- a/ppt.c | ||
17 | +++ b/ppt.c | ||
18 | @@ -5,7 +5,6 @@ | ||
19 | #else | ||
20 | #include <unistd.h> | ||
21 | #include <stdlib.h> | ||
22 | -#include <sys/io.h> | ||
23 | #include <linux/parport.h> | ||
24 | #include <linux/ppdev.h> | ||
25 | #include <sys/ioctl.h> | ||
26 | -- | ||
27 | 2.17.1 | ||
28 | |||
diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb deleted file mode 100644 index 98573a062..000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" | ||
2 | SECTION = "console/utils" | ||
3 | AUTHOR = "Werner Almesberger <werner@openmoko.org>" | ||
4 | LICENSE = "GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://gpio.c;endline=12;md5=cfb91c686857b2e60852b4925d90a3e1" | ||
6 | PV = "1.0+git${SRCPV}" | ||
7 | |||
8 | SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" | ||
9 | SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" | ||
10 | S = "${WORKDIR}/gpio" | ||
11 | |||
12 | CLEANBROKEN = "1" | ||
13 | |||
14 | do_compile() { | ||
15 | ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio.c | ||
16 | } | ||
17 | |||
18 | do_install() { | ||
19 | install -d ${D}${sbindir} | ||
20 | install -m 0755 ${PN} ${D}${sbindir} | ||
21 | } | ||
diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb deleted file mode 100644 index 99781718c..000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c64xx platform" | ||
2 | SECTION = "console/utils" | ||
3 | AUTHOR = "Werner Almesberger <werner@openmoko.org>" | ||
4 | LICENSE = "GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://gpio-s3c6410.c;endline=12;md5=060cda1be945ad9194593f11d56d55c7" | ||
6 | PV = "1.0+git${SRCPV}" | ||
7 | |||
8 | SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" | ||
9 | SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" | ||
10 | S = "${WORKDIR}/gpio" | ||
11 | |||
12 | CLEANBROKEN = "1" | ||
13 | |||
14 | do_compile() { | ||
15 | ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio-s3c6410.c | ||
16 | } | ||
17 | |||
18 | do_install() { | ||
19 | install -d ${D}${sbindir} | ||
20 | install -m 0755 ${PN} ${D}${sbindir} | ||
21 | } | ||
diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb deleted file mode 100644 index 283740396..000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | SUMMARY = "JTAG utility to interface w/ a S3C2410 device" | ||
2 | SECTION = "devel" | ||
3 | AUTHOR = "Harald Welte <laforge@openmoko.org>" | ||
4 | LICENSE = "GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://parport.c;endline=19;md5=b5681091b0fd8c5f7068835c441bf0c8" | ||
6 | PV = "1.0+git${SRCPV}" | ||
7 | |||
8 | SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" | ||
9 | SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/sjf2410-linux \ | ||
10 | file://0001-ppt.c-Do-not-include-sys-io.h.patch \ | ||
11 | " | ||
12 | S = "${WORKDIR}/sjf2410-linux" | ||
13 | |||
14 | inherit native deploy | ||
15 | |||
16 | CFLAGS += "-DLINUX_PPDEV" | ||
17 | |||
18 | do_compile() { | ||
19 | oe_runmake | ||
20 | } | ||
21 | |||
22 | do_install() { | ||
23 | install -d ${D}/${bindir} | ||
24 | install -m 0755 sjf2410 ${D}/${bindir} | ||
25 | } | ||
26 | |||
27 | do_deploy() { | ||
28 | install -m 0755 sjf2410 ${DEPLOYDIR}/sjf2410-${PV} | ||
29 | } | ||
30 | |||
31 | addtask deploy before do_build after do_install | ||
32 | |||
33 | do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" | ||
34 | # cleandirs should possibly be in deploy.bbclass but we need it | ||
35 | do_deploy[cleandirs] = "${DEPLOYDIR}" | ||
36 | # clear stamp-extra-info since MACHINE_ARCH is normally put there by | ||
37 | # deploy.bbclass | ||
38 | do_deploy[stamp-extra-info] = "" | ||
39 | |||
diff --git a/meta-oe/recipes-support/usbpath/usbpath/configure.patch b/meta-oe/recipes-support/usbpath/usbpath/configure.patch deleted file mode 100644 index 271e6a53a..000000000 --- a/meta-oe/recipes-support/usbpath/usbpath/configure.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | Index: usbpath/configure.ac | ||
2 | =================================================================== | ||
3 | --- usbpath.orig/configure.ac 2014-07-17 20:40:26.000000000 +0000 | ||
4 | +++ usbpath/configure.ac 2014-07-18 07:01:40.933474420 +0000 | ||
5 | @@ -1,5 +1,5 @@ | ||
6 | AC_INIT([usbpath],[0.1]) | ||
7 | -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) | ||
8 | +AM_INIT_AUTOMAKE([foreign]) | ||
9 | |||
10 | AC_PROG_CC | ||
11 | AC_PROG_RANLIB | ||
diff --git a/meta-oe/recipes-support/usbpath/usbpath_git.bb b/meta-oe/recipes-support/usbpath/usbpath_git.bb deleted file mode 100644 index a3c75901f..000000000 --- a/meta-oe/recipes-support/usbpath/usbpath_git.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "Convert the physical locations of a USB device to/from its number" | ||
2 | AUTHOR = "Werner Almesberger <werner@openmoko.org>" | ||
3 | SECTION = "console/utils" | ||
4 | LICENSE = "GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://usbpath.c;endline=20;md5=0aa8c7d2af9110c78a99fbf9a504dc3f" | ||
6 | DEPENDS = "virtual/libusb0" | ||
7 | DEPENDS_class-native = "virtual/libusb0-native" | ||
8 | |||
9 | BBCLASSEXTEND = "native" | ||
10 | |||
11 | PV = "1.0+git${SRCPV}" | ||
12 | |||
13 | SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" | ||
14 | SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/usbpath \ | ||
15 | file://configure.patch \ | ||
16 | " | ||
17 | S = "${WORKDIR}/usbpath" | ||
18 | |||
19 | inherit autotools pkgconfig | ||
20 | |||
21 | RDEPENDS_${PN} += "perl" | ||
diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch b/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch deleted file mode 100644 index 90eff5bb0..000000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 0378cbb323c662a565f7f3de2dee3d8a646e7bd1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 27 Jun 2017 09:32:42 -0700 | ||
4 | Subject: [PATCH 1/2] makefile: Pass CFLAGS to compile | ||
5 | |||
6 | Set CC if not already set | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | host/tools/wmiconfig/Makefile | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/host/tools/wmiconfig/Makefile b/host/tools/wmiconfig/Makefile | ||
14 | index c6738c5..3253a7e 100644 | ||
15 | --- a/Makefile | ||
16 | +++ b/Makefile | ||
17 | @@ -1,4 +1,4 @@ | ||
18 | -CC :=$(ATH_CROSS_COMPILE_TYPE)gcc | ||
19 | +CC ?= $(ATH_CROSS_COMPILE_TYPE)gcc | ||
20 | |||
21 | all: | ||
22 | - $(CC) -Wall -DUSER_KEYS -g $(LDFLAGS) -I../../include -I../../../include -I../../wlan/include -I../../os/linux/include wmiconfig.c -o wmiconfig | ||
23 | + $(CC) -Wall -DUSER_KEYS -g $(CFLAGS) $(LDFLAGS) -I../../include -I../../../include -I../../wlan/include -I../../os/linux/include wmiconfig.c -o wmiconfig | ||
24 | -- | ||
25 | 2.13.2 | ||
26 | |||
diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch b/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch deleted file mode 100644 index f67f784c1..000000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch +++ /dev/null | |||
@@ -1,656 +0,0 @@ | |||
1 | From 909ebdde4ee2233d65de8fa01fde8e9a3bec12b7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 27 Jun 2017 09:33:26 -0700 | ||
4 | Subject: [PATCH 2/2] fix err() API to have format string | ||
5 | |||
6 | Fixes errors with hardening flags | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | host/tools/wmiconfig/wmiconfig.c | 148 +++++++++++++++++++-------------------- | ||
11 | 1 file changed, 74 insertions(+), 74 deletions(-) | ||
12 | |||
13 | diff --git a/host/tools/wmiconfig/wmiconfig.c b/host/tools/wmiconfig/wmiconfig.c | ||
14 | index 21c9dcd..a6ec481 100644 | ||
15 | --- a/wmiconfig.c | ||
16 | +++ b/wmiconfig.c | ||
17 | @@ -483,7 +483,7 @@ main (int argc, char **argv) | ||
18 | strcpy(ifname, ethIf); | ||
19 | s = socket(AF_INET, SOCK_DGRAM, 0); | ||
20 | if (s < 0) { | ||
21 | - err(1, "socket"); | ||
22 | + err(1, "%s", "socket"); | ||
23 | } | ||
24 | |||
25 | while (1) { | ||
26 | @@ -1506,28 +1506,28 @@ main (int argc, char **argv) | ||
27 | ifr.ifr_data = (void *)filterCmd; | ||
28 | if (ioctl(s, AR6000_IOCTL_WMI_SETBSSFILTER, &ifr) < 0) | ||
29 | { | ||
30 | - err(1, ifr.ifr_name); | ||
31 | + err(1, "%s", ifr.ifr_name); | ||
32 | } | ||
33 | break; | ||
34 | case WMI_SET_POWER_MODE: | ||
35 | ifr.ifr_data = (void *)pwrCmd; | ||
36 | if (ioctl(s, AR6000_IOCTL_WMI_SETPWR, &ifr) < 0) | ||
37 | { | ||
38 | - err(1, ifr.ifr_name); | ||
39 | + err(1, "%s", ifr.ifr_name); | ||
40 | } | ||
41 | break; | ||
42 | case WMI_SET_PM_PARAMS: | ||
43 | ifr.ifr_data = (void *)pmParamCmd; | ||
44 | if (ioctl(s, AR6000_IOCTL_WMI_SET_PMPARAMS, &ifr) < 0) | ||
45 | { | ||
46 | - err(1, ifr.ifr_name); | ||
47 | + err(1, "%s", ifr.ifr_name); | ||
48 | } | ||
49 | break; | ||
50 | case WMI_SET_IBSS_PM_CAPS: | ||
51 | ifr.ifr_data = (void *)adhocPmCmd; | ||
52 | if (ioctl(s, AR6000_IOCTL_WMI_SET_IBSS_PM_CAPS, &ifr) < 0) | ||
53 | { | ||
54 | - err(1, ifr.ifr_name); | ||
55 | + err(1, "%s", ifr.ifr_name); | ||
56 | } | ||
57 | break; | ||
58 | case WMI_SET_ERROR_DETECTION: | ||
59 | @@ -1535,7 +1535,7 @@ main (int argc, char **argv) | ||
60 | ifr.ifr_data = buf; | ||
61 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
62 | { | ||
63 | - err(1, ifr.ifr_name); | ||
64 | + err(1, "%s", ifr.ifr_name); | ||
65 | } | ||
66 | break; | ||
67 | case WMI_GET_HB_CHALLENGE_RESP: | ||
68 | @@ -1543,7 +1543,7 @@ main (int argc, char **argv) | ||
69 | ifr.ifr_data = buf; | ||
70 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
71 | { | ||
72 | - err(1, ifr.ifr_name); | ||
73 | + err(1, "%s", ifr.ifr_name); | ||
74 | } | ||
75 | break; | ||
76 | #ifdef USER_KEYS | ||
77 | @@ -1554,7 +1554,7 @@ main (int argc, char **argv) | ||
78 | |||
79 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
80 | { | ||
81 | - err(1, ifr.ifr_name); | ||
82 | + err(1, "%s", ifr.ifr_name); | ||
83 | } | ||
84 | |||
85 | break; | ||
86 | @@ -1575,7 +1575,7 @@ main (int argc, char **argv) | ||
87 | ifr.ifr_data = (void *)sParamCmd; | ||
88 | if (ioctl(s, AR6000_IOCTL_WMI_SETSCAN, &ifr) < 0) | ||
89 | { | ||
90 | - err(1, ifr.ifr_name); | ||
91 | + err(1, "%s", ifr.ifr_name); | ||
92 | } | ||
93 | break; | ||
94 | case WMI_GET_VERSION: | ||
95 | @@ -1586,7 +1586,7 @@ main (int argc, char **argv) | ||
96 | ifr.ifr_data = (void *)revinfo; | ||
97 | if (ioctl(s, AR6000_IOCTL_WMI_GETREV, &ifr) < 0) | ||
98 | { | ||
99 | - err(1, ifr.ifr_name); | ||
100 | + err(1, "%s", ifr.ifr_name); | ||
101 | } | ||
102 | printf("Host Rev = 0x%x(%u.%u.%u.%u), Target Rev = 0x%x(%u.%u.%u.%u)\n", | ||
103 | revinfo->host_ver, | ||
104 | @@ -1606,14 +1606,14 @@ main (int argc, char **argv) | ||
105 | ifr.ifr_data = (void *)listenCmd; | ||
106 | if (ioctl(s, AR6000_IOCTL_WMI_SETLISTENINT, &ifr) < 0) | ||
107 | { | ||
108 | - err(1, ifr.ifr_name); | ||
109 | + err(1, "%s", ifr.ifr_name); | ||
110 | } | ||
111 | break; | ||
112 | case WMI_SET_BMISS_TIME: | ||
113 | ifr.ifr_data = (void *)bmissCmd; | ||
114 | if (ioctl(s, AR6000_IOCTL_WMI_SET_BMISS_TIME, &ifr) < 0) | ||
115 | { | ||
116 | - err(1, ifr.ifr_name); | ||
117 | + err(1, "%s", ifr.ifr_name); | ||
118 | } | ||
119 | break; | ||
120 | case WMI_SET_RSSI_THRESHOLDS: | ||
121 | @@ -1621,14 +1621,14 @@ main (int argc, char **argv) | ||
122 | ifr.ifr_data = buf; | ||
123 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
124 | { | ||
125 | - err(1, ifr.ifr_name); | ||
126 | + err(1, "%s", ifr.ifr_name); | ||
127 | } | ||
128 | break; | ||
129 | case WMI_SET_SNR_THRESHOLDS: | ||
130 | ifr.ifr_data = (void *)snrThresholdParam; | ||
131 | if (ioctl(s, AR6000_IOCTL_WMI_SET_SNRTHRESHOLD, &ifr) < 0) | ||
132 | { | ||
133 | - err(1, ifr.ifr_name); | ||
134 | + err(1, "%s", ifr.ifr_name); | ||
135 | } | ||
136 | break; | ||
137 | case WMI_CLR_RSSISNR: | ||
138 | @@ -1636,7 +1636,7 @@ main (int argc, char **argv) | ||
139 | ifr.ifr_data = buf; | ||
140 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
141 | { | ||
142 | - err(1, ifr.ifr_name); | ||
143 | + err(1, "%s", ifr.ifr_name); | ||
144 | } | ||
145 | break; | ||
146 | case WMI_SET_LQ_THRESHOLDS: | ||
147 | @@ -1644,7 +1644,7 @@ main (int argc, char **argv) | ||
148 | ifr.ifr_data = buf; | ||
149 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
150 | { | ||
151 | - err(1, ifr.ifr_name); | ||
152 | + err(1, "%s", ifr.ifr_name); | ||
153 | } | ||
154 | break; | ||
155 | case WMI_SET_CHANNEL: | ||
156 | @@ -1693,18 +1693,18 @@ main (int argc, char **argv) | ||
157 | |||
158 | if (ioctl(s, AR6000_IOCTL_WMI_SET_CHANNELPARAMS, &ifr) < 0) | ||
159 | { | ||
160 | - err(1, ifr.ifr_name); | ||
161 | + err(1, "%s", ifr.ifr_name); | ||
162 | } | ||
163 | break; | ||
164 | case WMI_SET_SSID: | ||
165 | if (index > MAX_PROBED_SSID_INDEX) { | ||
166 | printf("num option for ssid command too large\n"); | ||
167 | - err(1, ifr.ifr_name); | ||
168 | + err(1, "%s", ifr.ifr_name); | ||
169 | break; | ||
170 | } | ||
171 | if (strlen((char *)ssid) > sizeof (ssidCmd->ssid)) { | ||
172 | printf("ssid name too large\n"); | ||
173 | - err(1, ifr.ifr_name); | ||
174 | + err(1, "%s", ifr.ifr_name); | ||
175 | break; | ||
176 | } | ||
177 | ssidCmd->entryIndex = index; | ||
178 | @@ -1722,7 +1722,7 @@ main (int argc, char **argv) | ||
179 | ifr.ifr_data = (void *)ssidCmd; | ||
180 | if (ioctl(s, AR6000_IOCTL_WMI_SET_PROBEDSSID, &ifr) < 0) | ||
181 | { | ||
182 | - err(1, ifr.ifr_name); | ||
183 | + err(1, "%s", ifr.ifr_name); | ||
184 | } | ||
185 | break; | ||
186 | case WMI_SET_BADAP: | ||
187 | @@ -1735,7 +1735,7 @@ main (int argc, char **argv) | ||
188 | ifr.ifr_data = (void *)badApCmd; | ||
189 | if (ioctl(s, AR6000_IOCTL_WMI_SET_BADAP, &ifr) < 0) | ||
190 | { | ||
191 | - err(1, ifr.ifr_name); | ||
192 | + err(1, "%s", ifr.ifr_name); | ||
193 | } | ||
194 | break; | ||
195 | case WMI_CREATE_QOS: | ||
196 | @@ -1794,7 +1794,7 @@ main (int argc, char **argv) | ||
197 | ifr.ifr_data = (void *)crePStreamCmd; | ||
198 | if (ioctl(s, AR6000_IOCTL_WMI_CREATE_QOS, &ifr) < 0) | ||
199 | { | ||
200 | - err(1, ifr.ifr_name); | ||
201 | + err(1, "%s", ifr.ifr_name); | ||
202 | } | ||
203 | break; | ||
204 | case WMI_GET_TARGET_STATS: | ||
205 | @@ -1807,7 +1807,7 @@ main (int argc, char **argv) | ||
206 | ifr.ifr_data = (void *)&tgtStatsCmd; | ||
207 | if (ioctl(s, AR6000_IOCTL_WMI_GET_TARGET_STATS, &ifr) < 0) | ||
208 | { | ||
209 | - err(1, ifr.ifr_name); | ||
210 | + err(1, "%s", ifr.ifr_name); | ||
211 | } | ||
212 | printTargetStats(&(tgtStatsCmd.targetStats)); | ||
213 | break; | ||
214 | @@ -1815,7 +1815,7 @@ main (int argc, char **argv) | ||
215 | ifr.ifr_data = (void *)pBitMask; | ||
216 | if (ioctl(s, AR6000_IOCTL_WMI_SET_ERROR_REPORT_BITMASK, &ifr) < 0) | ||
217 | { | ||
218 | - err(1, ifr.ifr_name); | ||
219 | + err(1, "%s", ifr.ifr_name); | ||
220 | } | ||
221 | break; | ||
222 | case WMI_DELETE_QOS: | ||
223 | @@ -1824,7 +1824,7 @@ main (int argc, char **argv) | ||
224 | ifr.ifr_data = (void *)delPStreamCmd; | ||
225 | if (ioctl(s, AR6000_IOCTL_WMI_DELETE_QOS, &ifr) < 0) | ||
226 | { | ||
227 | - err(1, ifr.ifr_name); | ||
228 | + err(1, "%s", ifr.ifr_name); | ||
229 | } | ||
230 | break; | ||
231 | case WMI_GET_QOS_QUEUE: | ||
232 | @@ -1840,7 +1840,7 @@ main (int argc, char **argv) | ||
233 | ifr.ifr_data = (void *)getQosQueueCmd; | ||
234 | if (ioctl(s, AR6000_IOCTL_WMI_GET_QOS_QUEUE, &ifr) < 0) | ||
235 | { | ||
236 | - err(1, ifr.ifr_name); | ||
237 | + err(1, "%s", ifr.ifr_name); | ||
238 | } | ||
239 | |||
240 | printf("Active TSIDs \n"); | ||
241 | @@ -1855,7 +1855,7 @@ main (int argc, char **argv) | ||
242 | ifr.ifr_data = (void *)ieInfo; | ||
243 | if (ioctl(s, AR6000_IOCTL_WMI_SET_ASSOC_INFO, &ifr) < 0) | ||
244 | { | ||
245 | - err(1, ifr.ifr_name); | ||
246 | + err(1, "%s", ifr.ifr_name); | ||
247 | } | ||
248 | break; | ||
249 | case WMI_SET_AC_PARAMS: | ||
250 | @@ -1871,14 +1871,14 @@ main (int argc, char **argv) | ||
251 | ifr.ifr_data = (void *)acParamsCmd; | ||
252 | if (ioctl(s, AR6000_IOCTL_WMI_SET_ACCESS_PARAMS, &ifr) < 0) | ||
253 | { | ||
254 | - err(1, ifr.ifr_name); | ||
255 | + err(1, "%s", ifr.ifr_name); | ||
256 | } | ||
257 | break; | ||
258 | case WMI_SET_DISC_TIMEOUT: | ||
259 | ifr.ifr_data = (void *)discCmd; | ||
260 | if (ioctl(s, AR6000_IOCTL_WMI_SET_DISC_TIMEOUT, &ifr) < 0) | ||
261 | { | ||
262 | - err(1, ifr.ifr_name); | ||
263 | + err(1, "%s", ifr.ifr_name); | ||
264 | } | ||
265 | break; | ||
266 | case WMI_SET_ADHOC_BSSID: | ||
267 | @@ -1887,7 +1887,7 @@ main (int argc, char **argv) | ||
268 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
269 | { | ||
270 | printf("fail to set adhoc bssid \n"); | ||
271 | - err(1, ifr.ifr_name); | ||
272 | + err(1, "%s", ifr.ifr_name); | ||
273 | } | ||
274 | break; | ||
275 | case WMI_SET_OPT_MODE: | ||
276 | @@ -1895,7 +1895,7 @@ main (int argc, char **argv) | ||
277 | ifr.ifr_data = buf; | ||
278 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
279 | { | ||
280 | - err(1, ifr.ifr_name); | ||
281 | + err(1, "%s", ifr.ifr_name); | ||
282 | } | ||
283 | break; | ||
284 | case WMI_OPT_SEND_FRAME: | ||
285 | @@ -1903,7 +1903,7 @@ main (int argc, char **argv) | ||
286 | ifr.ifr_data = buf; | ||
287 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
288 | { | ||
289 | - err(1, ifr.ifr_name); | ||
290 | + err(1, "%s", ifr.ifr_name); | ||
291 | } | ||
292 | break; | ||
293 | case WMI_SET_BEACON_INT: | ||
294 | @@ -1911,7 +1911,7 @@ main (int argc, char **argv) | ||
295 | ifr.ifr_data = buf; | ||
296 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
297 | { | ||
298 | - err(1, ifr.ifr_name); | ||
299 | + err(1, "%s", ifr.ifr_name); | ||
300 | } | ||
301 | break; | ||
302 | case WMI_SET_VOICE_PKT_SIZE: | ||
303 | @@ -1919,7 +1919,7 @@ main (int argc, char **argv) | ||
304 | ifr.ifr_data = buf; | ||
305 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
306 | { | ||
307 | - err(1, ifr.ifr_name); | ||
308 | + err(1, "%s", ifr.ifr_name); | ||
309 | } | ||
310 | break; | ||
311 | case WMI_SET_MAX_SP: | ||
312 | @@ -1927,7 +1927,7 @@ main (int argc, char **argv) | ||
313 | ifr.ifr_data = buf; | ||
314 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
315 | { | ||
316 | - err(1, ifr.ifr_name); | ||
317 | + err(1, "%s", ifr.ifr_name); | ||
318 | } | ||
319 | break; | ||
320 | case WMI_GET_ROAM_TBL: | ||
321 | @@ -1935,7 +1935,7 @@ main (int argc, char **argv) | ||
322 | ifr.ifr_data = buf; | ||
323 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
324 | { | ||
325 | - err(1, ifr.ifr_name); | ||
326 | + err(1, "%s", ifr.ifr_name); | ||
327 | } | ||
328 | break; | ||
329 | case WMI_SET_ROAM_CTRL: | ||
330 | @@ -1943,7 +1943,7 @@ main (int argc, char **argv) | ||
331 | ifr.ifr_data = buf; | ||
332 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
333 | { | ||
334 | - err(1, ifr.ifr_name); | ||
335 | + err(1, "%s", ifr.ifr_name); | ||
336 | } | ||
337 | break; | ||
338 | case WMI_SET_POWERSAVE_TIMERS: | ||
339 | @@ -1951,7 +1951,7 @@ main (int argc, char **argv) | ||
340 | ifr.ifr_data = buf; | ||
341 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
342 | { | ||
343 | - err(1, ifr.ifr_name); | ||
344 | + err(1, "%s", ifr.ifr_name); | ||
345 | } | ||
346 | break; | ||
347 | case WMI_GET_POWER_MODE: | ||
348 | @@ -1959,7 +1959,7 @@ main (int argc, char **argv) | ||
349 | ifr.ifr_data = buf; | ||
350 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
351 | { | ||
352 | - err(1, ifr.ifr_name); | ||
353 | + err(1, "%s", ifr.ifr_name); | ||
354 | } | ||
355 | printf("Power mode is %s\n", | ||
356 | (getPowerMode->powerMode == MAX_PERF_POWER) ? "maxperf" : "rec"); | ||
357 | @@ -1969,7 +1969,7 @@ main (int argc, char **argv) | ||
358 | ifr.ifr_data = buf; | ||
359 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
360 | { | ||
361 | - err(1, ifr.ifr_name); | ||
362 | + err(1, "%s", ifr.ifr_name); | ||
363 | } | ||
364 | break; | ||
365 | case WMI_GET_ROAM_DATA: | ||
366 | @@ -1977,7 +1977,7 @@ main (int argc, char **argv) | ||
367 | ifr.ifr_data = buf; | ||
368 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
369 | { | ||
370 | - err(1, ifr.ifr_name); | ||
371 | + err(1, "%s", ifr.ifr_name); | ||
372 | } | ||
373 | break; | ||
374 | case WMI_SET_BT_STATUS: | ||
375 | @@ -1985,7 +1985,7 @@ main (int argc, char **argv) | ||
376 | ifr.ifr_data = buf; | ||
377 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
378 | { | ||
379 | - err(1, ifr.ifr_name); | ||
380 | + err(1, "%s", ifr.ifr_name); | ||
381 | } | ||
382 | break; | ||
383 | case WMI_SET_BT_PARAMS: | ||
384 | @@ -1993,7 +1993,7 @@ main (int argc, char **argv) | ||
385 | ifr.ifr_data = buf; | ||
386 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
387 | { | ||
388 | - err(1, ifr.ifr_name); | ||
389 | + err(1, "%s", ifr.ifr_name); | ||
390 | } | ||
391 | break; | ||
392 | case WMI_SET_RETRYLIMITS: | ||
393 | @@ -2001,14 +2001,14 @@ main (int argc, char **argv) | ||
394 | ifr.ifr_data = buf; | ||
395 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
396 | { | ||
397 | - err(1, ifr.ifr_name); | ||
398 | + err(1, "%s", ifr.ifr_name); | ||
399 | } | ||
400 | break; | ||
401 | case WMI_START_SCAN: | ||
402 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_STARTSCAN; | ||
403 | ifr.ifr_data = buf; | ||
404 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
405 | - err(1, ifr.ifr_name); | ||
406 | + err(1, "%s", ifr.ifr_name); | ||
407 | } | ||
408 | break; | ||
409 | case WMI_SET_FIX_RATES: | ||
410 | @@ -2031,14 +2031,14 @@ main (int argc, char **argv) | ||
411 | ifr.ifr_data = buf; | ||
412 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
413 | { | ||
414 | - err(1, ifr.ifr_name); | ||
415 | + err(1, "%s", ifr.ifr_name); | ||
416 | } | ||
417 | break; | ||
418 | case WMI_GET_FIX_RATES: | ||
419 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_GETFIXRATES; | ||
420 | ifr.ifr_data = buf; | ||
421 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
422 | - err(1, ifr.ifr_name); | ||
423 | + err(1, "%s", ifr.ifr_name); | ||
424 | } else { | ||
425 | int i; | ||
426 | printf("Fix rate set index:"); | ||
427 | @@ -2057,7 +2057,7 @@ main (int argc, char **argv) | ||
428 | index--; | ||
429 | setAuthMode->mode = atoi(argv[index]); | ||
430 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
431 | - err(1, ifr.ifr_name); | ||
432 | + err(1, "%s", ifr.ifr_name); | ||
433 | } | ||
434 | break; | ||
435 | case WMI_SET_REASSOC_MODE: | ||
436 | @@ -2067,42 +2067,42 @@ main (int argc, char **argv) | ||
437 | index--; | ||
438 | setReassocMode->mode = atoi(argv[index]); | ||
439 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
440 | - err(1, ifr.ifr_name); | ||
441 | + err(1, "%s", ifr.ifr_name); | ||
442 | } | ||
443 | break; | ||
444 | case WMI_SET_LPREAMBLE: | ||
445 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_LPREAMBLE; | ||
446 | ifr.ifr_data = buf; | ||
447 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
448 | - err(1, ifr.ifr_name); | ||
449 | + err(1, "%s", ifr.ifr_name); | ||
450 | } | ||
451 | break; | ||
452 | case WMI_SET_RTS: | ||
453 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_RTS; | ||
454 | ifr.ifr_data = buf; | ||
455 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
456 | - err(1, ifr.ifr_name); | ||
457 | + err(1, "%s", ifr.ifr_name); | ||
458 | } | ||
459 | break; | ||
460 | case WMI_SET_WMM: | ||
461 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_WMM; | ||
462 | ifr.ifr_data = buf; | ||
463 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
464 | - err(1, ifr.ifr_name); | ||
465 | + err(1, "%s", ifr.ifr_name); | ||
466 | } | ||
467 | break; | ||
468 | case WMI_SET_TXOP: | ||
469 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_TXOP; | ||
470 | ifr.ifr_data = buf; | ||
471 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
472 | - err(1, ifr.ifr_name); | ||
473 | + err(1, "%s", ifr.ifr_name); | ||
474 | } | ||
475 | break; | ||
476 | case DIAG_READ: | ||
477 | ((int *)buf)[0] = AR6000_XIOCTL_DIAG_READ; | ||
478 | ifr.ifr_data = buf; | ||
479 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
480 | - err(1, ifr.ifr_name); | ||
481 | + err(1, "%s", ifr.ifr_name); | ||
482 | } | ||
483 | printf("diagdata: 0x%x\n", *diagdata); | ||
484 | break; | ||
485 | @@ -2110,7 +2110,7 @@ main (int argc, char **argv) | ||
486 | ((int *)buf)[0] = AR6000_XIOCTL_DIAG_WRITE; | ||
487 | ifr.ifr_data = buf; | ||
488 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
489 | - err(1, ifr.ifr_name); | ||
490 | + err(1, "%s", ifr.ifr_name); | ||
491 | } | ||
492 | break; | ||
493 | case WMI_GET_RD: | ||
494 | @@ -2118,7 +2118,7 @@ main (int argc, char **argv) | ||
495 | ifr.ifr_data = buf; | ||
496 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) | ||
497 | { | ||
498 | - err(1, ifr.ifr_name); | ||
499 | + err(1, "%s", ifr.ifr_name); | ||
500 | } | ||
501 | else | ||
502 | { | ||
503 | @@ -2139,14 +2139,14 @@ main (int argc, char **argv) | ||
504 | index--; | ||
505 | setKeepAlive->keepaliveInterval = atoi(argv[index]); | ||
506 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
507 | - err(1, ifr.ifr_name); | ||
508 | + err(1, "%s", ifr.ifr_name); | ||
509 | } | ||
510 | break; | ||
511 | case WMI_GET_KEEPALIVE: | ||
512 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_KEEPALIVE; | ||
513 | ifr.ifr_data = buf; | ||
514 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
515 | - err(1, ifr.ifr_name); | ||
516 | + err(1, "%s", ifr.ifr_name); | ||
517 | } | ||
518 | printf("Keepalive interval is %d secs and AP is %s\n", | ||
519 | getKeepAlive->keepaliveInterval, (getKeepAlive->configured ? | ||
520 | @@ -2156,63 +2156,63 @@ main (int argc, char **argv) | ||
521 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_APPIE; | ||
522 | ifr.ifr_data = buf; | ||
523 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
524 | - err(1, ifr.ifr_name); | ||
525 | + err(1, "%s", ifr.ifr_name); | ||
526 | } | ||
527 | break; | ||
528 | case WMI_SET_MGMT_FRM_RX_FILTER: | ||
529 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_MGMT_FRM_RX_FILTER; | ||
530 | ifr.ifr_data = buf; | ||
531 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
532 | - err(1, ifr.ifr_name); | ||
533 | + err(1, "%s", ifr.ifr_name); | ||
534 | } | ||
535 | break; | ||
536 | case WMI_DBGLOG_CFG_MODULE: | ||
537 | ((int *)buf)[0] = AR6000_XIOCTL_DBGLOG_CFG_MODULE; | ||
538 | ifr.ifr_data = buf; | ||
539 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
540 | - err(1, ifr.ifr_name); | ||
541 | + err(1, "%s", ifr.ifr_name); | ||
542 | } | ||
543 | break; | ||
544 | case WMI_DBGLOG_GET_DEBUG_LOGS: | ||
545 | ((int *)buf)[0] = AR6000_XIOCTL_DBGLOG_GET_DEBUG_LOGS; | ||
546 | ifr.ifr_data = buf; | ||
547 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
548 | - err(1, ifr.ifr_name); | ||
549 | + err(1, "%s", ifr.ifr_name); | ||
550 | } | ||
551 | break; | ||
552 | case WMI_SET_HOST_SLEEP_MODE: | ||
553 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_HOST_SLEEP_MODE; | ||
554 | ifr.ifr_data = buf; | ||
555 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
556 | - err(1, ifr.ifr_name); | ||
557 | + err(1, "%s", ifr.ifr_name); | ||
558 | } | ||
559 | break; | ||
560 | case WMI_SET_WOW_MODE: | ||
561 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_WOW_MODE; | ||
562 | ifr.ifr_data = buf; | ||
563 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
564 | - err(1, ifr.ifr_name); | ||
565 | + err(1, "%s", ifr.ifr_name); | ||
566 | } | ||
567 | break; | ||
568 | case WMI_ADD_WOW_PATTERN: | ||
569 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_ADD_WOW_PATTERN; | ||
570 | ifr.ifr_data = buf; | ||
571 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
572 | - err(1, ifr.ifr_name); | ||
573 | + err(1, "%s", ifr.ifr_name); | ||
574 | } | ||
575 | break; | ||
576 | case WMI_DEL_WOW_PATTERN: | ||
577 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_DEL_WOW_PATTERN; | ||
578 | ifr.ifr_data = buf; | ||
579 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
580 | - err(1, ifr.ifr_name); | ||
581 | + err(1, "%s", ifr.ifr_name); | ||
582 | } | ||
583 | break; | ||
584 | case WMI_GET_WOW_LIST: | ||
585 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_WOW_LIST; | ||
586 | ifr.ifr_data = buf; | ||
587 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
588 | - err(1, ifr.ifr_name); | ||
589 | + err(1, "%s", ifr.ifr_name); | ||
590 | } | ||
591 | break; | ||
592 | case DIAG_DUMP_CHIP_MEM: | ||
593 | @@ -2225,7 +2225,7 @@ main (int argc, char **argv) | ||
594 | ((int *)buf)[0] = AR6000_XIOCTL_DIAG_READ; | ||
595 | ifr.ifr_data = buf; | ||
596 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
597 | - err(1, ifr.ifr_name); | ||
598 | + err(1, "%s", ifr.ifr_name); | ||
599 | } | ||
600 | printf("0x%04x:0x%04x\n", *diagaddr, *diagdata); | ||
601 | } | ||
602 | @@ -2237,21 +2237,21 @@ main (int argc, char **argv) | ||
603 | index = optind - 1; | ||
604 | *connectCtrlFlags = strtoul(argv[index], NULL, 0); | ||
605 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
606 | - err(1, ifr.ifr_name); | ||
607 | + err(1, "%s", ifr.ifr_name); | ||
608 | } | ||
609 | break; | ||
610 | case DUMP_HTC_CREDITS: | ||
611 | ((int *)buf)[0] = AR6000_XIOCTL_DUMP_HTC_CREDIT_STATE; | ||
612 | ifr.ifr_data = buf; | ||
613 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
614 | - err(1, ifr.ifr_name); | ||
615 | + err(1, "%s", ifr.ifr_name); | ||
616 | } | ||
617 | break; | ||
618 | case WMI_SET_AKMP_INFO: | ||
619 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_AKMP_PARAMS; | ||
620 | ifr.ifr_data = buf; | ||
621 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
622 | - err(1, ifr.ifr_name); | ||
623 | + err(1, "%s", ifr.ifr_name); | ||
624 | } | ||
625 | break; | ||
626 | case WMI_SET_PMKID_LIST: | ||
627 | @@ -2259,7 +2259,7 @@ main (int argc, char **argv) | ||
628 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_SET_PMKID_LIST; | ||
629 | ifr.ifr_data = buf; | ||
630 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
631 | - err(1, ifr.ifr_name); | ||
632 | + err(1, "%s", ifr.ifr_name); | ||
633 | } | ||
634 | } else { | ||
635 | printf("No PMKIDs entered\n"); | ||
636 | @@ -2269,7 +2269,7 @@ main (int argc, char **argv) | ||
637 | ((int *)buf)[0] = AR6000_XIOCTL_WMI_GET_PMKID_LIST; | ||
638 | ifr.ifr_data = buf; | ||
639 | if (ioctl(s, AR6000_IOCTL_EXTENDED, &ifr) < 0) { | ||
640 | - err(1, ifr.ifr_name); | ||
641 | + err(1, "%s", ifr.ifr_name); | ||
642 | } | ||
643 | break; | ||
644 | case WMI_SET_BSS_PMKID_INFO: | ||
645 | @@ -2277,7 +2277,7 @@ main (int argc, char **argv) | ||
646 | iwr.u.data.length = sizeof(*pi_cmd); | ||
647 | if (ioctl(s, IEEE80211_IOCTL_ADDPMKID, &iwr) < 0) { | ||
648 | printf("ADDPMKID IOCTL Error\n"); | ||
649 | - err(1, ifr.ifr_name); | ||
650 | + err(1, "%s", ifr.ifr_name); | ||
651 | } | ||
652 | break; | ||
653 | default: | ||
654 | -- | ||
655 | 2.13.2 | ||
656 | |||
diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb deleted file mode 100644 index 23273caf8..000000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | SUMMARY = "Atheros 6K Wifi configuration utility" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406c82911" | ||
4 | SECTION = "console/network" | ||
5 | PV = "1.0+git${SRCPV}" | ||
6 | |||
7 | SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" | ||
8 | SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/AR6kSDK.build_sw.18 \ | ||
9 | file://0001-makefile-Pass-CFLAGS-to-compile.patch \ | ||
10 | file://0002-fix-err-API-to-have-format-string.patch \ | ||
11 | " | ||
12 | S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" | ||
13 | |||
14 | CLEANBROKEN = "1" | ||
15 | |||
16 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | ||
17 | |||
18 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
19 | |||
20 | do_install() { | ||
21 | install -d ${D}${bindir} | ||
22 | install -m 0755 wmiconfig ${D}${bindir} | ||
23 | } | ||
24 | |||