Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 220070
b: refs/heads/master
c: 580a0bd
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Oct 5, 2010
1 parent 32aeb75 commit 849ceff
Show file tree
Hide file tree
Showing 24 changed files with 79 additions and 84 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 562c8850786d8d1a9e3f9f076deb581962c594ab
refs/heads/master: 580a0bd9b71d8e4e63e0720e64f339c740448c98
16 changes: 8 additions & 8 deletions trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand All @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
Expand Down
22 changes: 11 additions & 11 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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++) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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++));
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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];
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ void dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, void *pktbuf, int numpkt)
{
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;
Expand Down Expand Up @@ -2898,7 +2898,7 @@ int dhd_dev_pno_enable(struct net_device *dev, int pfn_enabled)
/* 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);

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,7 @@ static uint dhdsdio_sendfromq(dhd_bus_t *bus, uint maxframes)
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;
Expand Down Expand Up @@ -1374,7 +1374,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, uchar *msg, uint msglen)
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;
Expand Down Expand Up @@ -4954,7 +4954,7 @@ extern bool dhd_bus_watchdog(dhd_pub_t *dhdp)
}

#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;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2592,8 +2592,8 @@ wl_iw_set_encodeext(struct net_device *dev,
}

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];
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ extern int net_os_set_packet_filter(struct net_device *dev, int val);
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);

Expand Down
14 changes: 7 additions & 7 deletions trunk/drivers/staging/brcm80211/include/bcmutils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ extern "C" {
/* 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);
Expand Down Expand Up @@ -284,7 +284,7 @@ extern "C" {
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

Expand Down Expand Up @@ -565,7 +565,7 @@ extern "C" {
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);
Expand Down Expand Up @@ -598,9 +598,9 @@ extern "C" {

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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/include/nicpci.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 1 addition & 6 deletions trunk/drivers/staging/brcm80211/include/typedefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ typedef unsigned long long int uintptr;
* 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;
Expand Down Expand Up @@ -98,7 +94,6 @@ typedef signed int int32;

#define AUTO (-1) /* Auto = -1 */

#undef TYPEDEF_UCHAR
#undef TYPEDEF_USHORT
#undef TYPEDEF_UINT
#undef TYPEDEF_ULONG
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/include/wlioctl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ typedef struct wl_bss_info {

typedef struct wlc_ssid {
uint32 SSID_len;
uchar SSID[32];
unsigned char SSID[32];
} wlc_ssid_t;

typedef struct chan_scandata {
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ extern CONST dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_extlna_2G_rev2[];
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[];
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/sys/wl_export.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ extern void wl_add_timer(struct wl_info *wl, struct wl_timer *timer, uint ms,
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);
Expand Down
Loading

0 comments on commit 849ceff

Please sign in to comment.