From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org, akpm@linux-foundation.org,
linux-kernel@vger.kernel.org, adobriyan@gmail.com,
andriy.shevchenko@linux.intel.com
Subject: [PATCHv3] vsprintf: Add %pMR for Bluetooth MAC address
Date: Mon, 28 May 2012 16:05:16 +0300 [thread overview]
Message-ID: <1338210316-12299-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <CAHp75Vc3sut7R7FF=xHQ0-3HaydPBh86sNnzRjKP8+ow=SOfLg@mail.gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Bluetooth uses mostly LE byte order which is reversed for visual
interpretation. Currently in Bluetooth in use unsafe batostr function.
This is slightly modified version of Joe Perches <joe@perches.com>
patch (sent Sat, Dec 4, 2010).
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
v3: removed extra variable index
v2: changed bluetooth to reversed, syntax fixes
lib/vsprintf.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index abbabec..55052fa 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -559,15 +559,28 @@ char *mac_address_string(char *buf, char *end, u8 *addr,
char *p = mac_addr;
int i;
char separator;
+ bool reversed = false;
- if (fmt[1] == 'F') { /* FDDI canonical format */
+ switch (fmt[1]) {
+ case 'F':
separator = '-';
- } else {
+ break;
+
+ case 'R':
+ reversed = true;
+ /* fall through */
+
+ default:
separator = ':';
+ break;
}
for (i = 0; i < 6; i++) {
- p = hex_byte_pack(p, addr[i]);
+ if (reversed)
+ p = hex_byte_pack(p, addr[5 - i]);
+ else
+ p = hex_byte_pack(p, addr[i]);
+
if (fmt[0] == 'M' && i != 5)
*p++ = separator;
}
@@ -830,6 +843,7 @@ int kptr_restrict __read_mostly;
* - 'm' For a 6-byte MAC address, it prints the hex address without colons
* - 'MF' For a 6-byte MAC FDDI address, it prints the address
* with a dash-separated hex notation
+ * - '[mM]R For a 6-byte MAC address, Reverse order (Bluetooth)
* - 'I' [46] for IPv4/IPv6 addresses printed in the usual way
* IPv4 uses dot-separated decimal without leading 0's (1.2.3.4)
* IPv6 uses colon separated network-order 16 bit hex with leading 0's
@@ -890,7 +904,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
return resource_string(buf, end, ptr, spec, fmt);
case 'M': /* Colon separated: 00:01:02:03:04:05 */
case 'm': /* Contiguous: 000102030405 */
- /* [mM]F (FDDI, bit reversed) */
+ /* [mM]F (FDDI) */
+ /* [mM]R (Reverse order; Bluetooth) */
return mac_address_string(buf, end, ptr, spec, fmt);
case 'I': /* Formatted IP supported
* 4: 1.2.3.4
--
1.7.9.5
next prev parent reply other threads:[~2012-05-28 13:05 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-04 2:33 [PATCH 0/2] Add and use vsprintf extension %pMbt for bluetooth macs Joe Perches
2010-12-04 2:33 ` [PATCH 2/2] bluetooth: Use printf extension %pMbt Joe Perches
2010-12-06 18:15 ` Gustavo F. Padovan
2010-12-06 18:50 ` Joe Perches
2010-12-06 20:07 ` Gustavo F. Padovan
2012-05-09 9:01 ` [PATCH 0/2] Add and use vsprintf extension %pMbt for bluetooth macs Andrei Emeltchenko
2012-05-11 23:21 ` Joe Perches
2012-05-25 14:32 ` [RFC] vsprintf: Add %pMR for Bluetooth MAC address andrei.emeltchenko.news
2012-05-25 14:37 ` Gustavo Padovan
2012-05-25 15:07 ` Joe Perches
2012-05-28 9:00 ` [PATCHv2] " Andrei Emeltchenko
2012-05-28 10:01 ` Andy Shevchenko
2012-05-28 10:20 ` Andrei Emeltchenko
2012-05-28 13:05 ` Andrei Emeltchenko [this message]
2012-06-05 11:57 ` [PATCHv3] " Andrei Emeltchenko
2012-06-20 10:44 ` [PATCH] Docs: printk-formats: add description for %pMR Andrei Emeltchenko
2012-06-20 21:19 ` Andrew Morton
2012-06-21 7:08 ` Andrei Emeltchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338210316-12299-1-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).