Nand driver: change context class name too (Mt29f->Nand), forgotten in

previous commit.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4890 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/cortex-m3/drv/nand_sam3.c b/bertos/cpu/cortex-m3/drv/nand_sam3.c
index b71d5e7649013432b0b39bd5a6f5550ae9a17ca8..cac51afdb3340e6a79690c251a8c7576372fedee 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/nand_sam3.c
+++ b/bertos/cpu/cortex-m3/drv/nand_sam3.c
@@ -72,7 +72,7 @@
  * signal.
  * Return true for edge detection, false in case of timeout.
  */
-bool nand_waitReadyBusy(UNUSED_ARG(Mt29f *, chip), time_t timeout)
+bool nand_waitReadyBusy(UNUSED_ARG(Nand *, chip), time_t timeout)
 {
        time_t start = timer_clock();
 
@@ -93,7 +93,7 @@ bool nand_waitReadyBusy(UNUSED_ARG(Mt29f *, chip), time_t timeout)
  * Wait for transfer to complete until timeout.
  * If transfer completes return true, false in case of timeout.
  */
-bool nand_waitTransferComplete(UNUSED_ARG(Mt29f *, chip), time_t timeout)
+bool nand_waitTransferComplete(UNUSED_ARG(Nand *, chip), time_t timeout)
 {
        time_t start = timer_clock();
 
@@ -114,7 +114,7 @@ bool nand_waitTransferComplete(UNUSED_ARG(Mt29f *, chip), time_t timeout)
 /*
  * Send command to NAND and wait for completion.
  */
-void nand_sendCommand(Mt29f *chip,
+void nand_sendCommand(Nand *chip,
                uint32_t cmd1, uint32_t cmd2,
                int num_cycles, uint32_t cycle0, uint32_t cycle1234)
 {
@@ -157,19 +157,19 @@ void nand_sendCommand(Mt29f *chip,
  * NOTE: this is global between different chip selects, so returns
  * the status register of the last used NAND chip.
  */
-uint8_t nand_getChipStatus(UNUSED_ARG(Mt29f *, chip))
+uint8_t nand_getChipStatus(UNUSED_ARG(Nand *, chip))
 {
        return (uint8_t)HWREG(NFC_CMD_BASE_ADDR);
 }
 
 
-void *nand_dataBuffer(UNUSED_ARG(Mt29f *, chip))
+void *nand_dataBuffer(UNUSED_ARG(Nand *, chip))
 {
        return (void *)NFC_SRAM_BASE_ADDR;
 }
 
 
-bool nand_checkEcc(Mt29f *chip)
+bool nand_checkEcc(Nand *chip)
 {
        uint32_t sr1 = SMC_ECC_SR1;
        if (sr1)
@@ -192,7 +192,7 @@ bool nand_checkEcc(Mt29f *chip)
  * \param ecc       pointer to buffer where computed ECC is stored
  * \param ecc_size  max size for ecc buffer
  */
-void nand_computeEcc(UNUSED_ARG(Mt29f *, chip),
+void nand_computeEcc(UNUSED_ARG(Nand *, chip),
                UNUSED_ARG(const void *, buf), UNUSED_ARG(size_t, size), uint32_t *ecc, size_t ecc_size)
 {
        size_t i;
@@ -201,7 +201,7 @@ void nand_computeEcc(UNUSED_ARG(Mt29f *, chip),
 }
 
 
-void nand_hwInit(UNUSED_ARG(Mt29f *, chip))
+void nand_hwInit(UNUSED_ARG(Nand *, chip))
 {
        // FIXME: Parameters specific for MT29F8G08AAD
 

diff --git a/bertos/drv/nand.c b/bertos/drv/nand.c
index 81be0ff1086826d9a4e817656d6ea4657f956f5b..29e644140cbf96c356823a42823c824b4d413cb1 100644 (file)
--- a/bertos/drv/nand.c
+++ b/bertos/drv/nand.c
@@ -89,14 +89,14 @@ static void getAddrCycles(uint32_t page, uint16_t offset, uint32_t *cycle0, uint
 }
 
 
-static void chipReset(Mt29f *chip)
+static void chipReset(Nand *chip)
 {
        nand_sendCommand(chip, NAND_CMD_RESET, 0, 0, 0, 0);
        nand_waitReadyBusy(chip, CONFIG_NAND_TMOUT);
 }
 
 
-static bool isOperationComplete(Mt29f *chip)
+static bool isOperationComplete(Nand *chip)
 {
        uint8_t status;
 
@@ -110,7 +110,7 @@ static bool isOperationComplete(Mt29f *chip)
 /**
  * Erase the whole block.
  */
-int nand_blockErase(Mt29f *chip, uint16_t block)
+int nand_blockErase(Nand *chip, uint16_t block)
 {
        uint32_t cycle0;
        uint32_t cycle1234;
@@ -142,7 +142,7 @@ int nand_blockErase(Mt29f *chip, uint16_t block)
 /**
  * Read Device ID and configuration codes.
  */
-bool nand_getDevId(Mt29f *chip, uint8_t dev_id[5])
+bool nand_getDevId(Nand *chip, uint8_t dev_id[5])
 {
        nand_sendCommand(chip, NAND_CMD_READID, 0, 1, 0, 0);
 
@@ -159,7 +159,7 @@ bool nand_getDevId(Mt29f *chip, uint8_t dev_id[5])
 }
 
 
-static bool nand_readPage(Mt29f *chip, uint32_t page, uint16_t offset)
+static bool nand_readPage(Nand *chip, uint32_t page, uint16_t offset)
 {
        uint32_t cycle0;
        uint32_t cycle1234;
@@ -186,7 +186,7 @@ static bool nand_readPage(Mt29f *chip, uint32_t page, uint16_t offset)
  * Read page data and ECC, checking for errors.
  * TODO: fix errors with ECC when possible.
  */
-static bool nand_read(Mt29f *chip, uint32_t page, void *buf, uint16_t offset, uint16_t size)
+static bool nand_read(Nand *chip, uint32_t page, void *buf, uint16_t offset, uint16_t size)
 {
        struct RemapInfo remap_info;
        uint32_t remapped_page = PAGE(chip->block_map[BLOCK(page)]) + PAGE_IN_BLOCK(page);
@@ -228,7 +228,7 @@ static bool nand_read(Mt29f *chip, uint32_t page, void *buf, uint16_t offset, ui
  * spare data in one write, at this point the last ECC_PR is correct and
  * ECC data can be written in the spare area with a second program operation.
  */
-static bool nand_writePage(Mt29f *chip, uint32_t page, uint16_t offset)
+static bool nand_writePage(Nand *chip, uint32_t page, uint16_t offset)
 {
        uint32_t cycle0;
        uint32_t cycle1234;
@@ -272,7 +272,7 @@ static bool nand_writePage(Mt29f *chip, uint32_t page, uint16_t offset)
  * For 2048 bytes pages and 1 ECC word each 256 bytes,
  * 24 bytes of ECC data are stored.
  */
-static bool nand_write(Mt29f *chip, uint32_t page, const void *buf, size_t size)
+static bool nand_write(Nand *chip, uint32_t page, const void *buf, size_t size)
 {
        struct RemapInfo remap_info;
        uint32_t *nand_buf = (uint32_t *)nand_dataBuffer(chip);
@@ -308,7 +308,7 @@ static bool nand_write(Mt29f *chip, uint32_t page, const void *buf, size_t size)
  * that bad block are marked with "00" bytes on the spare area of the
  * first page in block.
  */
-static bool blockIsGood(Mt29f *chip, uint16_t blk)
+static bool blockIsGood(Nand *chip, uint16_t blk)
 {
        uint8_t *first_byte = (uint8_t *)nand_dataBuffer(chip);
        bool good;
@@ -328,7 +328,7 @@ static bool blockIsGood(Mt29f *chip, uint16_t blk)
  * Return the main partition block remapped on given block in the remap
  * partition (dest_blk).
  */
-static int getBadBlockFromRemapBlock(Mt29f *chip, uint16_t dest_blk)
+static int getBadBlockFromRemapBlock(Nand *chip, uint16_t dest_blk)
 {
        struct RemapInfo *remap_info = (struct RemapInfo *)nand_dataBuffer(chip);
 
@@ -346,7 +346,7 @@ static int getBadBlockFromRemapBlock(Mt29f *chip, uint16_t dest_blk)
  * Set a block remapping: src_blk (a block in main data partition) is remappend
  * on dest_blk (block in reserved remapped blocks partition).
  */
-static bool setMapping(Mt29f *chip, uint32_t src_blk, uint32_t dest_blk)
+static bool setMapping(Nand *chip, uint32_t src_blk, uint32_t dest_blk)
 {
        struct RemapInfo *remap_info = (struct RemapInfo *)nand_dataBuffer(chip);
 
@@ -366,7 +366,7 @@ static bool setMapping(Mt29f *chip, uint32_t src_blk, uint32_t dest_blk)
  * Get a new block from the remap partition to use as a substitute
  * for a bad block.
  */
-static uint16_t getFreeRemapBlock(Mt29f *chip)
+static uint16_t getFreeRemapBlock(Nand *chip)
 {
        int blk;
 
@@ -387,7 +387,7 @@ static uint16_t getFreeRemapBlock(Mt29f *chip)
 /*
  * Check if NAND is initialized.
  */
-static bool chipIsMarked(Mt29f *chip)
+static bool chipIsMarked(Nand *chip)
 {
        return getBadBlockFromRemapBlock(chip, NAND_NUM_USER_BLOCKS) != -1;
 }
@@ -398,7 +398,7 @@ static bool chipIsMarked(Mt29f *chip)
  * All bad blocks found are remapped to the remap partition: each
  * block in the remap partition used to remap bad blocks is marked.
  */
-static void initBlockMap(Mt29f *chip)
+static void initBlockMap(Nand *chip)
 {
        int b, last;
 
@@ -460,7 +460,7 @@ static void initBlockMap(Mt29f *chip)
  * \note DON'T USE on production chips: this function will try to erase
  *       factory marked bad blocks too.
  */
-void nand_format(Mt29f *chip)
+void nand_format(Nand *chip)
 {
        int b;
 
@@ -478,7 +478,7 @@ void nand_format(Mt29f *chip)
 /*
  * Create some bad blocks, erasing them and writing the bad block mark.
  */
-void nand_ruinSomeBlocks(Mt29f *chip)
+void nand_ruinSomeBlocks(Nand *chip)
 {
        int bads[] = { 7, 99, 555, 1003, 1004, 1432 };
        unsigned i;
@@ -499,9 +499,9 @@ void nand_ruinSomeBlocks(Mt29f *chip)
 
 #endif
 
-static bool commonInit(Mt29f *chip, struct Heap *heap, unsigned chip_select)
+static bool commonInit(Nand *chip, struct Heap *heap, unsigned chip_select)
 {
-       memset(chip, 0, sizeof(Mt29f));
+       memset(chip, 0, sizeof(Nand));
 
        DB(chip->fd.priv.type = KBT_NAND);
        chip->fd.blk_size = NAND_BLOCK_SIZE;
@@ -583,14 +583,14 @@ static size_t nand_readDirect(struct KBlock *kblk, block_idx_t idx, void *buf, s
 
 static int nand_error(struct KBlock *kblk)
 {
-       Mt29f *chip = NAND_CAST(kblk);
+       Nand *chip = NAND_CAST(kblk);
        return chip->status;
 }
 
 
 static void nand_clearError(struct KBlock *kblk)
 {
-       Mt29f *chip = NAND_CAST(kblk);
+       Nand *chip = NAND_CAST(kblk);
        chip->status = 0;
 }
 
@@ -622,7 +622,7 @@ static const KBlockVTable nand_unbuffered_vt =
 /**
  * Initialize NAND kblock driver in buffered mode.
  */
-bool nand_init(Mt29f *chip, struct Heap *heap, unsigned chip_select)
+bool nand_init(Nand *chip, struct Heap *heap, unsigned chip_select)
 {
        if (!commonInit(chip, heap, chip_select))
                return false;
@@ -645,7 +645,7 @@ bool nand_init(Mt29f *chip, struct Heap *heap, unsigned chip_select)
 /**
  * Initialize NAND kblock driver in unbuffered mode.
  */
-bool nand_initUnbuffered(Mt29f *chip, struct Heap *heap, unsigned chip_select)
+bool nand_initUnbuffered(Nand *chip, struct Heap *heap, unsigned chip_select)
 {
        if (!commonInit(chip, heap, chip_select))
                return false;

diff --git a/bertos/drv/nand.h b/bertos/drv/nand.h
index 821fa004ac1c3bffb77bdf7fdcd52cadff838103..5514c9e53088b75e0d6708bc05b4b453a1016360 100644 (file)
--- a/bertos/drv/nand.h
+++ b/bertos/drv/nand.h
@@ -98,7 +98,7 @@
 /**
  * NAND context.
  */
-typedef struct Mt29f
+typedef struct Nand
 {
        KBlock    fd;           // KBlock descriptor
 
@@ -107,7 +107,7 @@ typedef struct Mt29f
 
        uint16_t *block_map;    // For bad blocks remapping
        uint16_t  remap_start;  // First unused remap block
-} Mt29f;
+} Nand;
 
 /*
  * Kblock id.
@@ -117,36 +117,36 @@ typedef struct Mt29f
 /**
 * Convert + ASSERT from generic KBlock to NAND context.
 */
-INLINE Mt29f *NAND_CAST(KBlock *kb)
+INLINE Nand *NAND_CAST(KBlock *kb)
 {
        ASSERT(kb->priv.type == KBT_NAND);
-       return (Mt29f *)kb;
+       return (Nand *)kb;
 }
 
 struct Heap;
 
 // Kblock interface
-bool nand_init(Mt29f *chip, struct Heap *heap, unsigned chip_select);
-bool nand_initUnbuffered(Mt29f *chip, struct Heap *heap, unsigned chip_select);
+bool nand_init(Nand *chip, struct Heap *heap, unsigned chip_select);
+bool nand_initUnbuffered(Nand *chip, struct Heap *heap, unsigned chip_select);
 
 // NAND specific functions
-bool nand_getDevId(Mt29f *chip, uint8_t dev_id[5]);
-int nand_blockErase(Mt29f *chip, uint16_t block);
-void nand_format(Mt29f *chip);
+bool nand_getDevId(Nand *chip, uint8_t dev_id[5]);
+int nand_blockErase(Nand *chip, uint16_t block);
+void nand_format(Nand *chip);
 
 #ifdef _DEBUG
-void nand_ruinSomeBlocks(Mt29f *chip);
+void nand_ruinSomeBlocks(Nand *chip);
 #endif
 
 // Hardware specific functions, implemented by cpu specific module
-bool nand_waitReadyBusy(Mt29f *chip, time_t timeout);
-bool nand_waitTransferComplete(Mt29f *chip, time_t timeout);
-void nand_sendCommand(Mt29f *chip, uint32_t cmd1, uint32_t cmd2,
+bool nand_waitReadyBusy(Nand *chip, time_t timeout);
+bool nand_waitTransferComplete(Nand *chip, time_t timeout);
+void nand_sendCommand(Nand *chip, uint32_t cmd1, uint32_t cmd2,
                int num_cycles, uint32_t cycle0, uint32_t cycle1234);
-uint8_t nand_getChipStatus(Mt29f *chip);
-void *nand_dataBuffer(Mt29f *chip);
-bool nand_checkEcc(Mt29f *chip);
-void nand_computeEcc(Mt29f *chip, const void *buf, size_t size, uint32_t *ecc, size_t ecc_size);
-void nand_hwInit(Mt29f *chip);
+uint8_t nand_getChipStatus(Nand *chip);
+void *nand_dataBuffer(Nand *chip);
+bool nand_checkEcc(Nand *chip);
+void nand_computeEcc(Nand *chip, const void *buf, size_t size, uint32_t *ecc, size_t ecc_size);
+void nand_hwInit(Nand *chip);
 
 #endif /* DRV_NAND_H */