diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/vt6655/wcmd.h | |
| parent | cdd854bc42b5e6c79bbbc40c6600d995ffe6e747 (diff) | |
| parent | b12d1995f650e92f26184afd28e6cf40bf64467a (diff) | |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/wcmd.h')
| -rw-r--r-- | drivers/staging/vt6655/wcmd.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/vt6655/wcmd.h b/drivers/staging/vt6655/wcmd.h index c3c418089513..69d4fc55b843 100644 --- a/drivers/staging/vt6655/wcmd.h +++ b/drivers/staging/vt6655/wcmd.h @@ -75,11 +75,11 @@ typedef enum tagCMD_STATUS { typedef struct tagCMD_ITEM { CMD_CODE eCmd; - BYTE abyCmdDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; - BOOL bNeedRadioOFF; - WORD wDeAuthenReason; - BOOL bRadioCmd; - BOOL bForceSCAN; + unsigned char abyCmdDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; + bool bNeedRadioOFF; + unsigned short wDeAuthenReason; + bool bRadioCmd; + bool bForceSCAN; } CMD_ITEM, *PCMD_ITEM; // Command state @@ -119,21 +119,21 @@ vCommandTimer ( void *hDeviceContext ); -BOOL bClearBSSID_SCAN( +bool bClearBSSID_SCAN( void *hDeviceContext ); -BOOL +bool bScheduleCommand( void *hDeviceContext, CMD_CODE eCommand, - PBYTE pbyItem0 + unsigned char *pbyItem0 ); void vCommandTimerWait( void *hDeviceContext, - UINT MSecond + unsigned int MSecond ); #ifdef TxInSleep void |