Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353745
b: refs/heads/master
c: 72a57c0
h: refs/heads/master
i:
  353743: d138e61
v: v3
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 912fee6 commit 4fcb53c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 04ac0434c10e4b57db3f8b6d49010b8fd5213b3c
refs/heads/master: 72a57c08b5eaddd64174940ff5f9edf269ca7f9d
21 changes: 7 additions & 14 deletions trunk/drivers/staging/bcm/nvm.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@
#ifndef _NVM_H_
#define _NVM_H_

typedef struct _FLASH_SECTOR_INFO
{
typedef struct _FLASH_SECTOR_INFO {
UINT uiSectorSig;
UINT uiSectorSize;
} FLASH_SECTOR_INFO, *PFLASH_SECTOR_INFO;

typedef struct _FLASH_CS_INFO
{
typedef struct _FLASH_CS_INFO {
B_UINT32 MagicNumber;
/* let the magic number be 0xBECE-F1A5 - F1A5 for "flas-h" */
B_UINT32 FlashLayoutVersion;
Expand Down Expand Up @@ -60,8 +58,7 @@ typedef struct _FLASH_CS_INFO
#define FLASH2X_TOTAL_SIZE (64 * 1024 * 1024)
#define DEFAULT_SECTOR_SIZE (64 * 1024)

typedef struct _FLASH_2X_CS_INFO
{
typedef struct _FLASH_2X_CS_INFO {
/* magic number as 0xBECE-F1A5 - F1A5 for "flas-h" */
B_UINT32 MagicNumber;
B_UINT32 FlashLayoutVersion;
Expand Down Expand Up @@ -123,22 +120,19 @@ typedef struct _FLASH_2X_CS_INFO
/* All expansions to the control data structure should add here */
} FLASH2X_CS_INFO, *PFLASH2X_CS_INFO;

typedef struct _VENDOR_SECTION_INFO
{
typedef struct _VENDOR_SECTION_INFO {
B_UINT32 OffsetFromZeroForSectionStart;
B_UINT32 OffsetFromZeroForSectionEnd;
B_UINT32 AccessFlags;
B_UINT32 Reserved[16];
} VENDOR_SECTION_INFO, *PVENDOR_SECTION_INFO;

typedef struct _FLASH2X_VENDORSPECIFIC_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
{
typedef struct _DSD_HEADER {
B_UINT32 DSDImageSize;
B_UINT32 DSDImageCRC;
B_UINT32 DSDImagePriority;
Expand All @@ -147,8 +141,7 @@ typedef struct _DSD_HEADER
B_UINT32 DSDImageMagicNumber;
} DSD_HEADER, *PDSD_HEADER;

typedef struct _ISO_HEADER
{
typedef struct _ISO_HEADER {
B_UINT32 ISOImageMagicNumber;
B_UINT32 ISOImageSize;
B_UINT32 ISOImageCRC;
Expand Down

0 comments on commit 4fcb53c

Please sign in to comment.