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

Commit 580a0bd9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: brcm80211: s/uchar/unsigned char/ 



This changes the usage everywhere in the driver, and removes
the definition as it should no longer be used anywhere.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 562c8850

drivers/staging/brcm80211/brcmfmac/bcmutils.c

+8 −8
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#ifdef BCMDRIVER



/* copy a pkt buffer chain into a buffer */

uint pktcopy(osl_t *osh, void *p, uint offset, int len, uchar * buf)

uint pktcopy(osl_t *osh, void *p, uint offset, int len, unsigned char * buf)

{

	uint n, ret = 0;
@@ -73,7 +73,7 @@ uint pktcopy(osl_t *osh, void *p, uint offset, int len, uchar * buf) 
}



/* copy a buffer into a pkt buffer chain */

uint pktfrombuf(osl_t *osh, void *p, uint offset, int len, uchar *buf)

uint pktfrombuf(osl_t *osh, void *p, uint offset, int len, unsigned char *buf)

{

	uint n, ret = 0;
@@ -1473,7 +1473,7 @@ int bcm_format_hex(char *str, const void *bytes, int len) 
}



/* pretty hex print a contiguous buffer */

void prhex(const char *msg, uchar *buf, uint nbytes)

void prhex(const char *msg, unsigned char *buf, uint nbytes)

{

	char line[128], *p;

	uint i;
@@ -1716,7 +1716,7 @@ int bcm_bprintf(struct bcmstrbuf *b, const char *fmt, ...) 
	return r;

}



void bcm_inc_bytes(uchar *num, int num_bytes, u8 amount)

void bcm_inc_bytes(unsigned char *num, int num_bytes, u8 amount)

{

	int i;
@@ -1728,7 +1728,7 @@ void bcm_inc_bytes(uchar *num, int num_bytes, u8 amount) 
	}

}



int bcm_cmp_bytes(uchar *arg1, uchar *arg2, u8 nbytes)

int bcm_cmp_bytes(unsigned char *arg1, unsigned char *arg2, u8 nbytes)

{

	int i;
@@ -1739,7 +1739,7 @@ int bcm_cmp_bytes(uchar *arg1, uchar *arg2, u8 nbytes) 
	return 0;

}



void bcm_print_bytes(char *name, const uchar *data, int len)

void bcm_print_bytes(char *name, const unsigned char *data, int len)

{

	int i;

	int per_line = 0;
@@ -1782,7 +1782,7 @@ char *getvar(char *vars, const char *name) 


#if defined(WLTINYDUMP) || defined(WLMSG_INFORM) || defined(WLMSG_ASSOC) || \

	defined(WLMSG_PRPKT) || defined(WLMSG_WSEC)

int bcm_format_ssid(char *buf, const uchar ssid[], uint ssid_len)

int bcm_format_ssid(char *buf, const unsigned char ssid[], uint ssid_len)

{

	uint i, c;

	char *p = buf;
@@ -1796,7 +1796,7 @@ int bcm_format_ssid(char *buf, const uchar ssid[], uint ssid_len) 
		if (c == '\\') {

			*p++ = '\\';

			*p++ = '\\';

		} else if (bcm_isprint((uchar) c)) {

		} else if (bcm_isprint((unsigned char) c)) {

			*p++ = (char)c;

		} else {

			p += snprintf(p, (endp - p), "\\x%02X", c);

drivers/staging/brcm80211/brcmfmac/dhd.h

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ extern void dhd_vif_add(struct dhd_info *dhd, int ifidx, char *name); 
extern void dhd_vif_del(struct dhd_info *dhd, int ifidx);



extern void dhd_event(struct dhd_info *dhd, char *evpkt, int evlen, int ifidx);

extern void dhd_vif_sendup(struct dhd_info *dhd, int ifidx, uchar * cp,

extern void dhd_vif_sendup(struct dhd_info *dhd, int ifidx, unsigned char * cp,

			   int len);



/* Send packet to dongle via data channel */

drivers/staging/brcm80211/brcmfmac/dhd_bus.h

+3 −3
Original line number Diff line number Diff line
@@ -41,15 +41,15 @@ extern int dhd_bus_txdata(struct dhd_bus *bus, void *txp); 
/* Send/receive a control message to/from the dongle.

 * Expects caller to enforce a single outstanding transaction.

 */

extern int dhd_bus_txctl(struct dhd_bus *bus, uchar *msg, uint msglen);

extern int dhd_bus_rxctl(struct dhd_bus *bus, uchar *msg, uint msglen);

extern int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen);

extern int dhd_bus_rxctl(struct dhd_bus *bus, unsigned char *msg, uint msglen);



/* Watchdog timer function */

extern bool dhd_bus_watchdog(dhd_pub_t *dhd);



#ifdef DHD_DEBUG

/* Device console input function */

extern int dhd_bus_console_in(dhd_pub_t *dhd, uchar *msg, uint msglen);

extern int dhd_bus_console_in(dhd_pub_t *dhd, unsigned char *msg, uint msglen);

#endif				/* DHD_DEBUG */



/* Deferred processing for the bus, return TRUE requests reschedule */

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int dhdcdc_msg(dhd_pub_t *dhd) 
		len = CDC_MAX_MSG_SIZE;



	/* Send request */

	return dhd_bus_txctl(dhd->bus, (uchar *)&prot->msg, len);

	return dhd_bus_txctl(dhd->bus, (unsigned char *)&prot->msg, len);

}



static int dhdcdc_cmplt(dhd_pub_t *dhd, uint32 id, uint32 len)
@@ -87,7 +87,7 @@ static int dhdcdc_cmplt(dhd_pub_t *dhd, uint32 id, uint32 len) 


	do {

		ret =

		    dhd_bus_rxctl(dhd->bus, (uchar *)&prot->msg,

		    dhd_bus_rxctl(dhd->bus, (unsigned char *)&prot->msg,

				  len + sizeof(cdc_ioctl_t));

		if (ret < 0)

			break;

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+11 −11
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static void wl_show_host_event(wl_event_msg_t *event, void *event_data) 
	uint i, status, reason;

	bool group = FALSE, flush_txq = FALSE, link = FALSE;

	char *auth_str, *event_name;

	uchar *buf;

	unsigned char *buf;

	char err_msg[256], eabuf[ETHER_ADDR_STR_LEN];

	static struct {

		uint event;
@@ -599,12 +599,12 @@ static void wl_show_host_event(wl_event_msg_t *event, void *event_data) 
	datalen = ntoh32(event->datalen);

	/* debug dump of event messages */

	sprintf(eabuf, "%02x:%02x:%02x:%02x:%02x:%02x",

		(uchar) event->addr.octet[0] & 0xff,

		(uchar) event->addr.octet[1] & 0xff,

		(uchar) event->addr.octet[2] & 0xff,

		(uchar) event->addr.octet[3] & 0xff,

		(uchar) event->addr.octet[4] & 0xff,

		(uchar) event->addr.octet[5] & 0xff);

		(unsigned char) event->addr.octet[0] & 0xff,

		(unsigned char) event->addr.octet[1] & 0xff,

		(unsigned char) event->addr.octet[2] & 0xff,

		(unsigned char) event->addr.octet[3] & 0xff,

		(unsigned char) event->addr.octet[4] & 0xff,

		(unsigned char) event->addr.octet[5] & 0xff);



	event_name = "UNKNOWN";

	for (i = 0; i < ARRAYSIZE(event_names); i++) {
@@ -755,7 +755,7 @@ static void wl_show_host_event(wl_event_msg_t *event, void *event_data) 
			uint32 nblost;

			char *s, *p;



			buf = (uchar *) event_data;

			buf = (unsigned char *) event_data;

			memcpy(&hdr, buf, MSGTRACE_HDRLEN);



			if (hdr.version != MSGTRACE_VERSION) {
@@ -819,7 +819,7 @@ static void wl_show_host_event(wl_event_msg_t *event, void *event_data) 


	/* show any appended data */

	if (datalen) {

		buf = (uchar *) event_data;

		buf = (unsigned char *) event_data;

		DHD_EVENT((" data (%d) : ", datalen));

		for (i = 0; i < datalen; i++)

			DHD_EVENT((" 0x%02x ", *buf++));
@@ -1507,7 +1507,7 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip) 
	wl_scan_results_t *results;

	wl_bss_info_t UNALIGNED *bi, *bi_new, *bi_next;



	uchar *s_addr = addr;

	unsigned char *s_addr = addr;



	dhd_iscan_lock();

	DHD_ISCAN(("%s: BSS to remove %X:%X:%X:%X:%X:%X\n",
@@ -1818,7 +1818,7 @@ int dhd_pno_enable(dhd_pub_t *dhd, int pfn_enabled) 


/* Function to execute combined scan */

int

dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t *ssids_local, int nssid, uchar scan_fr)

dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t *ssids_local, int nssid, unsigned char scan_fr)

{

	int err = -1;

	char iovbuf[128];