From: andrei.emeltchenko.news@gmail.com
To: linux-kernel@vger.kernel.org, joe@perches.com,
linux-bluetooth@vger.kernel.org
Cc: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Subject: [RFC] vsprintf: Add %pMR for Bluetooth MAC address
Date: Fri, 25 May 2012 17:32:48 +0300 [thread overview]
Message-ID: <1337956368-30621-1-git-send-email-andrei.emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1336778486.16292.0.camel@joe2Laptop>
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>
---
lib/vsprintf.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index abbabec..b767c3c 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -557,17 +557,27 @@ char *mac_address_string(char *buf, char *end, u8 *addr,
{
char mac_addr[sizeof("xx:xx:xx:xx:xx:xx")];
char *p = mac_addr;
- int i;
+ int i, index;
char separator;
+ bool bluetooth = false;
- if (fmt[1] == 'F') { /* FDDI canonical format */
+ switch (fmt[1]) {
+ case 'F':
separator = '-';
- } else {
+ break;
+
+ case 'R':
+ bluetooth = true;
+ /* fall through */
+
+ default:
separator = ':';
+ break;
}
for (i = 0; i < 6; i++) {
- p = hex_byte_pack(p, addr[i]);
+ index = !bluetooth ? i : 5 - i;
+ p = hex_byte_pack(p, addr[index]);
if (fmt[0] == 'M' && i != 5)
*p++ = separator;
}
@@ -830,6 +840,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 Bluetooth address, bits reversed
* - '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 +901,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 (Bluetooth, bits reversed) */
return mac_address_string(buf, end, ptr, spec, fmt);
case 'I': /* Formatted IP supported
* 4: 1.2.3.4
--
1.7.9.5
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
next prev parent reply other threads:[~2012-05-25 14:32 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 ` andrei.emeltchenko.news [this message]
2012-05-25 14:37 ` [RFC] vsprintf: Add %pMR for Bluetooth MAC address 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 ` [PATCHv3] " Andrei Emeltchenko
2012-06-05 11:57 ` 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=1337956368-30621-1-git-send-email-andrei.emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--cc=andrei.emeltchenko@intel.com \
--cc=joe@perches.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).