提交 13da8f0d 编写于 作者: M Marek Belisko 提交者: Greg Kroah-Hartman

staging: ft1000: get rid of typedef usage.

Signed-off-by: NMarek Belisko <marek.belisko@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 4aee92f6
...@@ -85,20 +85,7 @@ ...@@ -85,20 +85,7 @@
#define DWNLD_MAG1_SIZE_LOC 0x02 #define DWNLD_MAG1_SIZE_LOC 0x02
#define DWNLD_MAG1_PS_HDR_LOC 0x03 #define DWNLD_MAG1_PS_HDR_LOC 0x03
#pragma pack (push, pack_save, 1) struct dsp_file_hdr {
typedef struct _DSP_FILE_HDR {
long build_date;
long dsp_coff_date;
long loader_code_address;
long loader_code_size;
long loader_code_end;
long dsp_code_address;
long dsp_code_size;
long dsp_code_end;
long reserved[8];
} DSP_FILE_HDR, *PDSP_FILE_HDR;
typedef struct _DSP_FILE_HDR_5 {
long version_id; // Version ID of this image format. long version_id; // Version ID of this image format.
long package_id; // Package ID of code release. long package_id; // Package ID of code release.
long build_date; // Date/time stamp when file was built. long build_date; // Date/time stamp when file was built.
...@@ -110,18 +97,10 @@ typedef struct _DSP_FILE_HDR_5 { ...@@ -110,18 +97,10 @@ typedef struct _DSP_FILE_HDR_5 {
long version_data_offset; // Offset were scrambled version data begins. long version_data_offset; // Offset were scrambled version data begins.
long version_data_size; // Size, in words, of scrambled version data. long version_data_size; // Size, in words, of scrambled version data.
long nDspImages; // Number of DSP images in file. long nDspImages; // Number of DSP images in file.
} DSP_FILE_HDR_5, * PDSP_FILE_HDR_5; };
typedef struct _DSP_IMAGE_INFO { #pragma pack(1)
long coff_date; // Date/time when DSP Coff image was built. struct dsp_image_info {
long begin_offset; // Offset in file where image begins.
long end_offset; // Offset in file where image begins.
long run_address; // On chip Start address of DSP code.
long image_size; // Size of image.
long version; // Embedded version # of DSP code.
} DSP_IMAGE_INFO, *PDSP_IMAGE_INFO;
typedef struct _DSP_IMAGE_INFO_V6 {
long coff_date; // Date/time when DSP Coff image was built. long coff_date; // Date/time when DSP Coff image was built.
long begin_offset; // Offset in file where image begins. long begin_offset; // Offset in file where image begins.
long end_offset; // Offset in file where image begins. long end_offset; // Offset in file where image begins.
...@@ -130,7 +109,8 @@ typedef struct _DSP_IMAGE_INFO_V6 { ...@@ -130,7 +109,8 @@ typedef struct _DSP_IMAGE_INFO_V6 {
long version; // Embedded version # of DSP code. long version; // Embedded version # of DSP code.
unsigned short checksum; // DSP File checksum unsigned short checksum; // DSP File checksum
unsigned short pad1; unsigned short pad1;
} DSP_IMAGE_INFO_V6, *PDSP_IMAGE_INFO_V6; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Function: check_usb_db // Function: check_usb_db
...@@ -867,14 +847,13 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe ...@@ -867,14 +847,13 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe
PPSEUDO_HDR pHdr; PPSEUDO_HDR pHdr;
USHORT usHdrLength; USHORT usHdrLength;
//PPROV_RECORD pProvRecord; //PPROV_RECORD pProvRecord;
PDSP_FILE_HDR pFileHdr;
long word_length; long word_length;
USHORT request; USHORT request;
USHORT temp; USHORT temp;
USHORT tempword; USHORT tempword;
PDSP_FILE_HDR_5 pFileHdr5; struct dsp_file_hdr *pFileHdr5;
PDSP_IMAGE_INFO_V6 pDspImageInfoV6 = NULL; struct dsp_image_info *pDspImageInfoV6 = NULL;
long requested_version; long requested_version;
BOOLEAN bGoodVersion; BOOLEAN bGoodVersion;
PDRVMSG pMailBoxData; PDRVMSG pMailBoxData;
...@@ -907,8 +886,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe ...@@ -907,8 +886,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe
uiState = STATE_START_DWNLD; uiState = STATE_START_DWNLD;
pFileHdr = (PDSP_FILE_HDR)pFileStart; pFileHdr5 = (struct dsp_file_hdr *)pFileStart;
pFileHdr5 = (PDSP_FILE_HDR_5)pFileStart;
ft1000_write_register (ft1000dev, 0x800, FT1000_REG_MAG_WATERMARK); ft1000_write_register (ft1000dev, 0x800, FT1000_REG_MAG_WATERMARK);
...@@ -1203,7 +1181,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe ...@@ -1203,7 +1181,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, ULONG FileLe
bGoodVersion = FALSE; bGoodVersion = FALSE;
requested_version = get_request_value(ft1000dev); requested_version = get_request_value(ft1000dev);
pDspImageInfoV6 = (PDSP_IMAGE_INFO_V6)(pFileStart + sizeof(DSP_FILE_HDR_5)); pDspImageInfoV6 = (struct dsp_image_info *)(pFileStart + sizeof(struct dsp_file_hdr ));
for (imageN = 0; imageN < pFileHdr5->nDspImages; imageN++) for (imageN = 0; imageN < pFileHdr5->nDspImages; imageN++)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册