interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NAND/S3CXXXX: remove private "target" copy 

Remove "target" form private data, and use
common one in struct nand_block.

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Antonio Borneo 2010-12-31 19:46:09 +08:00 committed by Øyvind Harboe
parent f49283a062
commit 093ec6656a
7 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/flash/nand/s3c2410.c
View File

@ -46,8 +46,7 @@ NAND_DEVICE_COMMAND_HANDLER(s3c2410_nand_device_command)
static int s3c2410_init(struct nand_device *nand) static int s3c2410_init(struct nand_device *nand)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct target *target = nand->target;
struct target *target = s3c24xx_info->target;
target_write_u32(target, S3C2410_NFCONF, target_write_u32(target, S3C2410_NFCONF,
S3C2410_NFCONF_EN | S3C2410_NFCONF_TACLS(3) | S3C2410_NFCONF_EN | S3C2410_NFCONF_TACLS(3) |
@ -58,8 +57,7 @@ static int s3c2410_init(struct nand_device *nand)
static int s3c2410_write_data(struct nand_device *nand, uint16_t data) static int s3c2410_write_data(struct nand_device *nand, uint16_t data)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct target *target = nand->target;
struct target *target = s3c24xx_info->target;
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");
@ -72,8 +70,7 @@ static int s3c2410_write_data(struct nand_device *nand, uint16_t data)
static int s3c2410_read_data(struct nand_device *nand, void *data) static int s3c2410_read_data(struct nand_device *nand, void *data)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct target *target = nand->target;
struct target *target = s3c24xx_info->target;
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");
@ -86,8 +83,7 @@ static int s3c2410_read_data(struct nand_device *nand, void *data)
static int s3c2410_nand_ready(struct nand_device *nand, int timeout) static int s3c2410_nand_ready(struct nand_device *nand, int timeout)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct target *target = nand->target;
struct target *target = s3c24xx_info->target;
uint8_t status; uint8_t status;
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {

3
src/flash/nand/s3c2412.c
View File

@ -46,8 +46,7 @@ NAND_DEVICE_COMMAND_HANDLER(s3c2412_nand_device_command)
static int s3c2412_init(struct nand_device *nand) static int s3c2412_init(struct nand_device *nand)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct target *target = nand->target;
struct target *target = s3c24xx_info->target;
target_write_u32(target, S3C2410_NFCONF, target_write_u32(target, S3C2410_NFCONF,
S3C2440_NFCONF_TACLS(3) | S3C2440_NFCONF_TACLS(3) |

9
src/flash/nand/s3c2440.c
View File

@ -47,8 +47,7 @@ NAND_DEVICE_COMMAND_HANDLER(s3c2440_nand_device_command)
static int s3c2440_init(struct nand_device *nand) static int s3c2440_init(struct nand_device *nand)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct target *target = nand->target;
struct target *target = s3c24xx_info->target;
target_write_u32(target, S3C2410_NFCONF, target_write_u32(target, S3C2410_NFCONF,
S3C2440_NFCONF_TACLS(3) | S3C2440_NFCONF_TACLS(3) |
@ -64,7 +63,7 @@ static int s3c2440_init(struct nand_device *nand)
int s3c2440_nand_ready(struct nand_device *nand, int timeout) int s3c2440_nand_ready(struct nand_device *nand, int timeout)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
struct target *target = s3c24xx_info->target; struct target *target = nand->target;
uint8_t status; uint8_t status;
if (target->state != TARGET_HALTED) { if (target->state != TARGET_HALTED) {
@ -90,7 +89,7 @@ int s3c2440_nand_ready(struct nand_device *nand, int timeout)
int s3c2440_read_block_data(struct nand_device *nand, uint8_t *data, int data_size) int s3c2440_read_block_data(struct nand_device *nand, uint8_t *data, int data_size)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
struct target *target = s3c24xx_info->target; struct target *target = nand->target;
uint32_t nfdata = s3c24xx_info->data; uint32_t nfdata = s3c24xx_info->data;
uint32_t tmp; uint32_t tmp;
@ -126,7 +125,7 @@ int s3c2440_read_block_data(struct nand_device *nand, uint8_t *data, int data_si
int s3c2440_write_block_data(struct nand_device *nand, uint8_t *data, int data_size) int s3c2440_write_block_data(struct nand_device *nand, uint8_t *data, int data_size)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
struct target *target = s3c24xx_info->target; struct target *target = nand->target;
uint32_t nfdata = s3c24xx_info->data; uint32_t nfdata = s3c24xx_info->data;
uint32_t tmp; uint32_t tmp;

3
src/flash/nand/s3c2443.c
View File

@ -47,8 +47,7 @@ NAND_DEVICE_COMMAND_HANDLER(s3c2443_nand_device_command)
static int s3c2443_init(struct nand_device *nand) static int s3c2443_init(struct nand_device *nand)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct target *target = nand->target;
struct target *target = s3c24xx_info->target;
target_write_u32(target, S3C2410_NFCONF, target_write_u32(target, S3C2410_NFCONF,
S3C2440_NFCONF_TACLS(3) | S3C2440_NFCONF_TACLS(3) |

17
src/flash/nand/s3c24xx.c
View File

@ -43,13 +43,6 @@ S3C24XX_DEVICE_COMMAND()
} }
nand->controller_priv = s3c24xx_info; nand->controller_priv = s3c24xx_info;
s3c24xx_info->target = get_target(CMD_ARGV[1]);
if (s3c24xx_info->target == NULL) {
LOG_ERROR("target '%s' not defined", CMD_ARGV[1]);
return ERROR_COMMAND_SYNTAX_ERROR;
}
*info = s3c24xx_info; *info = s3c24xx_info;
return ERROR_OK; return ERROR_OK;
@ -58,7 +51,7 @@ S3C24XX_DEVICE_COMMAND()
int s3c24xx_reset(struct nand_device *nand) int s3c24xx_reset(struct nand_device *nand)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
struct target *target = s3c24xx_info->target; struct target *target = nand->target;
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");
@ -73,7 +66,7 @@ int s3c24xx_reset(struct nand_device *nand)
int s3c24xx_command(struct nand_device *nand, uint8_t command) int s3c24xx_command(struct nand_device *nand, uint8_t command)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
struct target *target = s3c24xx_info->target; struct target *target = nand->target;
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");
@ -88,7 +81,7 @@ int s3c24xx_command(struct nand_device *nand, uint8_t command)
int s3c24xx_address(struct nand_device *nand, uint8_t address) int s3c24xx_address(struct nand_device *nand, uint8_t address)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
struct target *target = s3c24xx_info->target; struct target *target = nand->target;
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");
@ -102,7 +95,7 @@ int s3c24xx_address(struct nand_device *nand, uint8_t address)
int s3c24xx_write_data(struct nand_device *nand, uint16_t data) int s3c24xx_write_data(struct nand_device *nand, uint16_t data)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
struct target *target = s3c24xx_info->target; struct target *target = nand->target;
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");
@ -116,7 +109,7 @@ int s3c24xx_write_data(struct nand_device *nand, uint16_t data)
int s3c24xx_read_data(struct nand_device *nand, void *data) int s3c24xx_read_data(struct nand_device *nand, void *data)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
struct target *target = s3c24xx_info->target; struct target *target = nand->target;
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");

2
src/flash/nand/s3c24xx.h
View File

@ -33,8 +33,6 @@
struct s3c24xx_nand_controller struct s3c24xx_nand_controller
{ {
struct target *target;
/* register addresses */ /* register addresses */
uint32_t cmd; uint32_t cmd;
uint32_t addr; uint32_t addr;

3
src/flash/nand/s3c6400.c
View File

@ -43,8 +43,7 @@ NAND_DEVICE_COMMAND_HANDLER(s3c6400_nand_device_command)
static int s3c6400_init(struct nand_device *nand) static int s3c6400_init(struct nand_device *nand)
{ {
struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv; struct target *target = nand->target;
struct target *target = s3c24xx_info->target;
target_write_u32(target, S3C2410_NFCONF, target_write_u32(target, S3C2410_NFCONF,
S3C2440_NFCONF_TACLS(3) | S3C2440_NFCONF_TACLS(3) |