Removed unused fsmc functions

Author: bbogush

firmware/fsmc_nand.c

@@ -349,127 +349,6 @@ uint32_t nand_read_spare_data(uint8_t *buf, uint32_t page, uint32_t offset,
     return nand_get_status();
 }
 
-#if 0
-/**
-  * @brief  This routine write the spare area information for the specified
-  *         pages addresses.  
-  * @param  buf: pointer on the Buffer containing data to be written 
-  * @param  addr: First page address
-  * @param  num_spare_area_to_write: Number of Spare Area to write
-  * @retval New status of the NAND operation. This parameter can be:
-  *          - NAND_TIMEOUT_ERROR: when the previous operation generate 
-  *          a Timeout error
-  *          - NAND_READY: when memory is ready for the next operation 
-  *            And the new status of the increment address operation. It can be:
-  *          - NAND_VALID_ADDRESS: When the new address is valid address
-  *          - NAND_INVALID_ADDRESS: When the new address is invalid address
-  */
-uint32_t nand_write_spare_area(uint8_t *buf, nand_addr_t addr,
-    uint32_t num_spare_area_to_write)
-{
-    uint32_t index = 0x00, num_spare_area_written = 0x00,
-        address_status = NAND_VALID_ADDRESS;
-    uint32_t status = NAND_READY, size = 0x00; 
-
-    while ((num_spare_area_to_write != 0x00) &&
-        (address_status == NAND_VALID_ADDRESS) && (status == NAND_READY))
-    {
-        /* Page write Spare area command and address */
-        *(__IO uint8_t *)(Bank_NAND_ADDR | CMD_AREA) = NAND_CMD_AREA_C;
-        *(__IO uint8_t *)(Bank_NAND_ADDR | CMD_AREA) = NAND_CMD_WRITE0;
-
-        *(__IO uint8_t *)(Bank_NAND_ADDR | ADDR_AREA) = 0x00; 
-        *(__IO uint8_t *)(Bank_NAND_ADDR | ADDR_AREA) =
-            ADDR_1st_CYCLE(ROW_ADDRESS);
-        *(__IO uint8_t *)(Bank_NAND_ADDR | ADDR_AREA) =
-            ADDR_2nd_CYCLE(ROW_ADDRESS);
-        *(__IO uint8_t *)(Bank_NAND_ADDR | ADDR_AREA) =
-            ADDR_3rd_CYCLE(ROW_ADDRESS);
-
-        /* Calculate the size */ 
-        size = NAND_SPARE_AREA_SIZE + (NAND_SPARE_AREA_SIZE *
-            num_spare_area_written);
-
-        /* Write the data */ 
-        for (; index < size; index++)
-            *(__IO uint8_t *)(Bank_NAND_ADDR | DATA_AREA) = buf[index];
-    
-        *(__IO uint8_t *)(Bank_NAND_ADDR | CMD_AREA) = NAND_CMD_WRITE_TRUE1;
-
-        /* Check status for successful operation */
-        status = nand_get_status();
-
-        if (status == NAND_READY)
-        {
-            num_spare_area_written++;
-
-            num_spare_area_to_write--;
-    
-            /* Calculate Next page Address */
-            address_status = nand_addr_inc(&addr);
-        }
-    }
-  
-    return status | address_status;
-}
-
-/**
-  * @brief  This routine read the spare area information from the specified
-  *         pages addresses.  
-  * @param  buf: pointer on the Buffer to fill 
-  * @param  addr: First page address
-  * @param  num_spare_area_to_read: Number of Spare Area to read
-  * @retval New status of the NAND operation. This parameter can be:
-  *          - NAND_TIMEOUT_ERROR: when the previous operation generate 
-  *            a Timeout error
-  *          - NAND_READY: when memory is ready for the next operation 
-  *            And the new status of the increment address operation. It can be:
-  *          - NAND_VALID_ADDRESS: When the new address is valid address
-  *          - NAND_INVALID_ADDRESS: When the new address is invalid address
-  */
-uint32_t nand_read_spare_area(uint8_t *buf, nand_addr_t addr,
-    uint32_t num_spare_area_to_read)
-{
-    uint32_t num_spare_area_read = 0x00, index = 0x00,
-        address_status = NAND_VALID_ADDRESS;
-    uint32_t status = NAND_READY, size = 0x00;
-
-    while ((num_spare_area_to_read != 0x0) &&
-        (address_status == NAND_VALID_ADDRESS))
-    {     
-        /* Page Read command and page address */
-        *(__IO uint8_t *)(Bank_NAND_ADDR | CMD_AREA) = NAND_CMD_AREA_C;
-
-        *(__IO uint8_t *)(Bank_NAND_ADDR | ADDR_AREA) = 0x00; 
-        *(__IO uint8_t *)(Bank_NAND_ADDR | ADDR_AREA) =
-            ADDR_1st_CYCLE(ROW_ADDRESS);
-        *(__IO uint8_t *)(Bank_NAND_ADDR | ADDR_AREA) =
-            ADDR_2nd_CYCLE(ROW_ADDRESS);
-        *(__IO uint8_t *)(Bank_NAND_ADDR | ADDR_AREA) =
-            ADDR_3rd_CYCLE(ROW_ADDRESS);
-
-        /* Data Read */
-        size = NAND_SPARE_AREA_SIZE + (NAND_SPARE_AREA_SIZE *
-            num_spare_area_read);
-
-        /* Get Data into Buffer */
-        for ( ;index < size; index++)
-            buf[index] = *(__IO uint8_t *)(Bank_NAND_ADDR | DATA_AREA);
-    
-        num_spare_area_read++;
-    
-        num_spare_area_to_read--;
-
-        /* Calculate page address */
-        address_status = nand_addr_inc(&addr);
-    }
-
-    status = nand_get_status();
-
-    return status | address_status;
-}
-#endif
-
 uint32_t nand_erase_block(uint32_t page)
 {
     *(__IO uint8_t *)(Bank_NAND_ADDR | CMD_AREA) = fsmc_cmd.erase1_cmd;
@@ -569,55 +448,3 @@ uint32_t nand_read_status(void)
 
     return status;
 }
-
-#if 0
-/**
-  * @brief  Increment the NAND memory address. 
-  * @param  addr: address to be incremented.
-  * @retval The new status of the increment address operation. It can be:
-  *          - NAND_VALID_ADDRESS: When the new address is valid address
-  *          - NAND_INVALID_ADDRESS: When the new address is invalid address   
-  */
-uint32_t nand_addr_inc(nand_addr_t *addr)
-{
-    uint32_t status = NAND_VALID_ADDRESS;
- 
-    addr->page++;
-
-    if (addr->page == NAND_BLOCK_SIZE)
-    {
-        addr->page = 0;
-        addr->block++;
-
-        if (addr->block == NAND_ZONE_SIZE)
-        {
-            addr->block = 0;
-            addr->zone++;
-
-            if (addr->zone == NAND_MAX_ZONE)
-                status = NAND_INVALID_ADDRESS;
-        }
-    }
-
-    return status;
-}
-
-uint32_t nand_raw_addr_to_nand_addr(uint32_t raw_addr, nand_addr_t *addr)
-{
-    uint32_t blocks_in_zones, block_size;
-    uint32_t status = NAND_VALID_ADDRESS;
-
-    block_size = NAND_BLOCK_SIZE * NAND_PAGE_SIZE;
-    addr->zone = raw_addr / (NAND_ZONE_SIZE * block_size);
-    blocks_in_zones = addr->zone * NAND_ZONE_SIZE;
-    addr->block = raw_addr / block_size - blocks_in_zones;
-    addr->page = raw_addr / NAND_PAGE_SIZE - (blocks_in_zones +
-       addr->block) * NAND_BLOCK_SIZE;
-
-    if(addr->zone == NAND_MAX_ZONE)
-        status = NAND_INVALID_ADDRESS;
-
-    return status;
-}
-
-#endif

firmware/fsmc_nand.h

@@ -45,19 +45,9 @@ uint32_t nand_read_data(uint8_t *buf, uint32_t page, uint32_t page_offset,
 uint32_t nand_read_page(uint8_t *buf, uint32_t page, uint32_t page_size);
 uint32_t nand_read_spare_data(uint8_t *buf, uint32_t page, uint32_t offset,
     uint32_t data_size);
-#if 0
-uint32_t nand_write_spare_area(uint8_t *buf, nand_addr_t addr,
-    uint32_t num_spare_area_to_write);
-uint32_t nand_read_spare_area(uint8_t *buf, nand_addr_t addr,
-    uint32_t num_spare_area_to_read);
-#endif
 uint32_t nand_erase_block(uint32_t page);
 uint32_t nand_reset(void);
 uint32_t nand_get_status(void);
 uint32_t nand_read_status(void);
-#if 0
-uint32_t nand_addr_inc(nand_addr_t *addr);
-uint32_t nand_raw_addr_to_nand_addr(uint32_t raw_addr, nand_addr_t *addr);
-#endif
 
 #endif /* _FSMC_NAND_H_ */