dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Staging: vt6655: remove U8 custom macro 

Remove custom macro for unsigned 8-bit integers.

Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Charles Clément 2010-05-28 12:34:19 -07:00 committed by Greg Kroah-Hartman
parent ec28c7fab4
commit 737c3d708c
5 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/vt6655/desc.h
View File

@ -259,9 +259,9 @@ typedef struct tagRDES0 {
union { union {
volatile U16 f15Reserved; volatile U16 f15Reserved;
struct { struct {
volatile U8 f8Reserved1; volatile u8 f8Reserved1;
volatile U8 f1Owner:1; volatile u8 f1Owner:1;
volatile U8 f7Reserved:7; volatile u8 f7Reserved:7;
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))
@ -319,9 +319,9 @@ typedef struct tagTDES0 {
union { union {
volatile U16 f15Txtime; volatile U16 f15Txtime;
struct { struct {
volatile U8 f8Reserved1; volatile u8 f8Reserved1;
volatile U8 f1Owner:1; volatile u8 f1Owner:1;
volatile U8 f7Reserved:7; volatile u8 f7Reserved:7;
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
} __attribute__ ((__packed__)) } __attribute__ ((__packed__))

2
drivers/staging/vt6655/device_main.c
View File

@ -1151,7 +1151,7 @@ static BOOL device_init_info(struct pci_dev* pcid, PSDevice* ppDevice,
static BOOL device_get_pci_info(PSDevice pDevice, struct pci_dev* pcid) { static BOOL device_get_pci_info(PSDevice pDevice, struct pci_dev* pcid) {
U16 pci_cmd; U16 pci_cmd;
U8 b; u8 b;
UINT cis_addr; UINT cis_addr;
#ifdef PLICE_DEBUG #ifdef PLICE_DEBUG
BYTE pci_config[256]; BYTE pci_config[256];

66
drivers/staging/vt6655/iocmd.h
View File

@ -109,7 +109,7 @@ typedef enum tagWZONETYPE {
// //
#pragma pack(1) #pragma pack(1)
typedef struct tagSCmdRequest { typedef struct tagSCmdRequest {
U8 name[16]; u8 name[16];
void *data; void *data;
U16 wResult; U16 wResult;
U16 wCmdCode; U16 wCmdCode;
@ -121,7 +121,7 @@ typedef struct tagSCmdRequest {
typedef struct tagSCmdScan { typedef struct tagSCmdScan {
U8 ssid[SSID_MAXLEN + 2]; u8 ssid[SSID_MAXLEN + 2];
} SCmdScan, *PSCmdScan; } SCmdScan, *PSCmdScan;
@ -134,7 +134,7 @@ typedef struct tagSCmdBSSJoin {
U16 wBSSType; U16 wBSSType;
U16 wBBPType; U16 wBBPType;
U8 ssid[SSID_MAXLEN + 2]; u8 ssid[SSID_MAXLEN + 2];
U32 uChannel; U32 uChannel;
BOOL bPSEnable; BOOL bPSEnable;
BOOL bShareKeyAuth; BOOL bShareKeyAuth;
@ -155,9 +155,9 @@ typedef struct tagSCmdZoneTypeSet {
#ifdef WPA_SM_Transtatus #ifdef WPA_SM_Transtatus
typedef struct tagSWPAResult { typedef struct tagSWPAResult {
char ifname[100]; char ifname[100];
U8 proto; u8 proto;
U8 key_mgmt; u8 key_mgmt;
U8 eap_type; u8 eap_type;
BOOL authenticated; BOOL authenticated;
} SWPAResult, *PSWPAResult; } SWPAResult, *PSWPAResult;
#endif #endif
@ -166,11 +166,11 @@ typedef struct tagSCmdStartAP {
U16 wBSSType; U16 wBSSType;
U16 wBBPType; U16 wBBPType;
U8 ssid[SSID_MAXLEN + 2]; u8 ssid[SSID_MAXLEN + 2];
U32 uChannel; U32 uChannel;
U32 uBeaconInt; U32 uBeaconInt;
BOOL bShareKeyAuth; BOOL bShareKeyAuth;
U8 byBasicRate; u8 byBasicRate;
} SCmdStartAP, *PSCmdStartAP; } SCmdStartAP, *PSCmdStartAP;
@ -178,8 +178,8 @@ typedef struct tagSCmdStartAP {
typedef struct tagSCmdSetWEP { typedef struct tagSCmdSetWEP {
BOOL bEnableWep; BOOL bEnableWep;
U8 byKeyIndex; u8 byKeyIndex;
U8 abyWepKey[WEP_NKEYS][WEP_KEYMAXLEN]; u8 abyWepKey[WEP_NKEYS][WEP_KEYMAXLEN];
BOOL bWepKeyAvailable[WEP_NKEYS]; BOOL bWepKeyAvailable[WEP_NKEYS];
U32 auWepKeyLength[WEP_NKEYS]; U32 auWepKeyLength[WEP_NKEYS];
@ -190,13 +190,13 @@ typedef struct tagSCmdSetWEP {
typedef struct tagSBSSIDItem { typedef struct tagSBSSIDItem {
U32 uChannel; U32 uChannel;
U8 abyBSSID[BSSID_LEN]; u8 abyBSSID[BSSID_LEN];
U8 abySSID[SSID_MAXLEN + 1]; u8 abySSID[SSID_MAXLEN + 1];
//2006-1116-01,<Modify> by NomadZhao //2006-1116-01,<Modify> by NomadZhao
//U16 wBeaconInterval; //U16 wBeaconInterval;
//U16 wCapInfo; //U16 wCapInfo;
//U8 byNetType; //u8 byNetType;
U8 byNetType; u8 byNetType;
U16 wBeaconInterval; U16 wBeaconInterval;
U16 wCapInfo; // for address of byNetType at align 4 U16 wCapInfo; // for address of byNetType at align 4
@ -217,9 +217,9 @@ typedef struct tagSCmdLinkStatus {
BOOL bLink; BOOL bLink;
U16 wBSSType; U16 wBSSType;
U8 byState; u8 byState;
U8 abyBSSID[BSSID_LEN]; u8 abyBSSID[BSSID_LEN];
U8 abySSID[SSID_MAXLEN + 2]; u8 abySSID[SSID_MAXLEN + 2];
U32 uChannel; U32 uChannel;
U32 uLinkRate; U32 uLinkRate;
@ -329,8 +329,8 @@ typedef struct tagSStatMIBCount {
U32 dwCntRxFrmLength; U32 dwCntRxFrmLength;
U32 dwCntTxBufLength; U32 dwCntTxBufLength;
U8 abyCntRxPattern[16]; u8 abyCntRxPattern[16];
U8 abyCntTxPattern[16]; u8 abyCntTxPattern[16];
// Software check.... // Software check....
U32 dwCntRxDataErr; // rx buffer data software compare CRC err count U32 dwCntRxDataErr; // rx buffer data software compare CRC err count
@ -354,15 +354,15 @@ typedef struct tagSStatMIBCount {
typedef struct tagSNodeItem { typedef struct tagSNodeItem {
// STA info // STA info
U16 wAID; U16 wAID;
U8 abyMACAddr[6]; u8 abyMACAddr[6];
U16 wTxDataRate; U16 wTxDataRate;
U16 wInActiveCount; U16 wInActiveCount;
U16 wEnQueueCnt; U16 wEnQueueCnt;
U16 wFlags; U16 wFlags;
BOOL bPWBitOn; BOOL bPWBitOn;
U8 byKeyIndex; u8 byKeyIndex;
U16 wWepKeyLength; U16 wWepKeyLength;
U8 abyWepKey[WEP_KEYMAXLEN]; u8 abyWepKey[WEP_KEYMAXLEN];
// Auto rate fallback vars // Auto rate fallback vars
BOOL bIsInFallback; BOOL bIsInFallback;
U32 uTxFailures; U32 uTxFailures;
@ -419,24 +419,24 @@ enum {
struct viawget_hostapd_param { struct viawget_hostapd_param {
U32 cmd; U32 cmd;
U8 sta_addr[6]; u8 sta_addr[6];
union { union {
struct { struct {
U16 aid; U16 aid;
U16 capability; U16 capability;
U8 tx_supp_rates; u8 tx_supp_rates;
} add_sta; } add_sta;
struct { struct {
U32 inactive_sec; U32 inactive_sec;
} get_info_sta; } get_info_sta;
struct { struct {
U8 alg; u8 alg;
U32 flags; U32 flags;
U32 err; U32 err;
U8 idx; u8 idx;
U8 seq[8]; u8 seq[8];
U16 key_len; U16 key_len;
U8 key[0]; u8 key[0];
} crypt; } crypt;
struct { struct {
U32 flags_and; U32 flags_and;
@ -445,19 +445,19 @@ struct viawget_hostapd_param {
struct { struct {
U16 rid; U16 rid;
U16 len; U16 len;
U8 data[0]; u8 data[0];
} rid; } rid;
struct { struct {
U8 len; u8 len;
U8 data[0]; u8 data[0];
} generic_elem; } generic_elem;
struct { struct {
U16 cmd; U16 cmd;
U16 reason_code; U16 reason_code;
} mlme; } mlme;
struct { struct {
U8 ssid_len; u8 ssid_len;
U8 ssid[32]; u8 ssid[32];
} scan_req; } scan_req;
} u; } u;
}; };

2
drivers/staging/vt6655/mac.c
View File

@ -1046,7 +1046,7 @@ void MACvInitialize (DWORD_PTR dwIoBase)
//MACvRegBitsOn(dwIoBase, MAC_REG_I2MCSR, I2MCSR_AUTOLD); //MACvRegBitsOn(dwIoBase, MAC_REG_I2MCSR, I2MCSR_AUTOLD);
// wait until EEPROM loading complete // wait until EEPROM loading complete
//while (TRUE) { //while (TRUE) {
// U8 u8Data; // u8 u8Data;
// VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &u8Data); // VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &u8Data);
// if ( !(u8Data & I2MCSR_AUTOLD)) // if ( !(u8Data & I2MCSR_AUTOLD))
// break; // break;

1
drivers/staging/vt6655/ttype.h
View File

@ -68,7 +68,6 @@ typedef int BOOL;
* but it doesn't matter if they're signed or unsigned. * but it doesn't matter if they're signed or unsigned.
*/ */
typedef unsigned char U8; /* 8-bit unsigned integer */
typedef unsigned short U16; /* 16-bit unsigned integer */ typedef unsigned short U16; /* 16-bit unsigned integer */
typedef unsigned long U32; /* 32-bit unsigned integer */ typedef unsigned long U32; /* 32-bit unsigned integer */