Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16910554 authored by Moritz Muehlenhoff's avatar Moritz Muehlenhoff Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: Move wlan_mkprintstr() and wlan_hexchar() macros into prism2sta.c 



Signed-off-by: default avatarMoritz Muehlenhoff <jmm@debian.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 96c5abd7

drivers/staging/wlan-ng/prism2sta.c

+22 −5
Original line number Diff line number Diff line
@@ -90,14 +90,31 @@ 
#include "hfa384x.h"

#include "prism2mgmt.h"



/*================================================================*/

/* Local Constants */



/*================================================================*/

/* Local Macros */



/*================================================================*/

/* Local Types */

#define wlan_hexchar(x) (((x) < 0x0a) ? ('0' + (x)) : ('a' + ((x) - 0x0a)))



/* Create a string of printable chars from something that might not be */

/* It's recommended that the str be 4*len + 1 bytes long */

#define wlan_mkprintstr(buf, buflen, str, strlen) \

{ \

	int i = 0; \

	int j = 0; \

	memset(str, 0, (strlen)); \

	for (i = 0; i < (buflen); i++) { \

		if ( isprint((buf)[i]) ) { \

			(str)[j] = (buf)[i]; \

			j++; \

		} else { \

			(str)[j] = '\\'; \

			(str)[j+1] = 'x'; \

			(str)[j+2] = wlan_hexchar(((buf)[i] & 0xf0) >> 4); \

			(str)[j+3] = wlan_hexchar(((buf)[i] & 0x0f)); \

			j += 4; \

		} \

	} \

}



/*================================================================*/

/* Local Static Definitions */

drivers/staging/wlan-ng/wlan_compat.h

+0 −27
Original line number Diff line number Diff line
@@ -60,33 +60,6 @@ 


#define WLAN_LOG_DEBUG(l, s, args...)



/*=============================================================*/

/*--- General Macros ------------------------------------------*/

/*=============================================================*/



#define wlan_hexchar(x) (((x) < 0x0a) ? ('0' + (x)) : ('a' + ((x) - 0x0a)))



/* Create a string of printable chars from something that might not be */

/* It's recommended that the str be 4*len + 1 bytes long */

#define wlan_mkprintstr(buf, buflen, str, strlen) \

{ \

	int i = 0; \

	int j = 0; \

	memset(str, 0, (strlen)); \

	for (i = 0; i < (buflen); i++) { \

		if ( isprint((buf)[i]) ) { \

			(str)[j] = (buf)[i]; \

			j++; \

		} else { \

			(str)[j] = '\\'; \

			(str)[j+1] = 'x'; \

			(str)[j+2] = wlan_hexchar(((buf)[i] & 0xf0) >> 4); \

			(str)[j+3] = wlan_hexchar(((buf)[i] & 0x0f)); \

			j += 4; \

		} \

	} \

}



/*=============================================================*/

/*--- Variables -----------------------------------------------*/

/*=============================================================*/