Browse Source

split NOR and NAND flash headers

Moves common flash errors to <flash/common.h> to decouple these two
mostly unrelated trees of code.
tags/v0.4.0-rc1
Zachary T Welch 12 years ago
parent
commit
1527272fb2
4 changed files with 15 additions and 12 deletions
  1. +10
    -1
      src/flash/common.h
  2. +1
    -10
      src/flash/flash.h
  3. +3
    -1
      src/flash/nand.h
  4. +1
    -0
      src/openocd.c

+ 10
- 1
src/flash/common.h View File

@@ -19,7 +19,7 @@
#ifndef FLASH_COMMON_H
#define FLASH_COMMON_H

#include <helper/types.h>
#include <helper/log.h>

/**
* Parses the optional '.index' portion of a flash bank identifier.
@@ -36,4 +36,13 @@ unsigned get_flash_name_index(const char *name);
*/
bool flash_driver_name_matches(const char *name, const char *expected);

#define ERROR_FLASH_BANK_INVALID -900
#define ERROR_FLASH_SECTOR_INVALID -901
#define ERROR_FLASH_OPERATION_FAILED -902
#define ERROR_FLASH_DST_OUT_OF_BANK -903
#define ERROR_FLASH_DST_BREAKS_ALIGNMENT -904
#define ERROR_FLASH_BUSY -905
#define ERROR_FLASH_SECTOR_NOT_ERASED -906
#define ERROR_FLASH_BANK_NOT_PROBED -907

#endif // FLASH_COMMON_H

+ 1
- 10
src/flash/flash.h View File

@@ -26,8 +26,8 @@
#ifndef FLASH_H
#define FLASH_H

#include <flash/common.h>
#include <target/target.h>
#include <helper/log.h>

struct image;

@@ -349,13 +349,4 @@ struct flash_bank *get_flash_bank_by_num_noprobe(int num);
*/
struct flash_bank *get_flash_bank_by_addr(struct target *target, uint32_t addr);

#define ERROR_FLASH_BANK_INVALID (-900)
#define ERROR_FLASH_SECTOR_INVALID (-901)
#define ERROR_FLASH_OPERATION_FAILED (-902)
#define ERROR_FLASH_DST_OUT_OF_BANK (-903)
#define ERROR_FLASH_DST_BREAKS_ALIGNMENT (-904)
#define ERROR_FLASH_BUSY (-905)
#define ERROR_FLASH_SECTOR_NOT_ERASED (-906)
#define ERROR_FLASH_BANK_NOT_PROBED (-907)

#endif /* FLASH_H */

+ 3
- 1
src/flash/nand.h View File

@@ -25,7 +25,9 @@
#ifndef NAND_H
#define NAND_H

#include <flash/flash.h>
#include <flash/common.h>
// to be removed later
#include <target/target.h>

struct nand_device;



+ 1
- 0
src/openocd.c View File

@@ -34,6 +34,7 @@
#include <helper/configuration.h>
#include <xsvf/xsvf.h>
#include <svf/svf.h>
#include <flash/flash.h>
#include <flash/nand.h>
#include <pld/pld.h>
#include <flash/mflash.h>


Loading…
Cancel
Save