X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fstellaris.h;h=18fd3f241500f407b3e9da17c010e2d30c09c975;hp=5a852a8f8cb16bc1a7ceffd6a42f5bf096912c23;hb=aea6815462d3302f7f8b6576f59320d5f5985642;hpb=f876d5e9c769a288faa7fd14b7bf373363542aab diff --git a/src/flash/stellaris.h b/src/flash/stellaris.h index 5a852a8f8c..18fd3f2415 100644 --- a/src/flash/stellaris.h +++ b/src/flash/stellaris.h @@ -25,28 +25,28 @@ typedef struct stellaris_flash_bank_s { /* chip id register */ - u32 did0; - u32 did1; - u32 dc0; - u32 dc1; + uint32_t did0; + uint32_t did1; + uint32_t dc0; + uint32_t dc1; char * target_name; - u32 sramsiz; - u32 flshsz; + uint32_t sramsiz; + uint32_t flshsz; /* flash geometry */ - u32 num_pages; - u32 pagesize; - u32 pages_in_lockregion; + uint32_t num_pages; + uint32_t pagesize; + uint32_t pages_in_lockregion; /* nv memory bits */ uint16_t num_lockbits; - u32 lockbits; + uint32_t lockbits; /* main clock status */ - u32 rcc; + uint32_t rcc; uint8_t mck_valid; - u32 mck_freq; + uint32_t mck_freq; } stellaris_flash_bank_t; /* STELLARIS control registers */ @@ -82,11 +82,11 @@ typedef struct stellaris_flash_bank_s #define PMASK 2 /* Flash Controller Command bits */ -#define FMC_WRKEY (0xA442<<16) -#define FMC_COMT (1<<3) -#define FMC_MERASE (1<<2) -#define FMC_ERASE (1<<1) -#define FMC_WRITE (1<<0) +#define FMC_WRKEY (0xA442 << 16) +#define FMC_COMT (1 << 3) +#define FMC_MERASE (1 << 2) +#define FMC_ERASE (1 << 1) +#define FMC_WRITE (1 << 0) /* STELLARIS constants */