interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nand: rename device to nand 

To be more informative (and consistent with flash and pld trees), change
'device' parameter name to 'nand' in NAND source files.  This change
eliminates confusing 'device->device->' instance from the code, and
it simplifies the forthcoming command handler patches.
This commit is contained in:
Zachary T Welch 2009-11-12 21:19:41 -08:00
parent d47764ff71
commit e8e94ab245
13 changed files with 438 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/flash/lpc3180_nand_controller.c
View File

@ -24,12 +24,12 @@
#include "lpc3180_nand_controller.h" #include "lpc3180_nand_controller.h"
#include "nand.h" #include "nand.h"
static int lpc3180_reset(struct nand_device_s *device); static int lpc3180_reset(struct nand_device_s *nand);
static int lpc3180_controller_ready(struct nand_device_s *device, int timeout); static int lpc3180_controller_ready(struct nand_device_s *nand, int timeout);
/* nand device lpc3180 <target#> <oscillator_frequency> /* nand device lpc3180 <target#> <oscillator_frequency>
*/ */
static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device) static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *nand)
{ {
if (argc < 3) if (argc < 3)
{ {
@ -49,7 +49,7 @@ static int lpc3180_nand_device_command(struct command_context_s *cmd_ctx, char *
lpc3180_nand_controller_t *lpc3180_info; lpc3180_nand_controller_t *lpc3180_info;
lpc3180_info = malloc(sizeof(lpc3180_nand_controller_t)); lpc3180_info = malloc(sizeof(lpc3180_nand_controller_t));
device->controller_priv = lpc3180_info; nand->controller_priv = lpc3180_info;
lpc3180_info->target = target; lpc3180_info->target = target;
lpc3180_info->osc_freq = osc_freq; lpc3180_info->osc_freq = osc_freq;
@ -144,13 +144,13 @@ static float lpc3180_cycle_time(lpc3180_nand_controller_t *lpc3180_info)
return cycle; return cycle;
} }
static int lpc3180_init(struct nand_device_s *device) static int lpc3180_init(struct nand_device_s *nand)
{ {
lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; lpc3180_nand_controller_t *lpc3180_info = nand->controller_priv;
target_t *target = lpc3180_info->target; target_t *target = lpc3180_info->target;
int bus_width = (device->bus_width) ? (device->bus_width) : 8; int bus_width = nand->bus_width ? : 8;
int address_cycles = (device->address_cycles) ? (device->address_cycles) : 3; int address_cycles = nand->address_cycles ? : 3;
int page_size = (device->page_size) ? (device->page_size) : 512; int page_size = nand->page_size ? : 512;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
{ {
@ -174,7 +174,7 @@ static int lpc3180_init(struct nand_device_s *device)
} }
/* inform calling code about selected bus width */ /* inform calling code about selected bus width */
device->bus_width = bus_width; nand->bus_width = bus_width;
if ((address_cycles != 3) && (address_cycles != 4)) if ((address_cycles != 3) && (address_cycles != 4))
{ {
@ -240,7 +240,7 @@ static int lpc3180_init(struct nand_device_s *device)
((trp & 0xf) << 8) | ((treh & 0xf) << 12) | ((trhz & 0x7) << 16) | ((trp & 0xf) << 8) | ((treh & 0xf) << 12) | ((trhz & 0x7) << 16) |
((trbwb & 0x1f) << 19) | ((tcea & 0x3) << 24)); ((trbwb & 0x1f) << 19) | ((tcea & 0x3) << 24));
lpc3180_reset(device); lpc3180_reset(nand);
} }
else if (lpc3180_info->selected_controller == LPC3180_SLC_CONTROLLER) else if (lpc3180_info->selected_controller == LPC3180_SLC_CONTROLLER)
{ {
@ -268,15 +268,15 @@ static int lpc3180_init(struct nand_device_s *device)
((r_width & 0xf) << 8) | ((r_rdy & 0xf) << 12) | ((w_setup & 0xf) << 16) | ((r_width & 0xf) << 8) | ((r_rdy & 0xf) << 12) | ((w_setup & 0xf) << 16) |
((w_hold & 0xf) << 20) | ((w_width & 0xf) << 24) | ((w_rdy & 0xf) << 28)); ((w_hold & 0xf) << 20) | ((w_width & 0xf) << 24) | ((w_rdy & 0xf) << 28));
lpc3180_reset(device); lpc3180_reset(nand);
} }
return ERROR_OK; return ERROR_OK;
} }
static int lpc3180_reset(struct nand_device_s *device) static int lpc3180_reset(struct nand_device_s *nand)
{ {
lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; lpc3180_nand_controller_t *lpc3180_info = nand->controller_priv;
target_t *target = lpc3180_info->target; target_t *target = lpc3180_info->target;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
@ -295,7 +295,7 @@ static int lpc3180_reset(struct nand_device_s *device)
/* MLC_CMD = 0xff (reset controller and NAND device) */ /* MLC_CMD = 0xff (reset controller and NAND device) */
target_write_u32(target, 0x200b8000, 0xff); target_write_u32(target, 0x200b8000, 0xff);
if (!lpc3180_controller_ready(device, 100)) if (!lpc3180_controller_ready(nand, 100))
{ {
LOG_ERROR("LPC3180 NAND controller timed out after reset"); LOG_ERROR("LPC3180 NAND controller timed out after reset");
return ERROR_NAND_OPERATION_TIMEOUT; return ERROR_NAND_OPERATION_TIMEOUT;
@ -306,7 +306,7 @@ static int lpc3180_reset(struct nand_device_s *device)
/* SLC_CTRL = 0x6 (ECC_CLEAR, SW_RESET) */ /* SLC_CTRL = 0x6 (ECC_CLEAR, SW_RESET) */
target_write_u32(target, 0x20020010, 0x6); target_write_u32(target, 0x20020010, 0x6);
if (!lpc3180_controller_ready(device, 100)) if (!lpc3180_controller_ready(nand, 100))
{ {
LOG_ERROR("LPC3180 NAND controller timed out after reset"); LOG_ERROR("LPC3180 NAND controller timed out after reset");
return ERROR_NAND_OPERATION_TIMEOUT; return ERROR_NAND_OPERATION_TIMEOUT;
@ -316,9 +316,9 @@ static int lpc3180_reset(struct nand_device_s *device)
return ERROR_OK; return ERROR_OK;
} }
static int lpc3180_command(struct nand_device_s *device, uint8_t command) static int lpc3180_command(struct nand_device_s *nand, uint8_t command)
{ {
lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; lpc3180_nand_controller_t *lpc3180_info = nand->controller_priv;
target_t *target = lpc3180_info->target; target_t *target = lpc3180_info->target;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
@ -346,9 +346,9 @@ static int lpc3180_command(struct nand_device_s *device, uint8_t command)
return ERROR_OK; return ERROR_OK;
} }
static int lpc3180_address(struct nand_device_s *device, uint8_t address) static int lpc3180_address(struct nand_device_s *nand, uint8_t address)
{ {
lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; lpc3180_nand_controller_t *lpc3180_info = nand->controller_priv;
target_t *target = lpc3180_info->target; target_t *target = lpc3180_info->target;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
@ -376,9 +376,9 @@ static int lpc3180_address(struct nand_device_s *device, uint8_t address)
return ERROR_OK; return ERROR_OK;
} }
static int lpc3180_write_data(struct nand_device_s *device, uint16_t data) static int lpc3180_write_data(struct nand_device_s *nand, uint16_t data)
{ {
lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; lpc3180_nand_controller_t *lpc3180_info = nand->controller_priv;
target_t *target = lpc3180_info->target; target_t *target = lpc3180_info->target;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
@ -406,9 +406,9 @@ static int lpc3180_write_data(struct nand_device_s *device, uint16_t data)
return ERROR_OK; return ERROR_OK;
} }
static int lpc3180_read_data(struct nand_device_s *device, void *data) static int lpc3180_read_data(struct nand_device_s *nand, void *data)
{ {
lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; lpc3180_nand_controller_t *lpc3180_info = nand->controller_priv;
target_t *target = lpc3180_info->target; target_t *target = lpc3180_info->target;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
@ -425,12 +425,12 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data)
else if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER) else if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER)
{ {
/* data = MLC_DATA, use sized access */ /* data = MLC_DATA, use sized access */
if (device->bus_width == 8) if (nand->bus_width == 8)
{ {
uint8_t *data8 = data; uint8_t *data8 = data;
target_read_u8(target, 0x200b0000, data8); target_read_u8(target, 0x200b0000, data8);
} }
else if (device->bus_width == 16) else if (nand->bus_width == 16)
{ {
uint16_t *data16 = data; uint16_t *data16 = data;
target_read_u16(target, 0x200b0000, data16); target_read_u16(target, 0x200b0000, data16);
@ -448,12 +448,12 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data)
/* data = SLC_DATA, must use 32-bit access */ /* data = SLC_DATA, must use 32-bit access */
target_read_u32(target, 0x20020000, &data32); target_read_u32(target, 0x20020000, &data32);
if (device->bus_width == 8) if (nand->bus_width == 8)
{ {
uint8_t *data8 = data; uint8_t *data8 = data;
*data8 = data32 & 0xff; *data8 = data32 & 0xff;
} }
else if (device->bus_width == 16) else if (nand->bus_width == 16)
{ {
uint16_t *data16 = data; uint16_t *data16 = data;
*data16 = data32 & 0xffff; *data16 = data32 & 0xffff;
@ -468,9 +468,9 @@ static int lpc3180_read_data(struct nand_device_s *device, void *data)
return ERROR_OK; return ERROR_OK;
} }
static int lpc3180_write_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) static int lpc3180_write_page(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
{ {
lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; lpc3180_nand_controller_t *lpc3180_info = nand->controller_priv;
target_t *target = lpc3180_info->target; target_t *target = lpc3180_info->target;
int retval; int retval;
uint8_t status; uint8_t status;
@ -504,7 +504,7 @@ static int lpc3180_write_page(struct nand_device_s *device, uint32_t page, uint8
return ERROR_NAND_OPERATION_NOT_SUPPORTED; return ERROR_NAND_OPERATION_NOT_SUPPORTED;
} }
if (data_size > (uint32_t)device->page_size) if (data_size > (uint32_t)nand->page_size)
{ {
LOG_ERROR("data size exceeds page size"); LOG_ERROR("data size exceeds page size");
return ERROR_NAND_OPERATION_NOT_SUPPORTED; return ERROR_NAND_OPERATION_NOT_SUPPORTED;
@ -516,7 +516,7 @@ static int lpc3180_write_page(struct nand_device_s *device, uint32_t page, uint8
page_buffer = malloc(512); page_buffer = malloc(512);
oob_buffer = malloc(6); oob_buffer = malloc(6);
if (device->page_size == 512) if (nand->page_size == 512)
{ {
/* MLC_ADDR = 0x0 (one column cycle) */ /* MLC_ADDR = 0x0 (one column cycle) */
target_write_u32(target, 0x200b8004, 0x0); target_write_u32(target, 0x200b8004, 0x0);
@ -525,7 +525,7 @@ static int lpc3180_write_page(struct nand_device_s *device, uint32_t page, uint8
target_write_u32(target, 0x200b8004, page & 0xff); target_write_u32(target, 0x200b8004, page & 0xff);
target_write_u32(target, 0x200b8004, (page >> 8) & 0xff); target_write_u32(target, 0x200b8004, (page >> 8) & 0xff);
if (device->address_cycles == 4) if (nand->address_cycles == 4)
target_write_u32(target, 0x200b8004, (page >> 16) & 0xff); target_write_u32(target, 0x200b8004, (page >> 16) & 0xff);
} }
else else
@ -542,7 +542,7 @@ static int lpc3180_write_page(struct nand_device_s *device, uint32_t page, uint8
/* when using the MLC controller, we have to treat a large page device /* when using the MLC controller, we have to treat a large page device
* as being made out of four quarters, each the size of a small page device * as being made out of four quarters, each the size of a small page device
*/ */
num_quarters = (device->page_size == 2048) ? 4 : 1; num_quarters = (nand->page_size == 2048) ? 4 : 1;
for (quarter = 0; quarter < num_quarters; quarter++) for (quarter = 0; quarter < num_quarters; quarter++)
{ {
@ -557,7 +557,7 @@ static int lpc3180_write_page(struct nand_device_s *device, uint32_t page, uint8
data += thisrun_data_size; data += thisrun_data_size;
} }
memset(oob_buffer, 0xff, (device->page_size == 512) ? 6 : 24); memset(oob_buffer, 0xff, (nand->page_size == 512) ? 6 : 24);
if (oob) if (oob)
{ {
memcpy(page_buffer, oob, thisrun_oob_size); memcpy(page_buffer, oob, thisrun_oob_size);
@ -574,7 +574,7 @@ static int lpc3180_write_page(struct nand_device_s *device, uint32_t page, uint8
/* write MLC_ECC_AUTO_ENC_REG to start auto encode */ /* write MLC_ECC_AUTO_ENC_REG to start auto encode */
target_write_u32(target, 0x200b8010, 0x0); target_write_u32(target, 0x200b8010, 0x0);
if (!lpc3180_controller_ready(device, 1000)) if (!lpc3180_controller_ready(nand, 1000))
{ {
LOG_ERROR("timeout while waiting for completion of auto encode cycle"); LOG_ERROR("timeout while waiting for completion of auto encode cycle");
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;
@ -584,7 +584,7 @@ static int lpc3180_write_page(struct nand_device_s *device, uint32_t page, uint8
/* MLC_CMD = auto program command */ /* MLC_CMD = auto program command */
target_write_u32(target, 0x200b8000, NAND_CMD_PAGEPROG); target_write_u32(target, 0x200b8000, NAND_CMD_PAGEPROG);
if ((retval = nand_read_status(device, &status)) != ERROR_OK) if ((retval = nand_read_status(nand, &status)) != ERROR_OK)
{ {
LOG_ERROR("couldn't read status"); LOG_ERROR("couldn't read status");
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;
@ -601,15 +601,15 @@ static int lpc3180_write_page(struct nand_device_s *device, uint32_t page, uint8
} }
else if (lpc3180_info->selected_controller == LPC3180_SLC_CONTROLLER) else if (lpc3180_info->selected_controller == LPC3180_SLC_CONTROLLER)
{ {
return nand_write_page_raw(device, page, data, data_size, oob, oob_size); return nand_write_page_raw(nand, page, data, data_size, oob, oob_size);
} }
return ERROR_OK; return ERROR_OK;
} }
static int lpc3180_read_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) static int lpc3180_read_page(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
{ {
lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; lpc3180_nand_controller_t *lpc3180_info = nand->controller_priv;
target_t *target = lpc3180_info->target; target_t *target = lpc3180_info->target;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
@ -639,13 +639,13 @@ static int lpc3180_read_page(struct nand_device_s *device, uint32_t page, uint8_
} }
#endif #endif
if (data_size > (uint32_t)device->page_size) if (data_size > (uint32_t)nand->page_size)
{ {
LOG_ERROR("data size exceeds page size"); LOG_ERROR("data size exceeds page size");
return ERROR_NAND_OPERATION_NOT_SUPPORTED; return ERROR_NAND_OPERATION_NOT_SUPPORTED;
} }
if (device->page_size == 2048) if (nand->page_size == 2048)
{ {
page_buffer = malloc(2048); page_buffer = malloc(2048);
oob_buffer = malloc(64); oob_buffer = malloc(64);
@ -671,7 +671,7 @@ static int lpc3180_read_page(struct nand_device_s *device, uint32_t page, uint8_
target_write_u32(target, 0x200b8000, NAND_CMD_READ0); target_write_u32(target, 0x200b8000, NAND_CMD_READ0);
} }
if (device->page_size == 512) if (nand->page_size == 512)
{ {
/* small page device */ /* small page device */
/* MLC_ADDR = 0x0 (one column cycle) */ /* MLC_ADDR = 0x0 (one column cycle) */
@ -681,7 +681,7 @@ static int lpc3180_read_page(struct nand_device_s *device, uint32_t page, uint8_
target_write_u32(target, 0x200b8004, page & 0xff); target_write_u32(target, 0x200b8004, page & 0xff);
target_write_u32(target, 0x200b8004, (page >> 8) & 0xff); target_write_u32(target, 0x200b8004, (page >> 8) & 0xff);
if (device->address_cycles == 4) if (nand->address_cycles == 4)
target_write_u32(target, 0x200b8004, (page >> 16) & 0xff); target_write_u32(target, 0x200b8004, (page >> 16) & 0xff);
} }
else else
@ -699,12 +699,12 @@ static int lpc3180_read_page(struct nand_device_s *device, uint32_t page, uint8_
target_write_u32(target, 0x200b8000, NAND_CMD_READSTART); target_write_u32(target, 0x200b8000, NAND_CMD_READSTART);
} }
while (page_bytes_done < (uint32_t)device->page_size) while (page_bytes_done < (uint32_t)nand->page_size)
{ {
/* MLC_ECC_AUTO_DEC_REG = dummy */ /* MLC_ECC_AUTO_DEC_REG = dummy */
target_write_u32(target, 0x200b8014, 0xaa55aa55); target_write_u32(target, 0x200b8014, 0xaa55aa55);
if (!lpc3180_controller_ready(device, 1000)) if (!lpc3180_controller_ready(nand, 1000))
{ {
LOG_ERROR("timeout while waiting for completion of auto decode cycle"); LOG_ERROR("timeout while waiting for completion of auto decode cycle");
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;
@ -748,15 +748,15 @@ static int lpc3180_read_page(struct nand_device_s *device, uint32_t page, uint8_
} }
else if (lpc3180_info->selected_controller == LPC3180_SLC_CONTROLLER) else if (lpc3180_info->selected_controller == LPC3180_SLC_CONTROLLER)
{ {
return nand_read_page_raw(device, page, data, data_size, oob, oob_size); return nand_read_page_raw(nand, page, data, data_size, oob, oob_size);
} }
return ERROR_OK; return ERROR_OK;
} }
static int lpc3180_controller_ready(struct nand_device_s *device, int timeout) static int lpc3180_controller_ready(struct nand_device_s *nand, int timeout)
{ {
lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; lpc3180_nand_controller_t *lpc3180_info = nand->controller_priv;
target_t *target = lpc3180_info->target; target_t *target = lpc3180_info->target;
uint8_t status = 0x0; uint8_t status = 0x0;
@ -788,9 +788,9 @@ static int lpc3180_controller_ready(struct nand_device_s *device, int timeout)
return 0; return 0;
} }
static int lpc3180_nand_ready(struct nand_device_s *device, int timeout) static int lpc3180_nand_ready(struct nand_device_s *nand, int timeout)
{ {
lpc3180_nand_controller_t *lpc3180_info = device->controller_priv; lpc3180_nand_controller_t *lpc3180_info = nand->controller_priv;
target_t *target = lpc3180_info->target; target_t *target = lpc3180_info->target;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
@ -843,14 +843,14 @@ static int handle_lpc3180_select_command(struct command_context_s *cmd_ctx, char
unsigned num; unsigned num;
COMMAND_PARSE_NUMBER(uint, args[1], num); COMMAND_PARSE_NUMBER(uint, args[1], num);
nand_device_t *device = get_nand_device_by_num(num); nand_device_t *nand = get_nand_device_by_num(num);
if (!device) if (!nand)
{ {
command_print(cmd_ctx, "nand device '#%s' is out of bounds", args[0]); command_print(cmd_ctx, "nand device '#%s' is out of bounds", args[0]);
return ERROR_OK; return ERROR_OK;
} }
lpc3180_info = device->controller_priv; lpc3180_info = nand->controller_priv;
if (argc == 2) if (argc == 2)
{ {

156
src/flash/mx3_nand.c
View File

@ -49,21 +49,21 @@ unsigned char sign_of_sequental_byte_read;
static int test_iomux_settings (target_t * target, uint32_t value, static int test_iomux_settings (target_t * target, uint32_t value,
uint32_t mask, const char *text); uint32_t mask, const char *text);
static int initialize_nf_controller (struct nand_device_s *device); static int initialize_nf_controller (struct nand_device_s *nand);
static int get_next_byte_from_sram_buffer (target_t * target, uint8_t * value); static int get_next_byte_from_sram_buffer (target_t * target, uint8_t * value);
static int get_next_halfword_from_sram_buffer (target_t * target, static int get_next_halfword_from_sram_buffer (target_t * target,
uint16_t * value); uint16_t * value);
static int poll_for_complete_op (target_t * target, const char *text); static int poll_for_complete_op (target_t * target, const char *text);
static int validate_target_state (struct nand_device_s *device); static int validate_target_state (struct nand_device_s *nand);
static int do_data_output (struct nand_device_s *device); static int do_data_output (struct nand_device_s *nand);
static int imx31_command (struct nand_device_s *device, uint8_t command); static int imx31_command (struct nand_device_s *nand, uint8_t command);
static int imx31_address (struct nand_device_s *device, uint8_t address); static int imx31_address (struct nand_device_s *nand, uint8_t address);
static int imx31_controller_ready (struct nand_device_s *device, int tout); static int imx31_controller_ready (struct nand_device_s *nand, int tout);
static int imx31_nand_device_command (struct command_context_s *cmd_ctx, static int imx31_nand_device_command (struct command_context_s *cmd_ctx,
char *cmd, char **args, int argc, char *cmd, char **args, int argc,
struct nand_device_s *device) struct nand_device_s *nand)
{ {
mx3_nf_controller_t *mx3_nf_info; mx3_nf_controller_t *mx3_nf_info;
mx3_nf_info = malloc (sizeof (mx3_nf_controller_t)); mx3_nf_info = malloc (sizeof (mx3_nf_controller_t));
@ -73,7 +73,7 @@ static int imx31_nand_device_command (struct command_context_s *cmd_ctx,
return ERROR_FAIL; return ERROR_FAIL;
} }
device->controller_priv = mx3_nf_info; nand->controller_priv = mx3_nf_info;
mx3_nf_info->target = get_target (args[1]); mx3_nf_info->target = get_target (args[1]);
if (mx3_nf_info->target == NULL) if (mx3_nf_info->target == NULL)
@ -123,9 +123,9 @@ static int imx31_nand_device_command (struct command_context_s *cmd_ctx,
return ERROR_OK; return ERROR_OK;
} }
static int imx31_init (struct nand_device_s *device) static int imx31_init (struct nand_device_s *nand)
{ {
mx3_nf_controller_t *mx3_nf_info = device->controller_priv; mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
target_t *target = mx3_nf_info->target; target_t *target = mx3_nf_info->target;
{ {
@ -133,7 +133,7 @@ static int imx31_init (struct nand_device_s *device)
* validate target state * validate target state
*/ */
int validate_target_result; int validate_target_result;
validate_target_result = validate_target_state (device); validate_target_result = validate_target_state(nand);
if (validate_target_result != ERROR_OK) if (validate_target_result != ERROR_OK)
{ {
return validate_target_result; return validate_target_result;
@ -149,30 +149,30 @@ static int imx31_init (struct nand_device_s *device)
{ {
uint32_t pcsr_register_content; uint32_t pcsr_register_content;
target_read_u32 (target, MX3_PCSR, &pcsr_register_content); target_read_u32 (target, MX3_PCSR, &pcsr_register_content);
if (!device->bus_width) if (!nand->bus_width)
{ {
device->bus_width = nand->bus_width =
(pcsr_register_content & 0x80000000) ? 16 : 8; (pcsr_register_content & 0x80000000) ? 16 : 8;
} }
else else
{ {
pcsr_register_content |= pcsr_register_content |=
((device->bus_width == 16) ? 0x80000000 : 0x00000000); ((nand->bus_width == 16) ? 0x80000000 : 0x00000000);
target_write_u32 (target, MX3_PCSR, pcsr_register_content); target_write_u32 (target, MX3_PCSR, pcsr_register_content);
} }
if (!device->page_size) if (!nand->page_size)
{ {
device->page_size = nand->page_size =
(pcsr_register_content & 0x40000000) ? 2048 : 512; (pcsr_register_content & 0x40000000) ? 2048 : 512;
} }
else else
{ {
pcsr_register_content |= pcsr_register_content |=
((device->page_size == 2048) ? 0x40000000 : 0x00000000); ((nand->page_size == 2048) ? 0x40000000 : 0x00000000);
target_write_u32 (target, MX3_PCSR, pcsr_register_content); target_write_u32 (target, MX3_PCSR, pcsr_register_content);
} }
if (mx3_nf_info->flags.one_kb_sram && (device->page_size == 2048)) if (mx3_nf_info->flags.one_kb_sram && (nand->page_size == 2048))
{ {
LOG_ERROR LOG_ERROR
("NAND controller have only 1 kb SRAM, so pagesize 2048 is incompatible with it"); ("NAND controller have only 1 kb SRAM, so pagesize 2048 is incompatible with it");
@ -212,7 +212,7 @@ static int imx31_init (struct nand_device_s *device)
test_iomux_settings (target, 0x43fac0c4, 0x7f7f7f7f, "d3,d4,d5,d6"); test_iomux_settings (target, 0x43fac0c4, 0x7f7f7f7f, "d3,d4,d5,d6");
test_iomux |= test_iomux |=
test_iomux_settings (target, 0x43fac0c8, 0x0000007f, "d7"); test_iomux_settings (target, 0x43fac0c8, 0x0000007f, "d7");
if (device->bus_width == 16) if (nand->bus_width == 16)
{ {
test_iomux |= test_iomux |=
test_iomux_settings (target, 0x43fac0c8, 0x7f7f7f00, test_iomux_settings (target, 0x43fac0c8, 0x7f7f7f00,
@ -235,15 +235,15 @@ static int imx31_init (struct nand_device_s *device)
} }
} }
initialize_nf_controller (device); initialize_nf_controller (nand);
{ {
int retval; int retval;
uint16_t nand_status_content; uint16_t nand_status_content;
retval = ERROR_OK; retval = ERROR_OK;
retval |= imx31_command (device, NAND_CMD_STATUS); retval |= imx31_command (nand, NAND_CMD_STATUS);
retval |= imx31_address (device, 0x00); retval |= imx31_address (nand, 0x00);
retval |= do_data_output (device); retval |= do_data_output (nand);
if (retval != ERROR_OK) if (retval != ERROR_OK)
{ {
LOG_ERROR (get_status_register_err_msg); LOG_ERROR (get_status_register_err_msg);
@ -266,16 +266,16 @@ static int imx31_init (struct nand_device_s *device)
return ERROR_OK; return ERROR_OK;
} }
static int imx31_read_data (struct nand_device_s *device, void *data) static int imx31_read_data (struct nand_device_s *nand, void *data)
{ {
mx3_nf_controller_t *mx3_nf_info = device->controller_priv; mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
target_t *target = mx3_nf_info->target; target_t *target = mx3_nf_info->target;
{ {
/* /*
* validate target state * validate target state
*/ */
int validate_target_result; int validate_target_result;
validate_target_result = validate_target_state (device); validate_target_result = validate_target_state (nand);
if (validate_target_result != ERROR_OK) if (validate_target_result != ERROR_OK)
{ {
return validate_target_result; return validate_target_result;
@ -287,14 +287,14 @@ static int imx31_read_data (struct nand_device_s *device, void *data)
* get data from nand chip * get data from nand chip
*/ */
int try_data_output_from_nand_chip; int try_data_output_from_nand_chip;
try_data_output_from_nand_chip = do_data_output (device); try_data_output_from_nand_chip = do_data_output (nand);
if (try_data_output_from_nand_chip != ERROR_OK) if (try_data_output_from_nand_chip != ERROR_OK)
{ {
return try_data_output_from_nand_chip; return try_data_output_from_nand_chip;
} }
} }
if (device->bus_width == 16) if (nand->bus_width == 16)
{ {
get_next_halfword_from_sram_buffer (target, data); get_next_halfword_from_sram_buffer (target, data);
} }
@ -306,15 +306,15 @@ static int imx31_read_data (struct nand_device_s *device, void *data)
return ERROR_OK; return ERROR_OK;
} }
static int imx31_write_data (struct nand_device_s *device, uint16_t data) static int imx31_write_data (struct nand_device_s *nand, uint16_t data)
{ {
LOG_ERROR ("write_data() not implemented"); LOG_ERROR ("write_data() not implemented");
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;
} }
static int imx31_nand_ready (struct nand_device_s *device, int timeout) static int imx31_nand_ready (struct nand_device_s *nand, int timeout)
{ {
return imx31_controller_ready (device, timeout); return imx31_controller_ready (nand, timeout);
} }
static int imx31_register_commands (struct command_context_s *cmd_ctx) static int imx31_register_commands (struct command_context_s *cmd_ctx)
@ -322,31 +322,31 @@ static int imx31_register_commands (struct command_context_s *cmd_ctx)
return ERROR_OK; return ERROR_OK;
} }
static int imx31_reset (struct nand_device_s *device) static int imx31_reset (struct nand_device_s *nand)
{ {
/* /*
* validate target state * validate target state
*/ */
int validate_target_result; int validate_target_result;
validate_target_result = validate_target_state (device); validate_target_result = validate_target_state (nand);
if (validate_target_result != ERROR_OK) if (validate_target_result != ERROR_OK)
{ {
return validate_target_result; return validate_target_result;
} }
initialize_nf_controller (device); initialize_nf_controller (nand);
return ERROR_OK; return ERROR_OK;
} }
static int imx31_command (struct nand_device_s *device, uint8_t command) static int imx31_command (struct nand_device_s *nand, uint8_t command)
{ {
mx3_nf_controller_t *mx3_nf_info = device->controller_priv; mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
target_t *target = mx3_nf_info->target; target_t *target = mx3_nf_info->target;
{ {
/* /*
* validate target state * validate target state
*/ */
int validate_target_result; int validate_target_result;
validate_target_result = validate_target_state (device); validate_target_result = validate_target_state (nand);
if (validate_target_result != ERROR_OK) if (validate_target_result != ERROR_OK)
{ {
return validate_target_result; return validate_target_result;
@ -369,7 +369,7 @@ static int imx31_command (struct nand_device_s *device, uint8_t command)
* offset == one half of page size * offset == one half of page size
*/ */
in_sram_address = in_sram_address =
MX3_NF_MAIN_BUFFER0 + (device->page_size >> 1); MX3_NF_MAIN_BUFFER0 + (nand->page_size >> 1);
default: default:
in_sram_address = MX3_NF_MAIN_BUFFER0; in_sram_address = MX3_NF_MAIN_BUFFER0;
} }
@ -411,16 +411,16 @@ static int imx31_command (struct nand_device_s *device, uint8_t command)
return ERROR_OK; return ERROR_OK;
} }
static int imx31_address (struct nand_device_s *device, uint8_t address) static int imx31_address (struct nand_device_s *nand, uint8_t address)
{ {
mx3_nf_controller_t *mx3_nf_info = device->controller_priv; mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
target_t *target = mx3_nf_info->target; target_t *target = mx3_nf_info->target;
{ {
/* /*
* validate target state * validate target state
*/ */
int validate_target_result; int validate_target_result;
validate_target_result = validate_target_state (device); validate_target_result = validate_target_state (nand);
if (validate_target_result != ERROR_OK) if (validate_target_result != ERROR_OK)
{ {
return validate_target_result; return validate_target_result;
@ -443,10 +443,10 @@ static int imx31_address (struct nand_device_s *device, uint8_t address)
return ERROR_OK; return ERROR_OK;
} }
static int imx31_controller_ready (struct nand_device_s *device, int tout) static int imx31_controller_ready (struct nand_device_s *nand, int tout)
{ {
uint16_t poll_complete_status; uint16_t poll_complete_status;
mx3_nf_controller_t *mx3_nf_info = device->controller_priv; mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
target_t *target = mx3_nf_info->target; target_t *target = mx3_nf_info->target;
{ {
@ -454,7 +454,7 @@ static int imx31_controller_ready (struct nand_device_s *device, int tout)
* validate target state * validate target state
*/ */
int validate_target_result; int validate_target_result;
validate_target_result = validate_target_state (device); validate_target_result = validate_target_state (nand);
if (validate_target_result != ERROR_OK) if (validate_target_result != ERROR_OK)
{ {
return validate_target_result; return validate_target_result;
@ -474,11 +474,11 @@ static int imx31_controller_ready (struct nand_device_s *device, int tout)
return tout; return tout;
} }
static int imx31_write_page (struct nand_device_s *device, uint32_t page, static int imx31_write_page (struct nand_device_s *nand, uint32_t page,
uint8_t * data, uint32_t data_size, uint8_t * oob, uint8_t * data, uint32_t data_size, uint8_t * oob,
uint32_t oob_size) uint32_t oob_size)
{ {
mx3_nf_controller_t *mx3_nf_info = device->controller_priv; mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
target_t *target = mx3_nf_info->target; target_t *target = mx3_nf_info->target;
if (data_size % 2) if (data_size % 2)
@ -501,7 +501,7 @@ static int imx31_write_page (struct nand_device_s *device, uint32_t page,
* validate target state * validate target state
*/ */
int retval; int retval;
retval = validate_target_state (device); retval = validate_target_state (nand);
if (retval != ERROR_OK) if (retval != ERROR_OK)
{ {
return retval; return retval;
@ -509,16 +509,16 @@ static int imx31_write_page (struct nand_device_s *device, uint32_t page,
} }
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
retval |= imx31_command (device, NAND_CMD_SEQIN); retval |= imx31_command(nand, NAND_CMD_SEQIN);
retval |= imx31_address (device, 0x00); retval |= imx31_address(nand, 0x00);
retval |= imx31_address (device, page & 0xff); retval |= imx31_address(nand, page & 0xff);
retval |= imx31_address (device, (page >> 8) & 0xff); retval |= imx31_address(nand, (page >> 8) & 0xff);
if (device->address_cycles >= 4) if (nand->address_cycles >= 4)
{ {
retval |= imx31_address (device, (page >> 16) & 0xff); retval |= imx31_address (nand, (page >> 16) & 0xff);
if (device->address_cycles >= 5) if (nand->address_cycles >= 5)
{ {
retval |= imx31_address (device, (page >> 24) & 0xff); retval |= imx31_address (nand, (page >> 24) & 0xff);
} }
} }
target_write_buffer (target, MX3_NF_MAIN_BUFFER0, data_size, data); target_write_buffer (target, MX3_NF_MAIN_BUFFER0, data_size, data);
@ -548,7 +548,7 @@ static int imx31_write_page (struct nand_device_s *device, uint32_t page,
return poll_result; return poll_result;
} }
} }
retval |= imx31_command (device, NAND_CMD_PAGEPROG); retval |= imx31_command (nand, NAND_CMD_PAGEPROG);
if (retval != ERROR_OK) if (retval != ERROR_OK)
{ {
return retval; return retval;
@ -560,9 +560,9 @@ static int imx31_write_page (struct nand_device_s *device, uint32_t page,
{ {
uint16_t nand_status_content; uint16_t nand_status_content;
retval = ERROR_OK; retval = ERROR_OK;
retval |= imx31_command (device, NAND_CMD_STATUS); retval |= imx31_command(nand, NAND_CMD_STATUS);
retval |= imx31_address (device, 0x00); retval |= imx31_address(nand, 0x00);
retval |= do_data_output (device); retval |= do_data_output(nand);
if (retval != ERROR_OK) if (retval != ERROR_OK)
{ {
LOG_ERROR (get_status_register_err_msg); LOG_ERROR (get_status_register_err_msg);
@ -581,11 +581,11 @@ static int imx31_write_page (struct nand_device_s *device, uint32_t page,
return ERROR_OK; return ERROR_OK;
} }
static int imx31_read_page (struct nand_device_s *device, uint32_t page, static int imx31_read_page (struct nand_device_s *nand, uint32_t page,
uint8_t * data, uint32_t data_size, uint8_t * oob, uint8_t * data, uint32_t data_size, uint8_t * oob,
uint32_t oob_size) uint32_t oob_size)
{ {
mx3_nf_controller_t *mx3_nf_info = device->controller_priv; mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
target_t *target = mx3_nf_info->target; target_t *target = mx3_nf_info->target;
if (data_size % 2) if (data_size % 2)
@ -604,7 +604,7 @@ static int imx31_read_page (struct nand_device_s *device, uint32_t page,
* validate target state * validate target state
*/ */
int retval; int retval;
retval = validate_target_state (device); retval = validate_target_state(nand);
if (retval != ERROR_OK) if (retval != ERROR_OK)
{ {
return retval; return retval;
@ -612,20 +612,20 @@ static int imx31_read_page (struct nand_device_s *device, uint32_t page,
} }
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
retval |= imx31_command (device, NAND_CMD_READ0); retval |= imx31_command(nand, NAND_CMD_READ0);
retval |= imx31_address (device, 0x00); retval |= imx31_address(nand, 0x00);
retval |= imx31_address (device, page & 0xff); retval |= imx31_address(nand, page & 0xff);
retval |= imx31_address (device, (page >> 8) & 0xff); retval |= imx31_address(nand, (page >> 8) & 0xff);
if (device->address_cycles >= 4) if (nand->address_cycles >= 4)
{ {
retval |= imx31_address (device, (page >> 16) & 0xff); retval |= imx31_address(nand, (page >> 16) & 0xff);
if (device->address_cycles >= 5) if (nand->address_cycles >= 5)
{ {
retval |= imx31_address (device, (page >> 24) & 0xff); retval |= imx31_address(nand, (page >> 24) & 0xff);
retval |= imx31_command (device, NAND_CMD_READSTART); retval |= imx31_command(nand, NAND_CMD_READSTART);
} }
} }
retval |= do_data_output (device); retval |= do_data_output (nand);
if (retval != ERROR_OK) if (retval != ERROR_OK)
{ {
return retval; return retval;
@ -658,9 +658,9 @@ static int test_iomux_settings (target_t * target, uint32_t address,
return ERROR_OK; return ERROR_OK;
} }
static int initialize_nf_controller (struct nand_device_s *device) static int initialize_nf_controller (struct nand_device_s *nand)
{ {
mx3_nf_controller_t *mx3_nf_info = device->controller_priv; mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
target_t *target = mx3_nf_info->target; target_t *target = mx3_nf_info->target;
/* /*
* resets NAND flash controller in zero time ? I dont know. * resets NAND flash controller in zero time ? I dont know.
@ -786,9 +786,9 @@ static int poll_for_complete_op (target_t * target, const char *text)
return ERROR_OK; return ERROR_OK;
} }
static int validate_target_state (struct nand_device_s *device) static int validate_target_state (struct nand_device_s *nand)
{ {
mx3_nf_controller_t *mx3_nf_info = device->controller_priv; mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
target_t *target = mx3_nf_info->target; target_t *target = mx3_nf_info->target;
if (target->state != TARGET_HALTED) if (target->state != TARGET_HALTED)
@ -808,9 +808,9 @@ static int validate_target_state (struct nand_device_s *device)
return ERROR_OK; return ERROR_OK;
} }
static int do_data_output (struct nand_device_s *device) static int do_data_output (struct nand_device_s *nand)
{ {
mx3_nf_controller_t *mx3_nf_info = device->controller_priv; mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
target_t *target = mx3_nf_info->target; target_t *target = mx3_nf_info->target;
switch (mx3_nf_info->fin) switch (mx3_nf_info->fin)
{ {

426
src/flash/nand.c
View File

@ -28,10 +28,10 @@
#include "time_support.h" #include "time_support.h"
#include "fileio.h" #include "fileio.h"
static int nand_read_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); static int nand_read_page(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
//static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size); //static int nand_read_plain(struct nand_device_s *nand, uint32_t address, uint8_t *data, uint32_t data_size);
static int nand_write_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); static int nand_write_page(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
/* NAND flash controller /* NAND flash controller
*/ */
@ -304,89 +304,89 @@ nand_device_t *get_nand_device_by_num(int num)
} }
int nand_command_get_device_by_num(struct command_context_s *cmd_ctx, int nand_command_get_device_by_num(struct command_context_s *cmd_ctx,
const char *str, nand_device_t **device) const char *str, nand_device_t **nand)
{ {
unsigned num; unsigned num;
COMMAND_PARSE_NUMBER(uint, str, num); COMMAND_PARSE_NUMBER(uint, str, num);
*device = get_nand_device_by_num(num); *nand = get_nand_device_by_num(num);
if (!*device) { if (!*nand) {
command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", str); command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", str);
return ERROR_INVALID_ARGUMENTS; return ERROR_INVALID_ARGUMENTS;
} }
return ERROR_OK; return ERROR_OK;
} }
static int nand_build_bbt(struct nand_device_s *device, int first, int last) static int nand_build_bbt(struct nand_device_s *nand, int first, int last)
{ {
uint32_t page = 0x0; uint32_t page = 0x0;
int i; int i;
uint8_t oob[6]; uint8_t oob[6];
if ((first < 0) || (first >= device->num_blocks)) if ((first < 0) || (first >= nand->num_blocks))
first = 0; first = 0;
if ((last >= device->num_blocks) || (last == -1)) if ((last >= nand->num_blocks) || (last == -1))
last = device->num_blocks - 1; last = nand->num_blocks - 1;
for (i = first; i < last; i++) for (i = first; i < last; i++)
{ {
nand_read_page(device, page, NULL, 0, oob, 6); nand_read_page(nand, page, NULL, 0, oob, 6);
if (((device->device->options & NAND_BUSWIDTH_16) && ((oob[0] & oob[1]) != 0xff)) if (((nand->device->options & NAND_BUSWIDTH_16) && ((oob[0] & oob[1]) != 0xff))
|| (((device->page_size == 512) && (oob[5] != 0xff)) || || (((nand->page_size == 512) && (oob[5] != 0xff)) ||
((device->page_size == 2048) && (oob[0] != 0xff)))) ((nand->page_size == 2048) && (oob[0] != 0xff))))
{ {
LOG_WARNING("bad block: %i", i); LOG_WARNING("bad block: %i", i);
device->blocks[i].is_bad = 1; nand->blocks[i].is_bad = 1;
} }
else else
{ {
device->blocks[i].is_bad = 0; nand->blocks[i].is_bad = 0;
} }
page += (device->erase_size / device->page_size); page += (nand->erase_size / nand->page_size);
} }
return ERROR_OK; return ERROR_OK;
} }
int nand_read_status(struct nand_device_s *device, uint8_t *status) int nand_read_status(struct nand_device_s *nand, uint8_t *status)
{ {
if (!device->device) if (!nand->device)
return ERROR_NAND_DEVICE_NOT_PROBED; return ERROR_NAND_DEVICE_NOT_PROBED;
/* Send read status command */ /* Send read status command */
device->controller->command(device, NAND_CMD_STATUS); nand->controller->command(nand, NAND_CMD_STATUS);
alive_sleep(1); alive_sleep(1);
/* read status */ /* read status */
if (device->device->options & NAND_BUSWIDTH_16) if (nand->device->options & NAND_BUSWIDTH_16)
{ {
uint16_t data; uint16_t data;
device->controller->read_data(device, &data); nand->controller->read_data(nand, &data);
*status = data & 0xff; *status = data & 0xff;
} }
else else
{ {
device->controller->read_data(device, status); nand->controller->read_data(nand, status);
} }
return ERROR_OK; return ERROR_OK;
} }
static int nand_poll_ready(struct nand_device_s *device, int timeout) static int nand_poll_ready(struct nand_device_s *nand, int timeout)
{ {
uint8_t status; uint8_t status;
device->controller->command(device, NAND_CMD_STATUS); nand->controller->command(nand, NAND_CMD_STATUS);
do { do {
if (device->device->options & NAND_BUSWIDTH_16) { if (nand->device->options & NAND_BUSWIDTH_16) {
uint16_t data; uint16_t data;
device->controller->read_data(device, &data); nand->controller->read_data(nand, &data);
status = data & 0xff; status = data & 0xff;
} else { } else {
device->controller->read_data(device, &status); nand->controller->read_data(nand, &status);
} }
if (status & NAND_STATUS_READY) if (status & NAND_STATUS_READY)
break; break;
@ -396,7 +396,7 @@ static int nand_poll_ready(struct nand_device_s *device, int timeout)
return (status & NAND_STATUS_READY) != 0; return (status & NAND_STATUS_READY) != 0;
} }
int nand_probe(struct nand_device_s *device) int nand_probe(struct nand_device_s *nand)
{ {
uint8_t manufacturer_id, device_id; uint8_t manufacturer_id, device_id;
uint8_t id_buff[6]; uint8_t id_buff[6];
@ -404,17 +404,17 @@ int nand_probe(struct nand_device_s *device)
int i; int i;
/* clear device data */ /* clear device data */
device->device = NULL; nand->device = NULL;
device->manufacturer = NULL; nand->manufacturer = NULL;
/* clear device parameters */ /* clear device parameters */
device->bus_width = 0; nand->bus_width = 0;
device->address_cycles = 0; nand->address_cycles = 0;
device->page_size = 0; nand->page_size = 0;
device->erase_size = 0; nand->erase_size = 0;
/* initialize controller (device parameters are zero, use controller default) */ /* initialize controller (device parameters are zero, use controller default) */
if ((retval = device->controller->init(device) != ERROR_OK)) if ((retval = nand->controller->init(nand) != ERROR_OK))
{ {
switch (retval) switch (retval)
{ {
@ -430,23 +430,23 @@ int nand_probe(struct nand_device_s *device)
} }
} }
device->controller->command(device, NAND_CMD_RESET); nand->controller->command(nand, NAND_CMD_RESET);
device->controller->reset(device); nand->controller->reset(nand);
device->controller->command(device, NAND_CMD_READID); nand->controller->command(nand, NAND_CMD_READID);
device->controller->address(device, 0x0); nand->controller->address(nand, 0x0);
if (device->bus_width == 8) if (nand->bus_width == 8)
{ {
device->controller->read_data(device, &manufacturer_id); nand->controller->read_data(nand, &manufacturer_id);
device->controller->read_data(device, &device_id); nand->controller->read_data(nand, &device_id);
} }
else else
{ {
uint16_t data_buf; uint16_t data_buf;
device->controller->read_data(device, &data_buf); nand->controller->read_data(nand, &data_buf);
manufacturer_id = data_buf & 0xff; manufacturer_id = data_buf & 0xff;
device->controller->read_data(device, &data_buf); nand->controller->read_data(nand, &data_buf);
device_id = data_buf & 0xff; device_id = data_buf & 0xff;
} }
@ -454,7 +454,7 @@ int nand_probe(struct nand_device_s *device)
{ {
if (nand_flash_ids[i].id == device_id) if (nand_flash_ids[i].id == device_id)
{ {
device->device = &nand_flash_ids[i]; nand->device = &nand_flash_ids[i];
break; break;
} }
} }
@ -463,127 +463,127 @@ int nand_probe(struct nand_device_s *device)
{ {
if (nand_manuf_ids[i].id == manufacturer_id) if (nand_manuf_ids[i].id == manufacturer_id)
{ {
device->manufacturer = &nand_manuf_ids[i]; nand->manufacturer = &nand_manuf_ids[i];
break; break;
} }
} }
if (!device->manufacturer) if (!nand->manufacturer)
{ {
device->manufacturer = &nand_manuf_ids[0]; nand->manufacturer = &nand_manuf_ids[0];
device->manufacturer->id = manufacturer_id; nand->manufacturer->id = manufacturer_id;
} }
if (!device->device) if (!nand->device)
{ {
LOG_ERROR("unknown NAND flash device found, manufacturer id: 0x%2.2x device id: 0x%2.2x", LOG_ERROR("unknown NAND flash device found, manufacturer id: 0x%2.2x device id: 0x%2.2x",
manufacturer_id, device_id); manufacturer_id, device_id);
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;
} }
LOG_DEBUG("found %s (%s)", device->device->name, device->manufacturer->name); LOG_DEBUG("found %s (%s)", nand->device->name, nand->manufacturer->name);
/* initialize device parameters */ /* initialize device parameters */
/* bus width */ /* bus width */
if (device->device->options & NAND_BUSWIDTH_16) if (nand->device->options & NAND_BUSWIDTH_16)
device->bus_width = 16; nand->bus_width = 16;
else else
device->bus_width = 8; nand->bus_width = 8;
/* Do we need extended device probe information? */ /* Do we need extended device probe information? */
if (device->device->page_size == 0 || if (nand->device->page_size == 0 ||
device->device->erase_size == 0) nand->device->erase_size == 0)
{ {
if (device->bus_width == 8) if (nand->bus_width == 8)
{ {
device->controller->read_data(device, id_buff + 3); nand->controller->read_data(nand, id_buff + 3);
device->controller->read_data(device, id_buff + 4); nand->controller->read_data(nand, id_buff + 4);
device->controller->read_data(device, id_buff + 5); nand->controller->read_data(nand, id_buff + 5);
} }
else else
{ {
uint16_t data_buf; uint16_t data_buf;
device->controller->read_data(device, &data_buf); nand->controller->read_data(nand, &data_buf);
id_buff[3] = data_buf; id_buff[3] = data_buf;
device->controller->read_data(device, &data_buf); nand->controller->read_data(nand, &data_buf);
id_buff[4] = data_buf; id_buff[4] = data_buf;
device->controller->read_data(device, &data_buf); nand->controller->read_data(nand, &data_buf);
id_buff[5] = data_buf >> 8; id_buff[5] = data_buf >> 8;
} }
} }
/* page size */ /* page size */
if (device->device->page_size == 0) if (nand->device->page_size == 0)
{ {
device->page_size = 1 << (10 + (id_buff[4] & 3)); nand->page_size = 1 << (10 + (id_buff[4] & 3));
} }
else if (device->device->page_size == 256) else if (nand->device->page_size == 256)
{ {
LOG_ERROR("NAND flashes with 256 byte pagesize are not supported"); LOG_ERROR("NAND flashes with 256 byte pagesize are not supported");
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;
} }
else else
{ {
device->page_size = device->device->page_size; nand->page_size = nand->device->page_size;
} }
/* number of address cycles */ /* number of address cycles */
if (device->page_size <= 512) if (nand->page_size <= 512)
{ {
/* small page devices */ /* small page devices */
if (device->device->chip_size <= 32) if (nand->device->chip_size <= 32)
device->address_cycles = 3; nand->address_cycles = 3;
else if (device->device->chip_size <= 8*1024) else if (nand->device->chip_size <= 8*1024)
device->address_cycles = 4; nand->address_cycles = 4;
else else
{ {
LOG_ERROR("BUG: small page NAND device with more than 8 GiB encountered"); LOG_ERROR("BUG: small page NAND device with more than 8 GiB encountered");
device->address_cycles = 5; nand->address_cycles = 5;
} }
} }
else else
{ {
/* large page devices */ /* large page devices */
if (device->device->chip_size <= 128) if (nand->device->chip_size <= 128)
device->address_cycles = 4; nand->address_cycles = 4;
else if (device->device->chip_size <= 32*1024) else if (nand->device->chip_size <= 32*1024)
device->address_cycles = 5; nand->address_cycles = 5;
else else
{ {
LOG_ERROR("BUG: large page NAND device with more than 32 GiB encountered"); LOG_ERROR("BUG: large page NAND device with more than 32 GiB encountered");
device->address_cycles = 6; nand->address_cycles = 6;
} }
} }
/* erase size */ /* erase size */
if (device->device->erase_size == 0) if (nand->device->erase_size == 0)
{ {
switch ((id_buff[4] >> 4) & 3) { switch ((id_buff[4] >> 4) & 3) {
case 0: case 0:
device->erase_size = 64 << 10; nand->erase_size = 64 << 10;
break; break;
case 1: case 1:
device->erase_size = 128 << 10; nand->erase_size = 128 << 10;
break; break;
case 2: case 2:
device->erase_size = 256 << 10; nand->erase_size = 256 << 10;
break; break;
case 3: case 3:
device->erase_size =512 << 10; nand->erase_size =512 << 10;
break; break;
} }
} }
else else
{ {
device->erase_size = device->device->erase_size; nand->erase_size = nand->device->erase_size;
} }
/* initialize controller, but leave parameters at the controllers default */ /* initialize controller, but leave parameters at the controllers default */
if ((retval = device->controller->init(device) != ERROR_OK)) if ((retval = nand->controller->init(nand) != ERROR_OK))
{ {
switch (retval) switch (retval)
{ {
@ -592,7 +592,7 @@ int nand_probe(struct nand_device_s *device)
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;
case ERROR_NAND_OPERATION_NOT_SUPPORTED: case ERROR_NAND_OPERATION_NOT_SUPPORTED:
LOG_ERROR("controller doesn't support requested parameters (buswidth: %i, address cycles: %i, page size: %i)", LOG_ERROR("controller doesn't support requested parameters (buswidth: %i, address cycles: %i, page size: %i)",
device->bus_width, device->address_cycles, device->page_size); nand->bus_width, nand->address_cycles, nand->page_size);
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;
default: default:
LOG_ERROR("BUG: unknown controller initialization failure"); LOG_ERROR("BUG: unknown controller initialization failure");
@ -600,39 +600,39 @@ int nand_probe(struct nand_device_s *device)
} }
} }
device->num_blocks = (device->device->chip_size * 1024) / (device->erase_size / 1024); nand->num_blocks = (nand->device->chip_size * 1024) / (nand->erase_size / 1024);
device->blocks = malloc(sizeof(nand_block_t) * device->num_blocks); nand->blocks = malloc(sizeof(nand_block_t) * nand->num_blocks);
for (i = 0; i < device->num_blocks; i++) for (i = 0; i < nand->num_blocks; i++)
{ {
device->blocks[i].size = device->erase_size; nand->blocks[i].size = nand->erase_size;
device->blocks[i].offset = i * device->erase_size; nand->blocks[i].offset = i * nand->erase_size;
device->blocks[i].is_erased = -1; nand->blocks[i].is_erased = -1;
device->blocks[i].is_bad = -1; nand->blocks[i].is_bad = -1;
} }
return ERROR_OK; return ERROR_OK;
} }
static int nand_erase(struct nand_device_s *device, int first_block, int last_block) static int nand_erase(struct nand_device_s *nand, int first_block, int last_block)
{ {
int i; int i;
uint32_t page; uint32_t page;
uint8_t status; uint8_t status;
int retval; int retval;
if (!device->device) if (!nand->device)
return ERROR_NAND_DEVICE_NOT_PROBED; return ERROR_NAND_DEVICE_NOT_PROBED;
if ((first_block < 0) || (last_block > device->num_blocks)) if ((first_block < 0) || (last_block > nand->num_blocks))
return ERROR_INVALID_ARGUMENTS; return ERROR_INVALID_ARGUMENTS;
/* make sure we know if a block is bad before erasing it */ /* make sure we know if a block is bad before erasing it */
for (i = first_block; i <= last_block; i++) for (i = first_block; i <= last_block; i++)
{ {
if (device->blocks[i].is_bad == -1) if (nand->blocks[i].is_bad == -1)
{ {
nand_build_bbt(device, i, last_block); nand_build_bbt(nand, i, last_block);
break; break;
} }
} }
@ -640,48 +640,48 @@ static int nand_erase(struct nand_device_s *device, int first_block, int last_bl
for (i = first_block; i <= last_block; i++) for (i = first_block; i <= last_block; i++)
{ {
/* Send erase setup command */ /* Send erase setup command */
device->controller->command(device, NAND_CMD_ERASE1); nand->controller->command(nand, NAND_CMD_ERASE1);
page = i * (device->erase_size / device->page_size); page = i * (nand->erase_size / nand->page_size);
/* Send page address */ /* Send page address */
if (device->page_size <= 512) if (nand->page_size <= 512)
{ {
/* row */ /* row */
device->controller->address(device, page & 0xff); nand->controller->address(nand, page & 0xff);
device->controller->address(device, (page >> 8) & 0xff); nand->controller->address(nand, (page >> 8) & 0xff);
/* 3rd cycle only on devices with more than 32 MiB */ /* 3rd cycle only on devices with more than 32 MiB */
if (device->address_cycles >= 4) if (nand->address_cycles >= 4)
device->controller->address(device, (page >> 16) & 0xff); nand->controller->address(nand, (page >> 16) & 0xff);
/* 4th cycle only on devices with more than 8 GiB */ /* 4th cycle only on devices with more than 8 GiB */
if (device->address_cycles >= 5) if (nand->address_cycles >= 5)
device->controller->address(device, (page >> 24) & 0xff); nand->controller->address(nand, (page >> 24) & 0xff);
} }
else else
{ {
/* row */ /* row */
device->controller->address(device, page & 0xff); nand->controller->address(nand, page & 0xff);
device->controller->address(device, (page >> 8) & 0xff); nand->controller->address(nand, (page >> 8) & 0xff);
/* 3rd cycle only on devices with more than 128 MiB */ /* 3rd cycle only on devices with more than 128 MiB */
if (device->address_cycles >= 5) if (nand->address_cycles >= 5)
device->controller->address(device, (page >> 16) & 0xff); nand->controller->address(nand, (page >> 16) & 0xff);
} }
/* Send erase confirm command */ /* Send erase confirm command */
device->controller->command(device, NAND_CMD_ERASE2); nand->controller->command(nand, NAND_CMD_ERASE2);
retval = device->controller->nand_ready ? retval = nand->controller->nand_ready ?
device->controller->nand_ready(device, 1000) : nand->controller->nand_ready(nand, 1000) :
nand_poll_ready(device, 1000); nand_poll_ready(nand, 1000);
if (!retval) { if (!retval) {
LOG_ERROR("timeout waiting for NAND flash block erase to complete"); LOG_ERROR("timeout waiting for NAND flash block erase to complete");
return ERROR_NAND_OPERATION_TIMEOUT; return ERROR_NAND_OPERATION_TIMEOUT;
} }
if ((retval = nand_read_status(device, &status)) != ERROR_OK) if ((retval = nand_read_status(nand, &status)) != ERROR_OK)
{ {
LOG_ERROR("couldn't read status"); LOG_ERROR("couldn't read status");
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;
@ -690,43 +690,43 @@ static int nand_erase(struct nand_device_s *device, int first_block, int last_bl
if (status & 0x1) if (status & 0x1)
{ {
LOG_ERROR("didn't erase %sblock %d; status: 0x%2.2x", LOG_ERROR("didn't erase %sblock %d; status: 0x%2.2x",
(device->blocks[i].is_bad == 1) (nand->blocks[i].is_bad == 1)
? "bad " : "", ? "bad " : "",
i, status); i, status);
/* continue; other blocks might still be erasable */ /* continue; other blocks might still be erasable */
} }
device->blocks[i].is_erased = 1; nand->blocks[i].is_erased = 1;
} }
return ERROR_OK; return ERROR_OK;
} }
#if 0 #if 0
static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size) static int nand_read_plain(struct nand_device_s *nand, uint32_t address, uint8_t *data, uint32_t data_size)
{ {
uint8_t *page; uint8_t *page;
if (!device->device) if (!nand->device)
return ERROR_NAND_DEVICE_NOT_PROBED; return ERROR_NAND_DEVICE_NOT_PROBED;
if (address % device->page_size) if (address % nand->page_size)
{ {
LOG_ERROR("reads need to be page aligned"); LOG_ERROR("reads need to be page aligned");
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;
} }
page = malloc(device->page_size); page = malloc(nand->page_size);
while (data_size > 0) while (data_size > 0)
{ {
uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size; uint32_t thisrun_size = (data_size > nand->page_size) ? nand->page_size : data_size;
uint32_t page_address; uint32_t page_address;
page_address = address / device->page_size; page_address = address / nand->page_size;
nand_read_page(device, page_address, page, device->page_size, NULL, 0); nand_read_page(nand, page_address, page, nand->page_size, NULL, 0);
memcpy(data, page, thisrun_size); memcpy(data, page, thisrun_size);
@ -740,32 +740,32 @@ static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8
return ERROR_OK; return ERROR_OK;
} }
static int nand_write_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size) static int nand_write_plain(struct nand_device_s *nand, uint32_t address, uint8_t *data, uint32_t data_size)
{ {
uint8_t *page; uint8_t *page;
if (!device->device) if (!nand->device)
return ERROR_NAND_DEVICE_NOT_PROBED; return ERROR_NAND_DEVICE_NOT_PROBED;
if (address % device->page_size) if (address % nand->page_size)
{ {
LOG_ERROR("writes need to be page aligned"); LOG_ERROR("writes need to be page aligned");
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;
} }
page = malloc(device->page_size); page = malloc(nand->page_size);
while (data_size > 0) while (data_size > 0)
{ {
uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size; uint32_t thisrun_size = (data_size > nand->page_size) ? nand->page_size : data_size;
uint32_t page_address; uint32_t page_address;
memset(page, 0xff, device->page_size); memset(page, 0xff, nand->page_size);
memcpy(page, data, thisrun_size); memcpy(page, data, thisrun_size);
page_address = address / device->page_size; page_address = address / nand->page_size;
nand_write_page(device, page_address, page, device->page_size, NULL, 0); nand_write_page(nand, page_address, page, nand->page_size, NULL, 0);
address += thisrun_size; address += thisrun_size;
data += thisrun_size; data += thisrun_size;
@ -778,92 +778,92 @@ static int nand_write_plain(struct nand_device_s *device, uint32_t address, uint
} }
#endif #endif
int nand_write_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) int nand_write_page(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
{ {
uint32_t block; uint32_t block;
if (!device->device) if (!nand->device)
return ERROR_NAND_DEVICE_NOT_PROBED; return ERROR_NAND_DEVICE_NOT_PROBED;
block = page / (device->erase_size / device->page_size); block = page / (nand->erase_size / nand->page_size);
if (device->blocks[block].is_erased == 1) if (nand->blocks[block].is_erased == 1)
device->blocks[block].is_erased = 0; nand->blocks[block].is_erased = 0;
if (device->use_raw || device->controller->write_page == NULL) if (nand->use_raw || nand->controller->write_page == NULL)
return nand_write_page_raw(device, page, data, data_size, oob, oob_size); return nand_write_page_raw(nand, page, data, data_size, oob, oob_size);
else else
return device->controller->write_page(device, page, data, data_size, oob, oob_size); return nand->controller->write_page(nand, page, data, data_size, oob, oob_size);
} }
static int nand_read_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) static int nand_read_page(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
{ {
if (!device->device) if (!nand->device)
return ERROR_NAND_DEVICE_NOT_PROBED; return ERROR_NAND_DEVICE_NOT_PROBED;
if (device->use_raw || device->controller->read_page == NULL) if (nand->use_raw || nand->controller->read_page == NULL)
return nand_read_page_raw(device, page, data, data_size, oob, oob_size); return nand_read_page_raw(nand, page, data, data_size, oob, oob_size);
else else
return device->controller->read_page(device, page, data, data_size, oob, oob_size); return nand->controller->read_page(nand, page, data, data_size, oob, oob_size);
} }
int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) int nand_read_page_raw(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
{ {
uint32_t i; uint32_t i;
if (!device->device) if (!nand->device)
return ERROR_NAND_DEVICE_NOT_PROBED; return ERROR_NAND_DEVICE_NOT_PROBED;
if (device->page_size <= 512) if (nand->page_size <= 512)
{ {
/* small page device */ /* small page device */
if (data) if (data)
device->controller->command(device, NAND_CMD_READ0); nand->controller->command(nand, NAND_CMD_READ0);
else else
device->controller->command(device, NAND_CMD_READOOB); nand->controller->command(nand, NAND_CMD_READOOB);
/* column (always 0, we start at the beginning of a page/OOB area) */ /* column (always 0, we start at the beginning of a page/OOB area) */
device->controller->address(device, 0x0); nand->controller->address(nand, 0x0);
/* row */ /* row */
device->controller->address(device, page & 0xff); nand->controller->address(nand, page & 0xff);
device->controller->address(device, (page >> 8) & 0xff); nand->controller->address(nand, (page >> 8) & 0xff);
/* 4th cycle only on devices with more than 32 MiB */ /* 4th cycle only on devices with more than 32 MiB */
if (device->address_cycles >= 4) if (nand->address_cycles >= 4)
device->controller->address(device, (page >> 16) & 0xff); nand->controller->address(nand, (page >> 16) & 0xff);
/* 5th cycle only on devices with more than 8 GiB */ /* 5th cycle only on devices with more than 8 GiB */
if (device->address_cycles >= 5) if (nand->address_cycles >= 5)
device->controller->address(device, (page >> 24) & 0xff); nand->controller->address(nand, (page >> 24) & 0xff);
} }
else else
{ {
/* large page device */ /* large page device */
device->controller->command(device, NAND_CMD_READ0); nand->controller->command(nand, NAND_CMD_READ0);
/* column (0 when we start at the beginning of a page, /* column (0 when we start at the beginning of a page,
* or 2048 for the beginning of OOB area) * or 2048 for the beginning of OOB area)
*/ */
device->controller->address(device, 0x0); nand->controller->address(nand, 0x0);
if (data) if (data)
device->controller->address(device, 0x0); nand->controller->address(nand, 0x0);
else else
device->controller->address(device, 0x8); nand->controller->address(nand, 0x8);
/* row */ /* row */
device->controller->address(device, page & 0xff); nand->controller->address(nand, page & 0xff);
device->controller->address(device, (page >> 8) & 0xff); nand->controller->address(nand, (page >> 8) & 0xff);
/* 5th cycle only on devices with more than 128 MiB */ /* 5th cycle only on devices with more than 128 MiB */
if (device->address_cycles >= 5) if (nand->address_cycles >= 5)
device->controller->address(device, (page >> 16) & 0xff); nand->controller->address(nand, (page >> 16) & 0xff);
/* large page devices need a start command */ /* large page devices need a start command */
device->controller->command(device, NAND_CMD_READSTART); nand->controller->command(nand, NAND_CMD_READSTART);
} }
if (device->controller->nand_ready) { if (nand->controller->nand_ready) {
if (!device->controller->nand_ready(device, 100)) if (!nand->controller->nand_ready(nand, 100))
return ERROR_NAND_OPERATION_TIMEOUT; return ERROR_NAND_OPERATION_TIMEOUT;
} else { } else {
alive_sleep(1); alive_sleep(1);
@ -871,21 +871,21 @@ int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *dat
if (data) if (data)
{ {
if (device->controller->read_block_data != NULL) if (nand->controller->read_block_data != NULL)
(device->controller->read_block_data)(device, data, data_size); (nand->controller->read_block_data)(nand, data, data_size);
else else
{ {
for (i = 0; i < data_size;) for (i = 0; i < data_size;)
{ {
if (device->device->options & NAND_BUSWIDTH_16) if (nand->device->options & NAND_BUSWIDTH_16)
{ {
device->controller->read_data(device, data); nand->controller->read_data(nand, data);
data += 2; data += 2;
i += 2; i += 2;
} }
else else
{ {
device->controller->read_data(device, data); nand->controller->read_data(nand, data);
data += 1; data += 1;
i += 1; i += 1;
} }
@ -895,21 +895,21 @@ int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *dat
if (oob) if (oob)
{ {
if (device->controller->read_block_data != NULL) if (nand->controller->read_block_data != NULL)
(device->controller->read_block_data)(device, oob, oob_size); (nand->controller->read_block_data)(nand, oob, oob_size);
else else
{ {
for (i = 0; i < oob_size;) for (i = 0; i < oob_size;)
{ {
if (device->device->options & NAND_BUSWIDTH_16) if (nand->device->options & NAND_BUSWIDTH_16)
{ {
device->controller->read_data(device, oob); nand->controller->read_data(nand, oob);
oob += 2; oob += 2;
i += 2; i += 2;
} }
else else
{ {
device->controller->read_data(device, oob); nand->controller->read_data(nand, oob);
oob += 1; oob += 1;
i += 1; i += 1;
} }
@ -920,72 +920,72 @@ int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *dat
return ERROR_OK; return ERROR_OK;
} }
int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) int nand_write_page_raw(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
{ {
uint32_t i; uint32_t i;
int retval; int retval;
uint8_t status; uint8_t status;
if (!device->device) if (!nand->device)
return ERROR_NAND_DEVICE_NOT_PROBED; return ERROR_NAND_DEVICE_NOT_PROBED;
device->controller->command(device, NAND_CMD_SEQIN); nand->controller->command(nand, NAND_CMD_SEQIN);
if (device->page_size <= 512) if (nand->page_size <= 512)
{ {
/* column (always 0, we start at the beginning of a page/OOB area) */ /* column (always 0, we start at the beginning of a page/OOB area) */
device->controller->address(device, 0x0); nand->controller->address(nand, 0x0);
/* row */ /* row */
device->controller->address(device, page & 0xff); nand->controller->address(nand, page & 0xff);
device->controller->address(device, (page >> 8) & 0xff); nand->controller->address(nand, (page >> 8) & 0xff);
/* 4th cycle only on devices with more than 32 MiB */ /* 4th cycle only on devices with more than 32 MiB */
if (device->address_cycles >= 4) if (nand->address_cycles >= 4)
device->controller->address(device, (page >> 16) & 0xff); nand->controller->address(nand, (page >> 16) & 0xff);
/* 5th cycle only on devices with more than 8 GiB */ /* 5th cycle only on devices with more than 8 GiB */
if (device->address_cycles >= 5) if (nand->address_cycles >= 5)
device->controller->address(device, (page >> 24) & 0xff); nand->controller->address(nand, (page >> 24) & 0xff);
} }
else else
{ {
/* column (0 when we start at the beginning of a page, /* column (0 when we start at the beginning of a page,
* or 2048 for the beginning of OOB area) * or 2048 for the beginning of OOB area)
*/ */
device->controller->address(device, 0x0); nand->controller->address(nand, 0x0);
if (data) if (data)
device->controller->address(device, 0x0); nand->controller->address(nand, 0x0);
else else
device->controller->address(device, 0x8); nand->controller->address(nand, 0x8);
/* row */ /* row */
device->controller->address(device, page & 0xff); nand->controller->address(nand, page & 0xff);
device->controller->address(device, (page >> 8) & 0xff); nand->controller->address(nand, (page >> 8) & 0xff);
/* 5th cycle only on devices with more than 128 MiB */ /* 5th cycle only on devices with more than 128 MiB */
if (device->address_cycles >= 5) if (nand->address_cycles >= 5)
device->controller->address(device, (page >> 16) & 0xff); nand->controller->address(nand, (page >> 16) & 0xff);
} }
if (data) if (data)
{ {
if (device->controller->write_block_data != NULL) if (nand->controller->write_block_data != NULL)
(device->controller->write_block_data)(device, data, data_size); (nand->controller->write_block_data)(nand, data, data_size);
else else
{ {
for (i = 0; i < data_size;) for (i = 0; i < data_size;)
{ {
if (device->device->options & NAND_BUSWIDTH_16) if (nand->device->options & NAND_BUSWIDTH_16)
{ {
uint16_t data_buf = le_to_h_u16(data); uint16_t data_buf = le_to_h_u16(data);
device->controller->write_data(device, data_buf); nand->controller->write_data(nand, data_buf);
data += 2; data += 2;
i += 2; i += 2;
} }
else else
{ {
device->controller->write_data(device, *data); nand->controller->write_data(nand, *data);
data += 1; data += 1;
i += 1; i += 1;
} }
@ -995,22 +995,22 @@ int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *da
if (oob) if (oob)
{ {
if (device->controller->write_block_data != NULL) if (nand->controller->write_block_data != NULL)
(device->controller->write_block_data)(device, oob, oob_size); (nand->controller->write_block_data)(nand, oob, oob_size);
else else
{ {
for (i = 0; i < oob_size;) for (i = 0; i < oob_size;)
{ {
if (device->device->options & NAND_BUSWIDTH_16) if (nand->device->options & NAND_BUSWIDTH_16)
{ {
uint16_t oob_buf = le_to_h_u16(data); uint16_t oob_buf = le_to_h_u16(data);
device->controller->write_data(device, oob_buf); nand->controller->write_data(nand, oob_buf);
oob += 2; oob += 2;
i += 2; i += 2;
} }
else else
{ {
device->controller->write_data(device, *oob); nand->controller->write_data(nand, *oob);
oob += 1; oob += 1;
i += 1; i += 1;
} }
@ -1018,15 +1018,15 @@ int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *da
} }
} }
device->controller->command(device, NAND_CMD_PAGEPROG); nand->controller->command(nand, NAND_CMD_PAGEPROG);
retval = device->controller->nand_ready ? retval = nand->controller->nand_ready ?
device->controller->nand_ready(device, 100) : nand->controller->nand_ready(nand, 100) :
nand_poll_ready(device, 100); nand_poll_ready(nand, 100);
if (!retval) if (!retval)
return ERROR_NAND_OPERATION_TIMEOUT; return ERROR_NAND_OPERATION_TIMEOUT;
if ((retval = nand_read_status(device, &status)) != ERROR_OK) if ((retval = nand_read_status(nand, &status)) != ERROR_OK)
{ {
LOG_ERROR("couldn't read status"); LOG_ERROR("couldn't read status");
return ERROR_NAND_OPERATION_FAILED; return ERROR_NAND_OPERATION_FAILED;

38
src/flash/nand.h
View File

@ -32,20 +32,20 @@ struct nand_device_s;
typedef struct nand_flash_controller_s typedef struct nand_flash_controller_s
{ {
char *name; char *name;
int (*nand_device_command)(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device); int (*nand_device_command)(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *nand);
int (*register_commands)(struct command_context_s *cmd_ctx); int (*register_commands)(struct command_context_s *cmd_ctx);
int (*init)(struct nand_device_s *device); int (*init)(struct nand_device_s *nand);
int (*reset)(struct nand_device_s *device); int (*reset)(struct nand_device_s *nand);
int (*command)(struct nand_device_s *device, uint8_t command); int (*command)(struct nand_device_s *nand, uint8_t command);
int (*address)(struct nand_device_s *device, uint8_t address); int (*address)(struct nand_device_s *nand, uint8_t address);
int (*write_data)(struct nand_device_s *device, uint16_t data); int (*write_data)(struct nand_device_s *nand, uint16_t data);
int (*read_data)(struct nand_device_s *device, void *data); int (*read_data)(struct nand_device_s *nand, void *data);
int (*write_block_data)(struct nand_device_s *device, uint8_t *data, int size); int (*write_block_data)(struct nand_device_s *nand, uint8_t *data, int size);
int (*read_block_data)(struct nand_device_s *device, uint8_t *data, int size); int (*read_block_data)(struct nand_device_s *nand, uint8_t *data, int size);
int (*write_page)(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); int (*write_page)(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
int (*read_page)(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); int (*read_page)(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
int (*controller_ready)(struct nand_device_s *device, int timeout); int (*controller_ready)(struct nand_device_s *nand, int timeout);
int (*nand_ready)(struct nand_device_s *device, int timeout); int (*nand_ready)(struct nand_device_s *nand, int timeout);
} nand_flash_controller_t; } nand_flash_controller_t;
typedef struct nand_block_s typedef struct nand_block_s
@ -209,16 +209,16 @@ enum oob_formats
nand_device_t *get_nand_device_by_num(int num); nand_device_t *get_nand_device_by_num(int num);
int nand_read_page_raw(struct nand_device_s *device, uint32_t page, int nand_read_page_raw(struct nand_device_s *nand, uint32_t page,
uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
int nand_write_page_raw(struct nand_device_s *device, uint32_t page, int nand_write_page_raw(struct nand_device_s *nand, uint32_t page,
uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
int nand_read_status(struct nand_device_s *device, uint8_t *status); int nand_read_status(struct nand_device_s *nand, uint8_t *status);
int nand_calculate_ecc(struct nand_device_s *device, int nand_calculate_ecc(struct nand_device_s *nand,
const uint8_t *dat, uint8_t *ecc_code); const uint8_t *dat, uint8_t *ecc_code);
int nand_calculate_ecc_kw(struct nand_device_s *device, int nand_calculate_ecc_kw(struct nand_device_s *nand,
const uint8_t *dat, uint8_t *ecc_code); const uint8_t *dat, uint8_t *ecc_code);
int nand_register_commands(struct command_context_s *cmd_ctx); int nand_register_commands(struct command_context_s *cmd_ctx);
@ -226,7 +226,7 @@ int nand_init(struct command_context_s *cmd_ctx);
/// helper for parsing a nand device command argument string /// helper for parsing a nand device command argument string
int nand_command_get_device_by_num(struct command_context_s *cmd_ctx, int nand_command_get_device_by_num(struct command_context_s *cmd_ctx,
const char *str, nand_device_t **device); const char *str, nand_device_t **nand);
#define ERROR_NAND_DEVICE_INVALID (-1100) #define ERROR_NAND_DEVICE_INVALID (-1100)

2
src/flash/nand_ecc.c
View File

@ -68,7 +68,7 @@ static const uint8_t nand_ecc_precalc_table[] = {
/* /*
* nand_calculate_ecc - Calculate 3-byte ECC for 256-byte block * nand_calculate_ecc - Calculate 3-byte ECC for 256-byte block
*/ */
int nand_calculate_ecc(struct nand_device_s *device, const uint8_t *dat, uint8_t *ecc_code) int nand_calculate_ecc(struct nand_device_s *nand, const uint8_t *dat, uint8_t *ecc_code)
{ {
uint8_t idx, reg1, reg2, reg3, tmp1, tmp2; uint8_t idx, reg1, reg2, reg3, tmp1, tmp2;
int i; int i;

2
src/flash/nand_ecc_kw.c
View File

@ -100,7 +100,7 @@ static void gf_build_log_exp_table(void)
* expects the ECC to be computed backward, i.e. from the last byte down * expects the ECC to be computed backward, i.e. from the last byte down
* to the first one. * to the first one.
*/ */
int nand_calculate_ecc_kw(struct nand_device_s *device, const uint8_t *data, uint8_t *ecc) int nand_calculate_ecc_kw(struct nand_device_s *nand, const uint8_t *data, uint8_t *ecc)
{ {
unsigned int r7, r6, r5, r4, r3, r2, r1, r0; unsigned int r7, r6, r5, r4, r3, r2, r1, r0;
int i; int i;

40
src/flash/orion_nand.c
View File

@ -49,9 +49,9 @@ typedef struct orion_nand_controller_s
} \ } \
} while (0) } while (0)
static int orion_nand_command(struct nand_device_s *device, uint8_t command) static int orion_nand_command(struct nand_device_s *nand, uint8_t command)
{ {
orion_nand_controller_t *hw = device->controller_priv; orion_nand_controller_t *hw = nand->controller_priv;
target_t *target = hw->target; target_t *target = hw->target;
CHECK_HALTED; CHECK_HALTED;
@ -59,9 +59,9 @@ static int orion_nand_command(struct nand_device_s *device, uint8_t command)
return ERROR_OK; return ERROR_OK;
} }
static int orion_nand_address(struct nand_device_s *device, uint8_t address) static int orion_nand_address(struct nand_device_s *nand, uint8_t address)
{ {
orion_nand_controller_t *hw = device->controller_priv; orion_nand_controller_t *hw = nand->controller_priv;
target_t *target = hw->target; target_t *target = hw->target;
CHECK_HALTED; CHECK_HALTED;
@ -69,9 +69,9 @@ static int orion_nand_address(struct nand_device_s *device, uint8_t address)
return ERROR_OK; return ERROR_OK;
} }
static int orion_nand_read(struct nand_device_s *device, void *data) static int orion_nand_read(struct nand_device_s *nand, void *data)
{ {
orion_nand_controller_t *hw = device->controller_priv; orion_nand_controller_t *hw = nand->controller_priv;
target_t *target = hw->target; target_t *target = hw->target;
CHECK_HALTED; CHECK_HALTED;
@ -79,9 +79,9 @@ static int orion_nand_read(struct nand_device_s *device, void *data)
return ERROR_OK; return ERROR_OK;
} }
static int orion_nand_write(struct nand_device_s *device, uint16_t data) static int orion_nand_write(struct nand_device_s *nand, uint16_t data)
{ {
orion_nand_controller_t *hw = device->controller_priv; orion_nand_controller_t *hw = nand->controller_priv;
target_t *target = hw->target; target_t *target = hw->target;
CHECK_HALTED; CHECK_HALTED;
@ -89,33 +89,33 @@ static int orion_nand_write(struct nand_device_s *device, uint16_t data)
return ERROR_OK; return ERROR_OK;
} }
static int orion_nand_slow_block_write(struct nand_device_s *device, uint8_t *data, int size) static int orion_nand_slow_block_write(struct nand_device_s *nand, uint8_t *data, int size)
{ {
while (size--) while (size--)
orion_nand_write(device, *data++); orion_nand_write(nand, *data++);
return ERROR_OK; return ERROR_OK;
} }
static int orion_nand_fast_block_write(struct nand_device_s *device, uint8_t *data, int size) static int orion_nand_fast_block_write(struct nand_device_s *nand, uint8_t *data, int size)
{ {
orion_nand_controller_t *hw = device->controller_priv; orion_nand_controller_t *hw = nand->controller_priv;
int retval; int retval;
hw->io.chunk_size = device->page_size; hw->io.chunk_size = nand->page_size;
retval = arm_nandwrite(&hw->io, data, size); retval = arm_nandwrite(&hw->io, data, size);
if (retval == ERROR_NAND_NO_BUFFER) if (retval == ERROR_NAND_NO_BUFFER)
retval = orion_nand_slow_block_write(device, data, size); retval = orion_nand_slow_block_write(nand, data, size);
return retval; return retval;
} }
static int orion_nand_reset(struct nand_device_s *device) static int orion_nand_reset(struct nand_device_s *nand)
{ {
return orion_nand_command(device, NAND_CMD_RESET); return orion_nand_command(nand, NAND_CMD_RESET);
} }
static int orion_nand_controller_ready(struct nand_device_s *device, int timeout) static int orion_nand_controller_ready(struct nand_device_s *nand, int timeout)
{ {
return 1; return 1;
} }
@ -127,7 +127,7 @@ static int orion_nand_register_commands(struct command_context_s *cmd_ctx)
int orion_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, int orion_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
char **args, int argc, char **args, int argc,
struct nand_device_s *device) struct nand_device_s *nand)
{ {
orion_nand_controller_t *hw; orion_nand_controller_t *hw;
uint32_t base; uint32_t base;
@ -144,7 +144,7 @@ int orion_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
return ERROR_NAND_DEVICE_INVALID; return ERROR_NAND_DEVICE_INVALID;
} }
device->controller_priv = hw; nand->controller_priv = hw;
hw->target = get_target(args[1]); hw->target = get_target(args[1]);
if (!hw->target) { if (!hw->target) {
LOG_ERROR("target '%s' not defined", args[1]); LOG_ERROR("target '%s' not defined", args[1]);
@ -166,7 +166,7 @@ int orion_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
return ERROR_OK; return ERROR_OK;
} }
static int orion_nand_init(struct nand_device_s *device) static int orion_nand_init(struct nand_device_s *nand)
{ {
return ERROR_OK; return ERROR_OK;
} }

20
src/flash/s3c2410_nand.c
View File

@ -32,11 +32,11 @@
static int s3c2410_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, static int s3c2410_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
char **args, int argc, char **args, int argc,
struct nand_device_s *device) struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *info; s3c24xx_nand_controller_t *info;
info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device); info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand);
if (info == NULL) { if (info == NULL) {
return ERROR_NAND_DEVICE_INVALID; return ERROR_NAND_DEVICE_INVALID;
} }
@ -50,9 +50,9 @@ static int s3c2410_nand_device_command(struct command_context_s *cmd_ctx, char *
return ERROR_OK; return ERROR_OK;
} }
static int s3c2410_init(struct nand_device_s *device) static int s3c2410_init(struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
target_write_u32(target, S3C2410_NFCONF, target_write_u32(target, S3C2410_NFCONF,
@ -62,9 +62,9 @@ static int s3c2410_init(struct nand_device_s *device)
return ERROR_OK; return ERROR_OK;
} }
static int s3c2410_write_data(struct nand_device_s *device, uint16_t data) static int s3c2410_write_data(struct nand_device_s *nand, uint16_t data)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
@ -76,9 +76,9 @@ static int s3c2410_write_data(struct nand_device_s *device, uint16_t data)
return ERROR_OK; return ERROR_OK;
} }
static int s3c2410_read_data(struct nand_device_s *device, void *data) static int s3c2410_read_data(struct nand_device_s *nand, void *data)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
@ -90,9 +90,9 @@ static int s3c2410_read_data(struct nand_device_s *device, void *data)
return ERROR_OK; return ERROR_OK;
} }
static int s3c2410_nand_ready(struct nand_device_s *device, int timeout) static int s3c2410_nand_ready(struct nand_device_s *nand, int timeout)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
uint8_t status; uint8_t status;

8
src/flash/s3c2412_nand.c
View File

@ -32,11 +32,11 @@
static int s3c2412_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, static int s3c2412_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
char **args, int argc, char **args, int argc,
struct nand_device_s *device) struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *info; s3c24xx_nand_controller_t *info;
info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device); info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand);
if (info == NULL) { if (info == NULL) {
return ERROR_NAND_DEVICE_INVALID; return ERROR_NAND_DEVICE_INVALID;
} }
@ -50,9 +50,9 @@ static int s3c2412_nand_device_command(struct command_context_s *cmd_ctx, char *
return ERROR_OK; return ERROR_OK;
} }
static int s3c2412_init(struct nand_device_s *device) static int s3c2412_init(struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
target_write_u32(target, S3C2410_NFCONF, target_write_u32(target, S3C2410_NFCONF,

22
src/flash/s3c2440_nand.c
View File

@ -33,11 +33,11 @@
static int s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, static int s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
char **args, int argc, char **args, int argc,
struct nand_device_s *device) struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *info; s3c24xx_nand_controller_t *info;
info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device); info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand);
if (info == NULL) { if (info == NULL) {
return ERROR_NAND_DEVICE_INVALID; return ERROR_NAND_DEVICE_INVALID;
} }
@ -51,9 +51,9 @@ static int s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char *
return ERROR_OK; return ERROR_OK;
} }
static int s3c2440_init(struct nand_device_s *device) static int s3c2440_init(struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
target_write_u32(target, S3C2410_NFCONF, target_write_u32(target, S3C2410_NFCONF,
@ -67,9 +67,9 @@ static int s3c2440_init(struct nand_device_s *device)
return ERROR_OK; return ERROR_OK;
} }
int s3c2440_nand_ready(struct nand_device_s *device, int timeout) int s3c2440_nand_ready(struct nand_device_s *nand, int timeout)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
uint8_t status; uint8_t status;
@ -93,14 +93,14 @@ int s3c2440_nand_ready(struct nand_device_s *device, int timeout)
/* use the fact we can read/write 4 bytes in one go via a single 32bit op */ /* use the fact we can read/write 4 bytes in one go via a single 32bit op */
int s3c2440_read_block_data(struct nand_device_s *device, uint8_t *data, int data_size) int s3c2440_read_block_data(struct nand_device_s *nand, uint8_t *data, int data_size)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
uint32_t nfdata = s3c24xx_info->data; uint32_t nfdata = s3c24xx_info->data;
uint32_t tmp; uint32_t tmp;
LOG_INFO("%s: reading data: %p, %p, %d\n", __func__, device, data, data_size); LOG_INFO("%s: reading data: %p, %p, %d\n", __func__, nand, data, data_size);
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
LOG_ERROR("target must be halted to use S3C24XX NAND flash controller"); LOG_ERROR("target must be halted to use S3C24XX NAND flash controller");
@ -129,9 +129,9 @@ int s3c2440_read_block_data(struct nand_device_s *device, uint8_t *data, int dat
return ERROR_OK; return ERROR_OK;
} }
int s3c2440_write_block_data(struct nand_device_s *device, uint8_t *data, int data_size) int s3c2440_write_block_data(struct nand_device_s *nand, uint8_t *data, int data_size)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
uint32_t nfdata = s3c24xx_info->data; uint32_t nfdata = s3c24xx_info->data;
uint32_t tmp; uint32_t tmp;

8
src/flash/s3c2443_nand.c
View File

@ -33,11 +33,11 @@
static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
char **args, int argc, char **args, int argc,
struct nand_device_s *device) struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *info; s3c24xx_nand_controller_t *info;
info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device); info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, nand);
if (info == NULL) { if (info == NULL) {
return ERROR_NAND_DEVICE_INVALID; return ERROR_NAND_DEVICE_INVALID;
} }
@ -51,9 +51,9 @@ static int s3c2443_nand_device_command(struct command_context_s *cmd_ctx, char *
return ERROR_OK; return ERROR_OK;
} }
static int s3c2443_init(struct nand_device_s *device) static int s3c2443_init(struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
target_write_u32(target, S3C2410_NFCONF, target_write_u32(target, S3C2410_NFCONF,

26
src/flash/s3c24xx_nand.c
View File

@ -34,7 +34,7 @@
s3c24xx_nand_controller_t * s3c24xx_nand_controller_t *
s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
char **args, int argc, char **args, int argc,
struct nand_device_s *device) struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *s3c24xx_info; s3c24xx_nand_controller_t *s3c24xx_info;
@ -44,7 +44,7 @@ s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
return NULL; return NULL;
} }
device->controller_priv = s3c24xx_info; nand->controller_priv = s3c24xx_info;
s3c24xx_info->target = get_target(args[1]); s3c24xx_info->target = get_target(args[1]);
if (s3c24xx_info->target == NULL) { if (s3c24xx_info->target == NULL) {
@ -60,9 +60,9 @@ int s3c24xx_register_commands(struct command_context_s *cmd_ctx)
return ERROR_OK; return ERROR_OK;
} }
int s3c24xx_reset(struct nand_device_s *device) int s3c24xx_reset(struct nand_device_s *nand)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
@ -75,9 +75,9 @@ int s3c24xx_reset(struct nand_device_s *device)
return ERROR_OK; return ERROR_OK;
} }
int s3c24xx_command(struct nand_device_s *device, uint8_t command) int s3c24xx_command(struct nand_device_s *nand, uint8_t command)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
@ -90,9 +90,9 @@ int s3c24xx_command(struct nand_device_s *device, uint8_t command)
} }
int s3c24xx_address(struct nand_device_s *device, uint8_t address) int s3c24xx_address(struct nand_device_s *nand, uint8_t address)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
@ -104,9 +104,9 @@ int s3c24xx_address(struct nand_device_s *device, uint8_t address)
return ERROR_OK; return ERROR_OK;
} }
int s3c24xx_write_data(struct nand_device_s *device, uint16_t data) int s3c24xx_write_data(struct nand_device_s *nand, uint16_t data)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
@ -118,9 +118,9 @@ int s3c24xx_write_data(struct nand_device_s *device, uint16_t data)
return ERROR_OK; return ERROR_OK;
} }
int s3c24xx_read_data(struct nand_device_s *device, void *data) int s3c24xx_read_data(struct nand_device_s *nand, void *data)
{ {
s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; s3c24xx_nand_controller_t *s3c24xx_info = nand->controller_priv;
target_t *target = s3c24xx_info->target; target_t *target = s3c24xx_info->target;
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
@ -132,7 +132,7 @@ int s3c24xx_read_data(struct nand_device_s *device, void *data)
return ERROR_OK; return ERROR_OK;
} }
int s3c24xx_controller_ready(struct nand_device_s *device, int timeout) int s3c24xx_controller_ready(struct nand_device_s *nand, int timeout)
{ {
return 1; return 1;
} }

20
src/flash/s3c24xx_nand.h
View File

@ -47,30 +47,30 @@ typedef struct s3c24xx_nand_controller_s
s3c24xx_nand_controller_t *s3c24xx_nand_device_command( s3c24xx_nand_controller_t *s3c24xx_nand_device_command(
struct command_context_s *cmd_ctx, char *cmd, struct command_context_s *cmd_ctx, char *cmd,
char **args, int argc, struct nand_device_s *device); char **args, int argc, struct nand_device_s *nand);
int s3c24xx_register_commands(struct command_context_s *cmd_ctx); int s3c24xx_register_commands(struct command_context_s *cmd_ctx);
int s3c24xx_reset(struct nand_device_s *device); int s3c24xx_reset(struct nand_device_s *nand);
int s3c24xx_command(struct nand_device_s *device, uint8_t command); int s3c24xx_command(struct nand_device_s *nand, uint8_t command);
int s3c24xx_address(struct nand_device_s *device, uint8_t address); int s3c24xx_address(struct nand_device_s *nand, uint8_t address);
int s3c24xx_write_data(struct nand_device_s *device, uint16_t data); int s3c24xx_write_data(struct nand_device_s *nand, uint16_t data);
int s3c24xx_read_data(struct nand_device_s *device, void *data); int s3c24xx_read_data(struct nand_device_s *nand, void *data);
int s3c24xx_controller_ready(struct nand_device_s *device, int tout); int s3c24xx_controller_ready(struct nand_device_s *nand, int tout);
#define s3c24xx_write_page NULL #define s3c24xx_write_page NULL
#define s3c24xx_read_page NULL #define s3c24xx_read_page NULL
/* code shared between different controllers */ /* code shared between different controllers */
int s3c2440_nand_ready(struct nand_device_s *device, int timeout); int s3c2440_nand_ready(struct nand_device_s *nand, int timeout);
int s3c2440_read_block_data(struct nand_device_s *device, int s3c2440_read_block_data(struct nand_device_s *nand,
uint8_t *data, int data_size); uint8_t *data, int data_size);
int s3c2440_write_block_data(struct nand_device_s *device, int s3c2440_write_block_data(struct nand_device_s *nand,
uint8_t *data, int data_size); uint8_t *data, int data_size);
#endif // S3C24xx_NAND_H #endif // S3C24xx_NAND_H