lkml.org 
[lkml]   [2012]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv2] vsprintf: Add %pMR for Bluetooth MAC address
    Date
    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>
    ---
    v2: changed bluetooth to reversed, syntax fixes

    lib/vsprintf.c | 22 +++++++++++++++++-----
    1 file changed, 17 insertions(+), 5 deletions(-)

    diff --git a/lib/vsprintf.c b/lib/vsprintf.c
    index abbabec..d98b12d 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 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]);
    + index = !reversed ? 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 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 +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 (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


    \
     
     \ /
      Last update: 2012-05-28 11:41    [W:0.024 / U:159.784 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site