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: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/drivers/staging/brcm80211/brcmfmac/bcmutils.c
index 0f4b3f3..cef6d2b 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmutils.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmutils.c
@@ -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 @@
}
/* 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 @@
}
/* 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 @@
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 @@
}
}
-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 @@
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 @@
#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 @@
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);
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h
index 81ccb8d6..353c652 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd.h
+++ b/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -384,7 +384,7 @@
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 */
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_bus.h b/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
index 13252f5..c522e9a 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
@@ -41,15 +41,15 @@
/* 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 */
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
index 93f31de..fad3e72 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
@@ -75,7 +75,7 @@
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 @@
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;
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 69f997a..c68c8a4 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -526,7 +526,7 @@
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 @@
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 @@
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 @@
/* 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 @@
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 @@
/* 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];
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 2d3e53e..2d8b467 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1153,7 +1153,7 @@
{
dhd_info_t *dhd = (dhd_info_t *) dhdp->info;
struct sk_buff *skb;
- uchar *eth;
+ unsigned char *eth;
uint len;
void *data, *pnext, *save_pktbuf;
int i;
@@ -2898,7 +2898,7 @@
/* Linux wrapper to call common dhd_pno_set */
int
dhd_dev_pno_set(struct net_device *dev, wlc_ssid_t *ssids_local, int nssid,
- uchar scan_fr)
+ unsigned char scan_fr)
{
dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 746bd08..87204b7 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -1219,7 +1219,7 @@
return cnt;
}
-int dhd_bus_txctl(struct dhd_bus *bus, uchar *msg, uint msglen)
+int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)
{
u8 *frame;
uint16 len;
@@ -1374,7 +1374,7 @@
return ret ? -EIO : 0;
}
-int dhd_bus_rxctl(struct dhd_bus *bus, uchar *msg, uint msglen)
+int dhd_bus_rxctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)
{
int timeleft;
uint rxlen = 0;
@@ -4954,7 +4954,7 @@
}
#ifdef DHD_DEBUG
-extern int dhd_bus_console_in(dhd_pub_t *dhdp, uchar *msg, uint msglen)
+extern int dhd_bus_console_in(dhd_pub_t *dhdp, unsigned char *msg, uint msglen)
{
dhd_bus_t *bus = dhdp->bus;
uint32 addr, val;
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index 0da0f11..6674006 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -2592,8 +2592,8 @@
}
if (iwe->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
- uchar *ivptr;
- ivptr = (uchar *) iwe->rx_seq;
+ unsigned char *ivptr;
+ ivptr = (unsigned char *) iwe->rx_seq;
key.rxiv.hi = (ivptr[5] << 24) | (ivptr[4] << 16) |
(ivptr[3] << 8) | ivptr[2];
key.rxiv.lo = (ivptr[1] << 8) | ivptr[0];
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.h b/drivers/staging/brcm80211/brcmfmac/wl_iw.h
index d92a8d0..805c090 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.h
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.h
@@ -129,11 +129,11 @@
extern int dhd_pno_enable(dhd_pub_t *dhd, int pfn_enabled);
extern int dhd_pno_clean(dhd_pub_t *dhd);
extern int dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t *ssids_local, int nssid,
- uchar scan_fr);
+ unsigned char scan_fr);
extern int dhd_pno_get_status(dhd_pub_t *dhd);
extern int dhd_dev_pno_reset(struct net_device *dev);
extern int dhd_dev_pno_set(struct net_device *dev, wlc_ssid_t *ssids_local,
- int nssid, uchar scan_fr);
+ int nssid, unsigned char scan_fr);
extern int dhd_dev_pno_enable(struct net_device *dev, int pfn_enabled);
extern int dhd_dev_get_pno_status(struct net_device *dev);
diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h
index 706a51c..bc8f862 100644
--- a/drivers/staging/brcm80211/include/bcmutils.h
+++ b/drivers/staging/brcm80211/include/bcmutils.h
@@ -190,9 +190,9 @@
/* externs */
/* packet */
extern uint pktcopy(osl_t *osh, void *p, uint offset, int len,
- uchar *buf);
+ unsigned char *buf);
extern uint pktfrombuf(osl_t *osh, void *p, uint offset, int len,
- uchar *buf);
+ unsigned char *buf);
extern uint pkttotlen(osl_t *osh, void *p);
extern void *pktlast(osl_t *osh, void *p);
extern uint pktsegcnt(osl_t *osh, void *p);
@@ -284,7 +284,7 @@
extern int bcm_iovar_lencheck(const bcm_iovar_t *table, void *arg,
int len, bool set);
#if defined(BCMDBG)
- extern int bcm_format_ssid(char *buf, const uchar ssid[],
+ extern int bcm_format_ssid(char *buf, const unsigned char ssid[],
uint ssid_len);
#endif
@@ -565,7 +565,7 @@
extern char *bcm_chipname(uint chipid, char *buf, uint len);
extern char *bcm_brev_str(uint32 brev, char *buf);
extern void printbig(char *buf);
- extern void prhex(const char *msg, uchar *buf, uint len);
+ extern void prhex(const char *msg, unsigned char *buf, uint len);
/* IE parsing */
extern bcm_tlv_t *BCMROMFN(bcm_next_tlv) (bcm_tlv_t *elt, int *buflen);
@@ -598,9 +598,9 @@
extern void bcm_binit(struct bcmstrbuf *b, char *buf, uint size);
extern int bcm_bprintf(struct bcmstrbuf *b, const char *fmt, ...);
- extern void bcm_inc_bytes(uchar *num, int num_bytes, u8 amount);
- extern int bcm_cmp_bytes(uchar *arg1, uchar *arg2, u8 nbytes);
- extern void bcm_print_bytes(char *name, const uchar *cdata, int len);
+ extern void bcm_inc_bytes(unsigned char *num, int num_bytes, u8 amount);
+ extern int bcm_cmp_bytes(unsigned char *arg1, unsigned char *arg2, u8 nbytes);
+ extern void bcm_print_bytes(char *name, const unsigned char *cdata, int len);
typedef uint32(*bcmutl_rdreg_rtn) (void *arg0, uint arg1,
uint32 offset);
diff --git a/drivers/staging/brcm80211/include/nicpci.h b/drivers/staging/brcm80211/include/nicpci.h
index c267551..bab11c7 100644
--- a/drivers/staging/brcm80211/include/nicpci.h
+++ b/drivers/staging/brcm80211/include/nicpci.h
@@ -46,7 +46,7 @@
struct sbpcieregs;
extern u8 pcicore_find_pci_capability(osl_t *osh, u8 req_cap_id,
- uchar *buf, uint32 *buflen);
+ unsigned char *buf, uint32 *buflen);
extern uint pcie_readreg(osl_t *osh, struct sbpcieregs *pcieregs,
uint addrtype, uint offset);
extern uint pcie_writereg(osl_t *osh, struct sbpcieregs *pcieregs,
diff --git a/drivers/staging/brcm80211/include/typedefs.h b/drivers/staging/brcm80211/include/typedefs.h
index 2734c34..07b5207 100644
--- a/drivers/staging/brcm80211/include/typedefs.h
+++ b/drivers/staging/brcm80211/include/typedefs.h
@@ -38,11 +38,7 @@
* Default Typedefs
*/
-/* define uchar, ushort, uint, ulong */
-
-#ifndef TYPEDEF_UCHAR
-typedef unsigned char uchar;
-#endif
+/* define ushort, uint, ulong */
#ifndef TYPEDEF_USHORT
typedef unsigned short ushort;
@@ -98,7 +94,6 @@
#define AUTO (-1) /* Auto = -1 */
-#undef TYPEDEF_UCHAR
#undef TYPEDEF_USHORT
#undef TYPEDEF_UINT
#undef TYPEDEF_ULONG
diff --git a/drivers/staging/brcm80211/include/wlioctl.h b/drivers/staging/brcm80211/include/wlioctl.h
index 20ac0a7..955662d 100644
--- a/drivers/staging/brcm80211/include/wlioctl.h
+++ b/drivers/staging/brcm80211/include/wlioctl.h
@@ -152,7 +152,7 @@
typedef struct wlc_ssid {
uint32 SSID_len;
- uchar SSID[32];
+ unsigned char SSID[32];
} wlc_ssid_t;
typedef struct chan_scandata {
diff --git a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h b/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h
index 8a8ef7b..b9cbc12 100644
--- a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h
+++ b/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h
@@ -36,11 +36,11 @@
extern CONST dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_extlna_5G_rev2[];
typedef struct {
- uchar gm;
- uchar pga;
- uchar pad;
- uchar dac;
- uchar bb_mult;
+ unsigned char gm;
+ unsigned char pga;
+ unsigned char pad;
+ unsigned char dac;
+ unsigned char bb_mult;
} lcnphy_tx_gain_tbl_entry;
extern CONST lcnphy_tx_gain_tbl_entry dot11lcnphy_2GHz_gaintable_rev0[];
diff --git a/drivers/staging/brcm80211/sys/wl_export.h b/drivers/staging/brcm80211/sys/wl_export.h
index 69d06a3..836fb83 100644
--- a/drivers/staging/brcm80211/sys/wl_export.h
+++ b/drivers/staging/brcm80211/sys/wl_export.h
@@ -45,7 +45,7 @@
int periodic);
extern bool wl_del_timer(struct wl_info *wl, struct wl_timer *timer);
-extern uint wl_buf_to_pktcopy(osl_t *osh, void *p, uchar *buf, int len,
+extern uint wl_buf_to_pktcopy(osl_t *osh, void *p, unsigned char *buf, int len,
uint offset);
extern void *wl_get_pktbuffer(osl_t *osh, int len);
extern int wl_set_pktlen(osl_t *osh, void *p, int len);
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 9b713d3..f3d8d3a 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -3527,12 +3527,12 @@
if (r->size == sizeof(uint32))
r->val =
R_REG(osh,
- (uint32 *) ((uchar *) (uintptr) regs +
+ (uint32 *) ((unsigned char *) (uintptr) regs +
r->byteoff));
else if (r->size == sizeof(uint16))
r->val =
R_REG(osh,
- (uint16 *) ((uchar *) (uintptr) regs +
+ (uint16 *) ((unsigned char *) (uintptr) regs +
r->byteoff));
else
bcmerror = BCME_BADADDR;
@@ -3562,11 +3562,11 @@
}
if (r->size == sizeof(uint32))
W_REG(osh,
- (uint32 *) ((uchar *) (uintptr) regs +
+ (uint32 *) ((unsigned char *) (uintptr) regs +
r->byteoff), r->val);
else if (r->size == sizeof(uint16))
W_REG(osh,
- (uint16 *) ((uchar *) (uintptr) regs +
+ (uint16 *) ((unsigned char *) (uintptr) regs +
r->byteoff), r->val);
else
bcmerror = BCME_BADADDR;
@@ -4105,7 +4105,7 @@
case WLC_GET_PHYLIST:
{
- uchar *cp = arg;
+ unsigned char *cp = arg;
if (len < 3) {
bcmerror = BCME_BUFTOOSHORT;
break;
@@ -5081,7 +5081,7 @@
char hexbuf[256];
/* add plcp header along with txh descriptor */
- prhex("Raw TxDesc + plcp header", (uchar *) txh, sizeof(d11txh_t) + 48);
+ prhex("Raw TxDesc + plcp header", (unsigned char *) txh, sizeof(d11txh_t) + 48);
printf("TxCtlLow: %04x ", mtcl);
printf("TxCtlHigh: %04x ", mtch);
@@ -5153,7 +5153,7 @@
{0, NULL}
};
- prhex("Raw RxDesc", (uchar *) rxh, sizeof(d11rxhdr_t));
+ prhex("Raw RxDesc", (unsigned char *) rxh, sizeof(d11rxhdr_t));
bcm_format_flags(macstat_flags, macstatus1, flagstr, 64);
@@ -5170,7 +5170,7 @@
#endif /* defined(BCMDBG) */
#if defined(BCMDBG)
-int wlc_format_ssid(char *buf, const uchar ssid[], uint ssid_len)
+int wlc_format_ssid(char *buf, const unsigned char ssid[], uint ssid_len)
{
uint i, c;
char *p = buf;
@@ -5184,7 +5184,7 @@
if (c == '\\') {
*p++ = '\\';
*p++ = '\\';
- } else if (isprint((uchar) c)) {
+ } else if (isprint((unsigned char) c)) {
*p++ = (char)c;
} else {
p += snprintf(p, (endp - p), "\\x%02X", c);
@@ -7051,7 +7051,7 @@
int preamble;
int channel;
ratespec_t rspec;
- uchar *plcp;
+ unsigned char *plcp;
wlc_read_tsf(wlc, &tsf_l, &tsf_h); /* mactime */
rx_status->mactime = tsf_h;
diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h
index 6964660..46a55f1 100644
--- a/drivers/staging/brcm80211/sys/wlc_pub.h
+++ b/drivers/staging/brcm80211/sys/wlc_pub.h
@@ -603,7 +603,7 @@
extern bool wlc_radio_monitor_stop(struct wlc_info *wlc);
#if defined(BCMDBG)
-extern int wlc_format_ssid(char *buf, const uchar ssid[], uint ssid_len);
+extern int wlc_format_ssid(char *buf, const unsigned char ssid[], uint ssid_len);
#endif
extern void wlc_pmkid_build_cand_list(struct wlc_bsscfg *cfg, bool check_SSID);
diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c
index b91f6e4..4483322 100644
--- a/drivers/staging/brcm80211/util/aiutils.c
+++ b/drivers/staging/brcm80211/util/aiutils.c
@@ -514,7 +514,7 @@
SI_CORE_SIZE);
ASSERT(GOODREGS(sii->regs[coreidx]));
}
- r = (uint32 *) ((uchar *) sii->regs[coreidx] + regoff);
+ r = (uint32 *) ((unsigned char *) sii->regs[coreidx] + regoff);
} else if (BUSTYPE(sih->bustype) == PCI_BUS) {
/* If pci/pcie, we can get at pci/pcie regs and on newer cores to chipc */
@@ -549,7 +549,7 @@
origidx = si_coreidx(&sii->pub);
/* switch core */
- r = (uint32 *) ((uchar *) ai_setcoreidx(&sii->pub, coreidx) +
+ r = (uint32 *) ((unsigned char *) ai_setcoreidx(&sii->pub, coreidx) +
regoff);
}
ASSERT(r != NULL);
diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 7464c1f..1fafc14 100644
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/drivers/staging/brcm80211/util/bcmutils.c
@@ -38,7 +38,7 @@
#endif /* WLC_LOW */
/* 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;
@@ -69,7 +69,7 @@
}
/* 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;
@@ -1131,7 +1131,7 @@
#endif /* defined(BCMDBG) */
/* 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;
int len = sizeof(line);
@@ -1419,7 +1419,7 @@
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;
@@ -1431,7 +1431,7 @@
}
}
-int bcm_cmp_bytes(uchar *arg1, uchar *arg2, u8 nbytes)
+int bcm_cmp_bytes(unsigned char *arg1, unsigned char *arg2, u8 nbytes)
{
int i;
@@ -1442,7 +1442,7 @@
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;
@@ -1461,7 +1461,7 @@
#if defined(BCMDBG)
#define SSID_FMT_BUF_LEN ((4 * DOT11_MAX_SSID_LEN) + 1)
-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;
@@ -1475,7 +1475,7 @@
if (c == '\\') {
*p++ = '\\';
*p++ = '\\';
- } else if (isprint((uchar) c)) {
+ } else if (isprint((unsigned char) c)) {
*p++ = (char)c;
} else {
p += snprintf(p, (endp - p), "\\x%02X", c);
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c
index 8722bd9..c816604 100644
--- a/drivers/staging/brcm80211/util/hnddma.c
+++ b/drivers/staging/brcm80211/util/hnddma.c
@@ -1664,7 +1664,7 @@
static int dma32_txfast(dma_info_t *di, void *p0, bool commit)
{
void *p, *next;
- uchar *data;
+ unsigned char *data;
uint len;
uint16 txout;
uint32 flags = 0;
@@ -2315,7 +2315,7 @@
static int BCMFASTPATH dma64_txfast(dma_info_t *di, void *p0, bool commit)
{
void *p, *next;
- uchar *data;
+ unsigned char *data;
uint len;
uint16 txout;
uint32 flags = 0;
diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/util/nicpci.c
index 94f346f..49844ec 100644
--- a/drivers/staging/brcm80211/util/nicpci.c
+++ b/drivers/staging/brcm80211/util/nicpci.c
@@ -153,7 +153,7 @@
/* return cap_offset if requested capability exists in the PCI config space */
/* Note that it's caller's responsibility to make sure it's a pci bus */
u8
-pcicore_find_pci_capability(osl_t *osh, u8 req_cap_id, uchar *buf,
+pcicore_find_pci_capability(osl_t *osh, u8 req_cap_id, unsigned char *buf,
uint32 *buflen)
{
u8 cap_id;
diff --git a/drivers/staging/brcm80211/util/sbutils.c b/drivers/staging/brcm80211/util/sbutils.c
index eedfa29..0f0d5a5 100644
--- a/drivers/staging/brcm80211/util/sbutils.c
+++ b/drivers/staging/brcm80211/util/sbutils.c
@@ -164,7 +164,7 @@
origidx = si_coreidx(&sii->pub);
/* switch core */
- r = (uint32 *) ((uchar *) sb_setcoreidx(&sii->pub, coreidx) +
+ r = (uint32 *) ((unsigned char *) sb_setcoreidx(&sii->pub, coreidx) +
regoff);
}
ASSERT(r != NULL);
diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c
index bccd3c2..1a4c2b6 100644
--- a/drivers/staging/brcm80211/util/siutils.c
+++ b/drivers/staging/brcm80211/util/siutils.c
@@ -383,7 +383,7 @@
ASSERT(GOODREGS(regs));
- bzero((uchar *) sii, sizeof(si_info_t));
+ bzero((unsigned char *) sii, sizeof(si_info_t));
savewin = 0;
@@ -518,7 +518,7 @@
ASSERT(GOODREGS(regs));
- bzero((uchar *) sii, sizeof(si_info_t));
+ bzero((unsigned char *) sii, sizeof(si_info_t));
savewin = 0;
@@ -913,7 +913,7 @@
sii = SI_INFO(sih);
- bcopy((uchar *) sii->coreid, (uchar *) coreid,
+ bcopy((unsigned char *) sii->coreid, (unsigned char *) coreid,
(sii->numcores * sizeof(uint)));
return sii->numcores;
}