summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2011-02-23 11:19:04 +0000
committerAlexey Shvetsov <alexxy@gentoo.org>2011-02-23 11:19:04 +0000
commit07997bdb793ad3544511fbd3bff037e81537cbf0 (patch)
tree98c63f2a0dac40818803ce7931f8cf649138240d /net-wireless/wimax-tools
parent[net-wireless/wimax] Add updates from git. Also fix bug #356121 (diff)
downloadhistorical-07997bdb793ad3544511fbd3bff037e81537cbf0.tar.gz
historical-07997bdb793ad3544511fbd3bff037e81537cbf0.tar.bz2
historical-07997bdb793ad3544511fbd3bff037e81537cbf0.zip
[net-wireless/wimax-tools] Add updates from git
Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64
Diffstat (limited to 'net-wireless/wimax-tools')
-rw-r--r--net-wireless/wimax-tools/ChangeLog11
-rw-r--r--net-wireless/wimax-tools/Manifest32
-rw-r--r--net-wireless/wimax-tools/files/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch293
-rw-r--r--net-wireless/wimax-tools/wimax-tools-1.4.4-r1.ebuild32
4 files changed, 351 insertions, 17 deletions
diff --git a/net-wireless/wimax-tools/ChangeLog b/net-wireless/wimax-tools/ChangeLog
index 5d50c0add048..584db9e9608a 100644
--- a/net-wireless/wimax-tools/ChangeLog
+++ b/net-wireless/wimax-tools/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-wireless/wimax-tools
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax-tools/ChangeLog,v 1.4 2010/11/08 17:45:26 alexxy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax-tools/ChangeLog,v 1.5 2011/02/23 11:19:04 alexxy Exp $
+
+*wimax-tools-1.4.4-r1 (23 Feb 2011)
+
+ 23 Feb 2011; Alexey Shvetsov <alexxy@gentoo.org>
+ +files/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch,
+ +wimax-tools-1.4.4-r1.ebuild:
+ Add updates from git
*wimax-tools-1.4.4 (08 Nov 2010)
diff --git a/net-wireless/wimax-tools/Manifest b/net-wireless/wimax-tools/Manifest
index 76b476fb2363..c4acdc7c1605 100644
--- a/net-wireless/wimax-tools/Manifest
+++ b/net-wireless/wimax-tools/Manifest
@@ -1,24 +1,26 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch 7712 RMD160 788aefbe5ed998222614ea2fc1a230e3a67e8561 SHA1 e21bc394268fbbe07ff2a0e4ed46908489e5288f SHA256 2e5450873881a0f83cb0d1ddd8fd5889f65f0053f189872ad3101db97fbdc4d2
DIST wimax-tools-1.4.4.tar.gz 361572 RMD160 cbf7830bbee11a49c326107c47b24a2b0993372b SHA1 87c5f5d5ad495c69abe1d83838c3f40a5162dbe0 SHA256 63ea9796704ae2f0e324b655398d103cdd4261d9a2e58d6a41c5574719dec4bd
+EBUILD wimax-tools-1.4.4-r1.ebuild 800 RMD160 70a21bd5cc5bb5116d23674be4f76ca3927dc22f SHA1 0bb7d016c4df68166e4e17406a1b333de2b662ac SHA256 443f718afa62df271af2fbc603fb6f074f912f450fec462615584118c1fee481
EBUILD wimax-tools-1.4.4.ebuild 691 RMD160 50cf4e181e55c2c5938267a103fde695628d6589 SHA1 41c59fe9289ccf07d852178637e17b6136078bd6 SHA256 89ee2f1e822e8ed2a300c50dc425c0bda30612856c0f1d15ad5dae3f0c51f53e
-MISC ChangeLog 842 RMD160 f6304a8359b8ccaf8074ff05b479c68d57b52938 SHA1 365efa0b5be46751da233845b7d56b56bfda8fe8 SHA256 3a8927ab255502abac1daa092327b282b065c7cd83d90cdc22fd9618fb962ec5
+MISC ChangeLog 1068 RMD160 fc0b2177529b0c4d333d4975dab9251ff242623a SHA1 a442f6a95cdff2d3ecb0e5948b828d49ba045686 SHA256 b3b32e4a633a1efc5428a76aaba5872d55a4e4116e61e1a8229c3dfaad5c9b87
MISC metadata.xml 250 RMD160 94be601f620e3158922f31ac28328a28665555a2 SHA1 ac8010695121148bf3593692aba56938187882c9 SHA256 aea796ea3b08f1f5ca77c34868298e406de62590afbf2662e87d094c3e0041f4
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJM2Da5AAoJEOf+E+/4L5LmyKQP/jnLH78+2fB3u92ET1nXvFQ3
-eo6flepeLUnW/i6uBD/9r8c/GhTog/7IEmco1qmlHmhKHQeYdIpvIdbAPflmX7hP
-uHOTXa56CoH4G/vgIe5+QmXPdhF+dh8MNoOqase396u++33bgguGKjGYy9px9QEs
-AfiisNNIEupYh8Labq89/9jvZLgGwQ4lnGbS+Y25iJ3SRMWiaAVc+2B+0LJXQ3RA
-mRwJudnhoV1AA6Z3JReZtmMpYuBn3C/7zDamvUmbdy78apR2k+RH/h0pkJmI1E3d
-+zZF4I4JqmVFVlvZ5+Nu4Z41nsOiykbCB6A+jbzskje3kVug9lQ5TG6Iu7iLZRZc
-bFQte2VFPNO3CdJPpXm8/cYi4vnkMqjMMf9bdo3EhNTo5QHvt8aRQ0Ks6I95KGen
-2QWQQGLYkeylQoY1whdx9earW/0eq8SDabSxc5cVIKPgL/q+N+0Ara3EJXtgxfQy
-B2tq3IJmmzDadRzbhAKx/9qRnOxkQtl8gM8lFceG4471kBgEEYJFW09ALKNejBpL
-IDVyqa+DKp8/lEmpjfbLGFu6ArOWNPm61PHs84WEImVEzAUEKSGKQ5lnWI7gpuZl
-OTBXiXuxaBLDLRpgA+vAKKsfmZyNNhGH70vXyERsEzB6lLoVYKo+Yvjt0nCc3T+b
-XxucVaUKQJU+q3u0CG9M
-=Vsji
+iQIcBAEBCAAGBQJNZO1PAAoJEOf+E+/4L5LmPYsP/iRriSiCn5pyx83aRJ1D31Qt
+hNO6xyy9Xl+wCbNuQqQcr7rU9GiKHSegRfY2xvEsHlhptkYE0d004Qepfm5lMvpU
+yIMRHW4GAdc0g7QvTEPdaKqN4JoZqPMcsrj7rzcWmkGTqiRiqBn+gmRFA9HPFAfA
+mKSE/9aO2S7afO4+mCmNIlRKKlX1Kf/LQgvOqQME6Ck3A4zEOzirrf9NcivmJT11
+Ag0IBzwvwf2N6T9Y1KhiJ7T0SCGdQSnkOuVL62uiLo3G/6ONnz9SRcLlYrFfz8bi
+/db5eRQ9HPXe30iuQWu/iFUXhEIE9y139XzS4ZnSLcBW/8ZTSDXT+PGulL6xUdVt
+soJeEOVdET4WlcqVpDOsnVyzZx4IciBU2zC9GlS7WtLEmsI1T+kplsbUMhiQRtMS
+eIKIudjoq5jqmVdsLmb0m+z0iJGPkc97GiZLk1agbHlxw98K+sauwyRX3puEh9Yx
+L9ywXXQXFV2lHOMMKnYCc9rRhPcK8h22/4MVof791GBrNlPQJ08+dwjWY/gAyIHe
+/CJic2zMSJVPQZjwf0hpCLIB+XD6hmaR/d0L8qYef40XdKcNB+UlgVw4is/KmIUw
+3McX7gDGdUI73MWE5FMPUCBCphZ9317k0nz80hXSZr8LhF975vm59dUf2JTc6hwu
+8yhrjYp7H/IACKs0YZCj
+=DAqP
-----END PGP SIGNATURE-----
diff --git a/net-wireless/wimax-tools/files/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch b/net-wireless/wimax-tools/files/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch
new file mode 100644
index 000000000000..da8b1894a913
--- /dev/null
+++ b/net-wireless/wimax-tools/files/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch
@@ -0,0 +1,293 @@
+From 26da46f5756cdcdae963ea504fef27efcb63ba8b Mon Sep 17 00:00:00 2001
+From: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
+Date: Fri, 28 Jan 2011 12:11:35 -0800
+Subject: [PATCH] wimaxll_cb_ctx: move to internal.h to wimaxll.h (fixing bug #20)
+
+The context declaration and macros are needed by client programs; they
+were misplaced.
+
+Reported-by: Mathieu Peresse <mathieu.peresse@gmail.com>
+Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
+---
+ include/wimaxll.h | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/internal.h | 126 ----------------------------------------------------
+ 2 files changed, 127 insertions(+), 126 deletions(-)
+
+diff --git a/include/wimaxll.h b/include/wimaxll.h
+index c9dde3f..3149bf2 100644
+--- a/include/wimaxll.h
++++ b/include/wimaxll.h
+@@ -307,6 +307,133 @@ typedef int (*wimaxll_state_change_cb_f)(
+ enum wimax_st old_state, enum wimax_st new_state);
+
+
++
++/**
++ * General structure for storing callback context
++ *
++ * \ingroup callbacks
++ *
++ * Callbacks set by the user receive a user-set pointer to a context
++ * structure. The user can wrap this struct in a bigger context struct
++ * and use wimaxll_container_of() during the callback to obtain its
++ * pointer.
++ *
++ * Usage:
++ *
++ * \code
++ * ...
++ * struct wimaxll_handle *wmx;
++ * ...
++ * struct my_context {
++ * struct wimaxll_cb_ctx ctx;
++ * <my data>
++ * } my_ctx = {
++ * .ctx = WIMAXLL_CB_CTX_INIT(wmx),
++ * <my data initialization>
++ * };
++ * ...
++ * wimaxll_set_cb_SOMECALLBACK(wmx, my_callback, &my_ctx.ctx);
++ * ...
++ * result = wimaxll_pipe_read(wmx);
++ * ...
++ *
++ * // When my_callback() is called
++ * my_callback(wmx, ctx, ...)
++ * {
++ * struct my_context *my_ctx = wimaxll_container_of(
++ * ctx, struct my_callback, ctx);
++ * ...
++ * // do stuff with my_ctx
++ * }
++ * \endcode
++ *
++ * \param wmx WiMAX handle this context refers to (for usage by the
++ * callback).
++ * \param result Result of the handling of the message. For usage by
++ * the callback. Should not be set to -EINPROGRESS, as this will
++ * be interpreted by the message handler as no processing was done
++ * on the message.
++ *
++ * \internal
++ *
++ * \param msg_done This is used internally to mark when the acks (or
++ * errors) for a message have been received and the message
++ * receiving loop can be considered done.
++ */
++struct wimaxll_cb_ctx {
++ struct wimaxll_handle *wmx;
++ ssize_t result;
++ unsigned msg_done:1; /* internal */
++};
++
++
++/**
++ * Initialize a definition of struct wimaxll_cb_ctx
++ *
++ * \param _wmx pointer to the WiMAX device handle this will be
++ * associated to
++ *
++ * Use as:
++ *
++ * \code
++ * struct wimaxll_handle *wmx;
++ * ...
++ * struct wimaxll_cb_ctx my_context = WIMAXLL_CB_CTX_INIT(wmx);
++ * \endcode
++ *
++ * \ingroup callbacks
++ */
++#define WIMAXLL_CB_CTX_INIT(_wmx) { \
++ .wmx = (_wmx), \
++ .result = -EINPROGRESS, \
++}
++
++
++static inline // ugly workaround for doxygen
++/**
++ * Initialize a struct wimaxll_cb_ctx
++ *
++ * \param ctx Pointer to the struct wimaxll_cb_ctx.
++ * \param wmx pointer to the WiMAX device handle this will be
++ * associated to
++ *
++ * Use as:
++ *
++ * \code
++ * struct wimaxll_handle *wmx;
++ * ...
++ * struct wimaxll_cb_ctx my_context;
++ * ...
++ * wimaxll_cb_ctx(&my_context, wmx);
++ * \endcode
++ *
++ * \ingroup callbacks
++ * \fn static void wimaxll_cb_ctx_init(struct wimaxll_cb_ctx *ctx, struct wimaxll_handle *wmx)
++ */
++void wimaxll_cb_ctx_init(struct wimaxll_cb_ctx *ctx, struct wimaxll_handle *wmx)
++{
++ ctx->wmx = wmx;
++ ctx->result = -EINPROGRESS;
++}
++
++
++static inline // ugly workaround for doxygen
++/**
++ * Set the result value in a callback context
++ *
++ * \param ctx Context where to set -- if NULL, no action will be taken
++ * \param val value to set for \a result
++ *
++ * \ingroup callbacks
++ * \fn static void wimaxll_cb_maybe_set_result(struct wimaxll_cb_ctx *ctx, int val)
++ */
++void wimaxll_cb_maybe_set_result(struct wimaxll_cb_ctx *ctx, int val)
++{
++ if (ctx != NULL && ctx->result == -EINPROGRESS)
++ ctx->result = val;
++}
++
++
+ /* Basic handle management */
+ struct wimaxll_handle *wimaxll_open(const char *device_name);
+ void *wimaxll_priv_get(struct wimaxll_handle *);
+diff --git a/lib/internal.h b/lib/internal.h
+index a5cd272..178ac1e 100644
+--- a/lib/internal.h
++++ b/lib/internal.h
+@@ -54,132 +54,6 @@ enum {
+
+
+ /**
+- * General structure for storing callback context
+- *
+- * \ingroup callbacks
+- *
+- * Callbacks set by the user receive a user-set pointer to a context
+- * structure. The user can wrap this struct in a bigger context struct
+- * and use wimaxll_container_of() during the callback to obtain its
+- * pointer.
+- *
+- * Usage:
+- *
+- * \code
+- * ...
+- * struct wimaxll_handle *wmx;
+- * ...
+- * struct my_context {
+- * struct wimaxll_cb_ctx ctx;
+- * <my data>
+- * } my_ctx = {
+- * .ctx = WIMAXLL_CB_CTX_INIT(wmx),
+- * <my data initialization>
+- * };
+- * ...
+- * wimaxll_set_cb_SOMECALLBACK(wmx, my_callback, &my_ctx.ctx);
+- * ...
+- * result = wimaxll_pipe_read(wmx);
+- * ...
+- *
+- * // When my_callback() is called
+- * my_callback(wmx, ctx, ...)
+- * {
+- * struct my_context *my_ctx = wimaxll_container_of(
+- * ctx, struct my_callback, ctx);
+- * ...
+- * // do stuff with my_ctx
+- * }
+- * \endcode
+- *
+- * \param wmx WiMAX handle this context refers to (for usage by the
+- * callback).
+- * \param result Result of the handling of the message. For usage by
+- * the callback. Should not be set to -EINPROGRESS, as this will
+- * be interpreted by the message handler as no processing was done
+- * on the message.
+- *
+- * \internal
+- *
+- * \param msg_done This is used internally to mark when the acks (or
+- * errors) for a message have been received and the message
+- * receiving loop can be considered done.
+- */
+-struct wimaxll_cb_ctx {
+- struct wimaxll_handle *wmx;
+- ssize_t result;
+- unsigned msg_done:1; /* internal */
+-};
+-
+-
+-/**
+- * Initialize a definition of struct wimaxll_cb_ctx
+- *
+- * \param _wmx pointer to the WiMAX device handle this will be
+- * associated to
+- *
+- * Use as:
+- *
+- * \code
+- * struct wimaxll_handle *wmx;
+- * ...
+- * struct wimaxll_cb_ctx my_context = WIMAXLL_CB_CTX_INIT(wmx);
+- * \endcode
+- *
+- * \ingroup callbacks
+- */
+-#define WIMAXLL_CB_CTX_INIT(_wmx) { \
+- .wmx = (_wmx), \
+- .result = -EINPROGRESS, \
+-}
+-
+-
+-static inline // ugly workaround for doxygen
+-/**
+- * Initialize a struct wimaxll_cb_ctx
+- *
+- * \param ctx Pointer to the struct wimaxll_cb_ctx.
+- * \param wmx pointer to the WiMAX device handle this will be
+- * associated to
+- *
+- * Use as:
+- *
+- * \code
+- * struct wimaxll_handle *wmx;
+- * ...
+- * struct wimaxll_cb_ctx my_context;
+- * ...
+- * wimaxll_cb_ctx(&my_context, wmx);
+- * \endcode
+- *
+- * \ingroup callbacks
+- * \fn static void wimaxll_cb_ctx_init(struct wimaxll_cb_ctx *ctx, struct wimaxll_handle *wmx)
+- */
+-void wimaxll_cb_ctx_init(struct wimaxll_cb_ctx *ctx, struct wimaxll_handle *wmx)
+-{
+- ctx->wmx = wmx;
+- ctx->result = -EINPROGRESS;
+-}
+-
+-
+-static inline // ugly workaround for doxygen
+-/**
+- * Set the result value in a callback context
+- *
+- * \param ctx Context where to set -- if NULL, no action will be taken
+- * \param val value to set for \a result
+- *
+- * \ingroup callbacks
+- * \fn static void wimaxll_cb_maybe_set_result(struct wimaxll_cb_ctx *ctx, int val)
+- */
+-void wimaxll_cb_maybe_set_result(struct wimaxll_cb_ctx *ctx, int val)
+-{
+- if (ctx != NULL && ctx->result == -EINPROGRESS)
+- ctx->result = val;
+-}
+-
+-
+-/**
+ * A WiMax control pipe handle
+ *
+ * This type is opaque to the user
+--
+1.7.4.1
+
diff --git a/net-wireless/wimax-tools/wimax-tools-1.4.4-r1.ebuild b/net-wireless/wimax-tools/wimax-tools-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..7861fdbe02d1
--- /dev/null
+++ b/net-wireless/wimax-tools/wimax-tools-1.4.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax-tools/wimax-tools-1.4.4-r1.ebuild,v 1.1 2011/02/23 11:19:04 alexxy Exp $
+
+EAPI="3"
+
+inherit linux-info base
+
+DESCRIPTION="Tools to use Intel's WiMax cards"
+HOMEPAGE="http://www.linuxwimax.org"
+SRC_URI="http://linuxwimax.org/Download?action=AttachFile&do=get&target=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-kernel/linux-headers-2.6.34
+ >=dev-libs/libnl-1.0"
+RDEPEND=""
+
+PATCHES=(
+ "${FILESDIR}/updates/0001-wimaxll_cb_ctx-move-to-internal.h-to-wimaxll.h-fixin.patch"
+)
+
+pkg_setup() {
+ linux-info_pkg_setup
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "Install failed"
+}