Staging: bcm: Fix all white space issues in nvm.h
This patch fixes all white space issues in nvm.h as reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kevin McKinney
Greg Kroah-Hartman
Родитель
ecc3599396
Коммит
0a42577ddf
|
|
@ -18,7 +18,6 @@
|
|||
//
|
||||
****************************************************************************************/
|
||||
|
||||
|
||||
#ifndef _NVM_H_
|
||||
#define _NVM_H_
|
||||
|
||||
|
|
@ -26,79 +25,54 @@ typedef struct _FLASH_SECTOR_INFO
|
|||
{
|
||||
UINT uiSectorSig;
|
||||
UINT uiSectorSize;
|
||||
|
||||
} FLASH_SECTOR_INFO, *PFLASH_SECTOR_INFO;
|
||||
|
||||
typedef struct _FLASH_CS_INFO
|
||||
{
|
||||
B_UINT32 MagicNumber;
|
||||
// let the magic number be 0xBECE-F1A5 - F1A5 for "flas-h"
|
||||
|
||||
B_UINT32 FlashLayoutVersion;
|
||||
|
||||
// ISO Image/Format/BuildTool versioning
|
||||
B_UINT32 ISOImageVersion;
|
||||
|
||||
// SCSI/Flash BootLoader versioning
|
||||
B_UINT32 SCSIFirmwareVersion;
|
||||
|
||||
|
||||
B_UINT32 OffsetFromZeroForPart1ISOImage;
|
||||
// typically 0
|
||||
|
||||
B_UINT32 OffsetFromZeroForScsiFirmware;
|
||||
//typically at 12MB
|
||||
|
||||
B_UINT32 SizeOfScsiFirmware;
|
||||
//size of the firmware - depends on binary size
|
||||
|
||||
B_UINT32 OffsetFromZeroForPart2ISOImage;
|
||||
// typically at first Word Aligned offset 12MB + sizeOfScsiFirmware.
|
||||
|
||||
B_UINT32 OffsetFromZeroForCalibrationStart;
|
||||
// typically at 15MB
|
||||
|
||||
B_UINT32 OffsetFromZeroForCalibrationEnd;
|
||||
|
||||
// VSA0 offsets
|
||||
B_UINT32 OffsetFromZeroForVSAStart;
|
||||
B_UINT32 OffsetFromZeroForVSAEnd;
|
||||
|
||||
// Control Section offsets
|
||||
B_UINT32 OffsetFromZeroForControlSectionStart;
|
||||
B_UINT32 OffsetFromZeroForControlSectionData;
|
||||
|
||||
// NO Data Activity timeout to switch from MSC to NW Mode
|
||||
B_UINT32 CDLessInactivityTimeout;
|
||||
|
||||
// New ISO Image Signature
|
||||
B_UINT32 NewImageSignature;
|
||||
|
||||
// Signature to validate the sector size.
|
||||
B_UINT32 FlashSectorSizeSig;
|
||||
|
||||
// Sector Size
|
||||
B_UINT32 FlashSectorSize;
|
||||
|
||||
// Write Size Support
|
||||
B_UINT32 FlashWriteSupportSize;
|
||||
|
||||
// Total Flash Size
|
||||
B_UINT32 TotalFlashSize;
|
||||
|
||||
// Flash Base Address for offset specified
|
||||
B_UINT32 FlashBaseAddr;
|
||||
|
||||
// Flash Part Max Size
|
||||
B_UINT32 FlashPartMaxSize;
|
||||
|
||||
// Is CDLess or Flash Bootloader
|
||||
B_UINT32 IsCDLessDeviceBootSig;
|
||||
|
||||
// MSC Timeout after reset to switch from MSC to NW Mode
|
||||
B_UINT32 MassStorageTimeout;
|
||||
|
||||
|
||||
} FLASH_CS_INFO, *PFLASH_CS_INFO;
|
||||
|
||||
#define FLASH2X_TOTAL_SIZE (64 * 1024 * 1024)
|
||||
|
|
@ -106,61 +80,43 @@ typedef struct _FLASH_CS_INFO
|
|||
|
||||
typedef struct _FLASH_2X_CS_INFO
|
||||
{
|
||||
|
||||
// magic number as 0xBECE-F1A5 - F1A5 for "flas-h"
|
||||
B_UINT32 MagicNumber;
|
||||
|
||||
B_UINT32 FlashLayoutVersion;
|
||||
|
||||
// ISO Image/Format/BuildTool versioning
|
||||
B_UINT32 ISOImageVersion;
|
||||
|
||||
// SCSI/Flash BootLoader versioning
|
||||
B_UINT32 SCSIFirmwareVersion;
|
||||
|
||||
// ISO Image1 Part1/SCSI Firmware/Flash Bootloader Start offset, size
|
||||
B_UINT32 OffsetFromZeroForPart1ISOImage;
|
||||
B_UINT32 OffsetFromZeroForScsiFirmware;
|
||||
B_UINT32 SizeOfScsiFirmware;
|
||||
|
||||
// ISO Image1 Part2 start offset
|
||||
B_UINT32 OffsetFromZeroForPart2ISOImage;
|
||||
|
||||
|
||||
// DSD0 offset
|
||||
B_UINT32 OffsetFromZeroForDSDStart;
|
||||
B_UINT32 OffsetFromZeroForDSDEnd;
|
||||
|
||||
// VSA0 offset
|
||||
B_UINT32 OffsetFromZeroForVSAStart;
|
||||
B_UINT32 OffsetFromZeroForVSAEnd;
|
||||
|
||||
// Control Section offset
|
||||
B_UINT32 OffsetFromZeroForControlSectionStart;
|
||||
B_UINT32 OffsetFromZeroForControlSectionData;
|
||||
|
||||
// NO Data Activity timeout to switch from MSC to NW Mode
|
||||
B_UINT32 CDLessInactivityTimeout;
|
||||
|
||||
// New ISO Image Signature
|
||||
B_UINT32 NewImageSignature;
|
||||
|
||||
B_UINT32 FlashSectorSizeSig; // Sector Size Signature
|
||||
B_UINT32 FlashSectorSize; // Sector Size
|
||||
B_UINT32 FlashWriteSupportSize; // Write Size Support
|
||||
|
||||
B_UINT32 TotalFlashSize; // Total Flash Size
|
||||
|
||||
// Flash Base Address for offset specified
|
||||
B_UINT32 FlashBaseAddr;
|
||||
B_UINT32 FlashPartMaxSize; // Flash Part Max Size
|
||||
|
||||
// Is CDLess or Flash Bootloader
|
||||
B_UINT32 IsCDLessDeviceBootSig;
|
||||
|
||||
// MSC Timeout after reset to switch from MSC to NW Mode
|
||||
B_UINT32 MassStorageTimeout;
|
||||
|
||||
/* Flash Map 2.0 Field */
|
||||
B_UINT32 OffsetISOImage1Part1Start; // ISO Image1 Part1 offset
|
||||
B_UINT32 OffsetISOImage1Part1End;
|
||||
|
|
@ -168,27 +124,22 @@ typedef struct _FLASH_2X_CS_INFO
|
|||
B_UINT32 OffsetISOImage1Part2End;
|
||||
B_UINT32 OffsetISOImage1Part3Start; // ISO Image1 Part3 offset
|
||||
B_UINT32 OffsetISOImage1Part3End;
|
||||
|
||||
B_UINT32 OffsetISOImage2Part1Start; // ISO Image2 Part1 offset
|
||||
B_UINT32 OffsetISOImage2Part1End;
|
||||
B_UINT32 OffsetISOImage2Part2Start; // ISO Image2 Part2 offset
|
||||
B_UINT32 OffsetISOImage2Part2End;
|
||||
B_UINT32 OffsetISOImage2Part3Start; // ISO Image2 Part3 offset
|
||||
B_UINT32 OffsetISOImage2Part3End;
|
||||
|
||||
|
||||
// DSD Header offset from start of DSD
|
||||
B_UINT32 OffsetFromDSDStartForDSDHeader;
|
||||
B_UINT32 OffsetFromZeroForDSD1Start; // DSD 1 offset
|
||||
B_UINT32 OffsetFromZeroForDSD1End;
|
||||
B_UINT32 OffsetFromZeroForDSD2Start; // DSD 2 offset
|
||||
B_UINT32 OffsetFromZeroForDSD2End;
|
||||
|
||||
B_UINT32 OffsetFromZeroForVSA1Start; // VSA 1 offset
|
||||
B_UINT32 OffsetFromZeroForVSA1End;
|
||||
B_UINT32 OffsetFromZeroForVSA2Start; // VSA 2 offset
|
||||
B_UINT32 OffsetFromZeroForVSA2End;
|
||||
|
||||
/*
|
||||
* ACCESS_BITS_PER_SECTOR 2
|
||||
* ACCESS_RW 0
|
||||
|
|
@ -197,9 +148,7 @@ typedef struct _FLASH_2X_CS_INFO
|
|||
* ACCESS_RESVD 3
|
||||
* */
|
||||
B_UINT32 SectorAccessBitMap[FLASH2X_TOTAL_SIZE / (DEFAULT_SECTOR_SIZE * 16)];
|
||||
|
||||
// All expansions to the control data structure should add here
|
||||
|
||||
} FLASH2X_CS_INFO, *PFLASH2X_CS_INFO;
|
||||
|
||||
typedef struct _VENDOR_SECTION_INFO
|
||||
|
|
@ -208,14 +157,12 @@ typedef struct _VENDOR_SECTION_INFO
|
|||
B_UINT32 OffsetFromZeroForSectionEnd;
|
||||
B_UINT32 AccessFlags;
|
||||
B_UINT32 Reserved[16];
|
||||
|
||||
} VENDOR_SECTION_INFO, *PVENDOR_SECTION_INFO;
|
||||
|
||||
typedef struct _FLASH2X_VENDORSPECIFIC_INFO
|
||||
{
|
||||
VENDOR_SECTION_INFO VendorSection[TOTAL_SECTIONS];
|
||||
B_UINT32 Reserved[16];
|
||||
|
||||
} FLASH2X_VENDORSPECIFIC_INFO, *PFLASH2X_VENDORSPECIFIC_INFO;
|
||||
|
||||
typedef struct _DSD_HEADER
|
||||
|
|
@ -226,7 +173,6 @@ typedef struct _DSD_HEADER
|
|||
//We should not consider right now. Reading reserve is worthless.
|
||||
B_UINT32 Reserved[252]; // Resvd for DSD Header
|
||||
B_UINT32 DSDImageMagicNumber;
|
||||
|
||||
} DSD_HEADER, *PDSD_HEADER;
|
||||
|
||||
typedef struct _ISO_HEADER
|
||||
|
|
@ -237,21 +183,15 @@ typedef struct _ISO_HEADER
|
|||
B_UINT32 ISOImagePriority;
|
||||
//We should not consider right now. Reading reserve is worthless.
|
||||
B_UINT32 Reserved[60]; //Resvd for ISO Header extension
|
||||
|
||||
} ISO_HEADER, *PISO_HEADER;
|
||||
|
||||
#define EEPROM_BEGIN_CIS (0)
|
||||
#define EEPROM_BEGIN_NON_CIS (0x200)
|
||||
#define EEPROM_END (0x2000)
|
||||
|
||||
#define INIT_PARAMS_SIGNATURE (0x95a7a597)
|
||||
|
||||
#define MAX_INIT_PARAMS_LENGTH (2048)
|
||||
|
||||
|
||||
#define MAC_ADDRESS_OFFSET 0x200
|
||||
|
||||
|
||||
#define INIT_PARAMS_1_SIGNATURE_ADDRESS EEPROM_BEGIN_NON_CIS
|
||||
#define INIT_PARAMS_1_DATA_ADDRESS (INIT_PARAMS_1_SIGNATURE_ADDRESS+16)
|
||||
#define INIT_PARAMS_1_MACADDRESS_ADDRESS (MAC_ADDRESS_OFFSET)
|
||||
|
|
@ -304,8 +244,6 @@ typedef struct _ISO_HEADER
|
|||
// This will give us 80 mSec minimum of delay = 80mSecs
|
||||
#define MAX_EEPROM_RETRIES 80
|
||||
#define RETRIES_PER_DELAY 64
|
||||
|
||||
|
||||
#define MAX_RW_SIZE 0x10
|
||||
#define MAX_READ_SIZE 0x10
|
||||
#define MAX_SECTOR_SIZE (512 * 1024)
|
||||
|
|
@ -318,41 +256,26 @@ typedef struct _ISO_HEADER
|
|||
#define SCSI_FIRMWARE_MAJOR_VERSION 0x1
|
||||
#define SCSI_FIRMWARE_MINOR_VERSION 0x5
|
||||
#define BYTE_WRITE_SUPPORT 0x1
|
||||
|
||||
#define FLASH_AUTO_INIT_BASE_ADDR 0xF00000
|
||||
|
||||
|
||||
|
||||
|
||||
#define FLASH_CONTIGIOUS_START_ADDR_AFTER_INIT 0x1C000000
|
||||
#define FLASH_CONTIGIOUS_START_ADDR_BEFORE_INIT 0x1F000000
|
||||
|
||||
#define FLASH_CONTIGIOUS_START_ADDR_BCS350 0x08000000
|
||||
#define FLASH_CONTIGIOUS_END_ADDR_BCS350 0x08FFFFFF
|
||||
|
||||
|
||||
|
||||
#define FLASH_SIZE_ADDR 0xFFFFEC
|
||||
|
||||
#define FLASH_SPI_CMDQ_REG 0xAF003040
|
||||
#define FLASH_SPI_WRITEQ_REG 0xAF003044
|
||||
#define FLASH_SPI_READQ_REG 0xAF003048
|
||||
#define FLASH_CONFIG_REG 0xAF003050
|
||||
#define FLASH_GPIO_CONFIG_REG 0xAF000030
|
||||
|
||||
#define FLASH_CMD_WRITE_ENABLE 0x06
|
||||
#define FLASH_CMD_READ_ENABLE 0x03
|
||||
#define FLASH_CMD_RESET_WRITE_ENABLE 0x04
|
||||
#define FLASH_CMD_STATUS_REG_READ 0x05
|
||||
#define FLASH_CMD_STATUS_REG_WRITE 0x01
|
||||
#define FLASH_CMD_READ_ID 0x9F
|
||||
|
||||
#define PAD_SELECT_REGISTER 0xAF000410
|
||||
|
||||
#define FLASH_PART_SST25VF080B 0xBF258E
|
||||
|
||||
#define EEPROM_CAL_DATA_INTERNAL_LOC 0xbFB00008
|
||||
|
||||
#define EEPROM_CALPARAM_START 0x200
|
||||
#define EEPROM_SIZE_OFFSET 524
|
||||
|
||||
|
|
@ -361,26 +284,19 @@ typedef struct _ISO_HEADER
|
|||
//here time calculated meets the worst case delay, 3.0 ms
|
||||
#define MAX_FLASH_RETRIES 4
|
||||
#define FLASH_PER_RETRIES_DELAY 16
|
||||
|
||||
|
||||
#define EEPROM_MAX_CAL_AREA_SIZE 0xF0000
|
||||
|
||||
|
||||
|
||||
#define BECM ntohl(0x4245434d)
|
||||
|
||||
#define FLASH_2X_MAJOR_NUMBER 0x2
|
||||
#define DSD_IMAGE_MAGIC_NUMBER 0xBECE0D5D
|
||||
#define ISO_IMAGE_MAGIC_NUMBER 0xBECE0150
|
||||
#define NON_CDLESS_DEVICE_BOOT_SIG 0xBECEB007
|
||||
|
||||
#define MINOR_VERSION(x) ((x >> 16) & 0xFFFF)
|
||||
#define MAJOR_VERSION(x) (x & 0xFFFF)
|
||||
|
||||
#define CORRUPTED_PATTERN 0x0
|
||||
#define UNINIT_PTR_IN_CS 0xBBBBDDDD
|
||||
|
||||
#define VENDOR_PTR_IN_CS 0xAAAACCCC
|
||||
|
||||
|
||||
#define FLASH2X_SECTION_PRESENT 1 << 0
|
||||
#define FLASH2X_SECTION_VALID 1 << 1
|
||||
#define FLASH2X_SECTION_RO 1 << 2
|
||||
|
|
@ -396,13 +312,11 @@ typedef struct _ISO_HEADER
|
|||
#define FLASH_PART_SIZE (16 * 1024 * 1024)
|
||||
#define RESET_CHIP_SELECT -1
|
||||
#define CHIP_SELECT_BIT12 12
|
||||
|
||||
#define SECTOR_READWRITE_PERMISSION 0
|
||||
#define SECTOR_READONLY 1
|
||||
#define SIGNATURE_SIZE 4
|
||||
#define DEFAULT_BUFF_SIZE 0x10000
|
||||
|
||||
|
||||
#define FIELD_OFFSET_IN_HEADER(HeaderPointer, Field) ((PUCHAR)&((HeaderPointer)(NULL))->Field - (PUCHAR)(NULL))
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче