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

Commit 5c9824e1 authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files

Staging: vt6655: remove custom UCHAR typedef 



Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b83cc2ed

drivers/staging/vt6655/device.h

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ typedef enum __device_init_type { 
#define NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED	0x01



// PMKID Structures

typedef UCHAR   NDIS_802_11_PMKID_VALUE[16];

typedef unsigned char NDIS_802_11_PMKID_VALUE[16];





typedef enum _NDIS_802_11_WEP_STATUS

drivers/staging/vt6655/device_main.c

+8 −6
Original line number Diff line number Diff line
@@ -340,7 +340,8 @@ static void device_free_rd0_ring(PSDevice pDevice); 
static void device_free_rd1_ring(PSDevice pDevice);

static void device_free_rings(PSDevice pDevice);

static void device_free_frag_buf(PSDevice pDevice);

static int Config_FileGetParameter(UCHAR *string, UCHAR *dest,UCHAR *source);

static int Config_FileGetParameter(unsigned char *string,

		unsigned char *dest, unsigned char *source);





/*---------------------  Export Variables  --------------------------*/
@@ -2978,9 +2979,10 @@ static inline u32 ether_crc(int length, unsigned char *data) 
}



//2008-8-4 <add> by chester

static int Config_FileGetParameter(UCHAR *string, UCHAR *dest,UCHAR *source)

static int Config_FileGetParameter(unsigned char *string,

		unsigned char *dest, unsigned char *source)

{

  UCHAR buf1[100];

  unsigned char buf1[100];

  int source_len = strlen(source);



    memset(buf1,0,100);
@@ -2993,9 +2995,9 @@ static int Config_FileGetParameter(UCHAR *string, UCHAR *dest,UCHAR *source) 
}



int Config_FileOperation(PSDevice pDevice,BOOL fwrite,unsigned char *Parameter) {

    UCHAR    *config_path=CONFIG_PATH;

    UCHAR    *buffer=NULL;

    UCHAR      tmpbuffer[20];

    unsigned char *config_path = CONFIG_PATH;

    unsigned char *buffer = NULL;

    unsigned char tmpbuffer[20];

    struct file   *filp=NULL;

    mm_segment_t old_fs = get_fs();

    //int oldfsuid=0,oldfsgid=0;

drivers/staging/vt6655/ttype.h

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ typedef int BOOL; 
 * but it doesn't matter if they're signed or unsigned.

 */



typedef unsigned char   UCHAR;

typedef unsigned short  USHORT;

typedef unsigned int    UINT;

typedef unsigned long   ULONG;

drivers/staging/vt6655/wmgr.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ typedef void (*TimerFunction)(ULONG); 


//+++ NDIS related



typedef UCHAR   NDIS_802_11_MAC_ADDRESS[6];

typedef unsigned char NDIS_802_11_MAC_ADDRESS[6];

typedef struct _NDIS_802_11_AI_REQFI

{

    USHORT Capabilities;