From 0a9e22796c65eea458db389c11d7b2db54400a25 Mon Sep 17 00:00:00 2001 From: Sanjay Devnani Date: Wed, 5 Feb 2014 16:05:03 -0800 Subject: wlan: make cfg.dat file read 64 bit compatible sizeof long on a 32 bit machine is 4 and 8 on a 64 bit machine. cfg.dat is generated with the assumption that long fields are 32 bit. Change the data types of all the long fields here to a 32 bit type. Change-Id: If3a3c48858bcf8a9ae3a4037d3c1eba5bd0c05cb CRs-fixed: 607499 --- CORE/MAC/src/cfg/polFile.h | 10 +++++----- CORE/SYS/common/src/wlan_qct_sys.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CORE/MAC/src/cfg/polFile.h b/CORE/MAC/src/cfg/polFile.h index e18e49346e90..6378918e0cd9 100644 --- a/CORE/MAC/src/cfg/polFile.h +++ b/CORE/MAC/src/cfg/polFile.h @@ -123,8 +123,8 @@ typedef struct sPolFileHeader { tPolFileVersion FileVersion; tPolFileVersion HWCapabilities; - unsigned long FileLength; - unsigned long NumDirectoryEntries; + unsigned int FileLength; + unsigned int NumDirectoryEntries; } tPolFileHeader; @@ -143,9 +143,9 @@ typedef enum ePolFileDirTypes { typedef struct sPolFileDirEntry { - unsigned long DirEntryType; - unsigned long DirEntryFileOffset; - unsigned long DirEntryLength; + unsigned int DirEntryType; + unsigned int DirEntryFileOffset; + unsigned int DirEntryLength; } tPolFileDirEntry; diff --git a/CORE/SYS/common/src/wlan_qct_sys.c b/CORE/SYS/common/src/wlan_qct_sys.c index bc8b89020747..b84aa81de21f 100644 --- a/CORE/SYS/common/src/wlan_qct_sys.c +++ b/CORE/SYS/common/src/wlan_qct_sys.c @@ -199,8 +199,8 @@ typedef struct sPolFileHeader { tPolFileVersion FileVersion; tPolFileVersion HWCapabilities; - unsigned long FileLength; - unsigned long NumDirectoryEntries; + unsigned int FileLength; + unsigned int NumDirectoryEntries; } tPolFileHeader; @@ -219,9 +219,9 @@ typedef enum ePolFileDirTypes typedef struct sPolFileDirEntry { - unsigned long DirEntryType; - unsigned long DirEntryFileOffset; - unsigned long DirEntryLength; + unsigned int DirEntryType; + unsigned int DirEntryFileOffset; + unsigned int DirEntryLength; } tPolFileDirEntry; -- cgit v1.2.3