X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fs3c24xx_nand.c;h=478d2684b98e211002b6d1f61542c8edb9c29015;hp=6bde224fa303cf9e8d9e257e177ce7c290fbb2a1;hb=ca594adb5a71f2bf60c1380172b8e61b075d9479;hpb=ee340df8417772b8c29a54ddf7b36556ec20d609 diff --git a/src/flash/s3c24xx_nand.c b/src/flash/s3c24xx_nand.c index 6bde224fa3..478d2684b9 100644 --- a/src/flash/s3c24xx_nand.c +++ b/src/flash/s3c24xx_nand.c @@ -1,14 +1,26 @@ -/* src/flash/s3c24xx_nand.c - * +/*************************************************************************** + * Copyright (C) 2007, 2008 by Ben Dooks * + * ben@fluff.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +/* * S3C24XX Series OpenOCD NAND Flash controller support. * - * Copyright 2007,2008 Ben Dooks - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * * Many thanks to Simtec Electronics for sponsoring this work. */ @@ -16,15 +28,8 @@ #include "config.h" #endif -#include "replacements.h" -#include "log.h" - -#include -#include - -#include "nand.h" #include "s3c24xx_nand.h" -#include "target.h" + s3c24xx_nand_controller_t * s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, @@ -32,21 +37,21 @@ s3c24xx_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, struct nand_device_s *device) { s3c24xx_nand_controller_t *s3c24xx_info; - + s3c24xx_info = malloc(sizeof(s3c24xx_nand_controller_t)); if (s3c24xx_info == NULL) { - ERROR("no memory for nand controller\n"); + LOG_ERROR("no memory for nand controller\n"); return NULL; } device->controller_priv = s3c24xx_info; - s3c24xx_info->target = get_target_by_num(strtoul(args[1], NULL, 0)); + s3c24xx_info->target = get_target(args[1]); if (s3c24xx_info->target == NULL) { - ERROR("no target '%s' configured", args[1]); + LOG_ERROR("target '%s' not defined", args[1]); return NULL; } - + return s3c24xx_info; } @@ -61,22 +66,22 @@ int s3c24xx_reset(struct nand_device_s *device) target_t *target = s3c24xx_info->target; if (target->state != TARGET_HALTED) { - ERROR("target must be halted to use S3C24XX NAND flash controller"); + LOG_ERROR("target must be halted to use S3C24XX NAND flash controller"); return ERROR_NAND_OPERATION_FAILED; } - + target_write_u32(target, s3c24xx_info->cmd, 0xff); - + return ERROR_OK; } -int s3c24xx_command(struct nand_device_s *device, u8 command) +int s3c24xx_command(struct nand_device_s *device, uint8_t command) { s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; target_t *target = s3c24xx_info->target; - + if (target->state != TARGET_HALTED) { - ERROR("target must be halted to use S3C24XX NAND flash controller"); + LOG_ERROR("target must be halted to use S3C24XX NAND flash controller"); return ERROR_NAND_OPERATION_FAILED; } @@ -85,30 +90,30 @@ int s3c24xx_command(struct nand_device_s *device, u8 command) } -int s3c24xx_address(struct nand_device_s *device, u8 address) +int s3c24xx_address(struct nand_device_s *device, uint8_t address) { s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; target_t *target = s3c24xx_info->target; - + if (target->state != TARGET_HALTED) { - ERROR("target must be halted to use S3C24XX NAND flash controller"); + LOG_ERROR("target must be halted to use S3C24XX NAND flash controller"); return ERROR_NAND_OPERATION_FAILED; } - + target_write_u16(target, s3c24xx_info->addr, address); return ERROR_OK; } -int s3c24xx_write_data(struct nand_device_s *device, u16 data) +int s3c24xx_write_data(struct nand_device_s *device, uint16_t data) { s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; target_t *target = s3c24xx_info->target; if (target->state != TARGET_HALTED) { - ERROR("target must be halted to use S3C24XX NAND flash controller"); + LOG_ERROR("target must be halted to use S3C24XX NAND flash controller"); return ERROR_NAND_OPERATION_FAILED; } - + target_write_u8(target, s3c24xx_info->data, data); return ERROR_OK; } @@ -117,9 +122,9 @@ int s3c24xx_read_data(struct nand_device_s *device, void *data) { s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv; target_t *target = s3c24xx_info->target; - + if (target->state != TARGET_HALTED) { - ERROR("target must be halted to use S3C24XX NAND flash controller"); + LOG_ERROR("target must be halted to use S3C24XX NAND flash controller"); return ERROR_NAND_OPERATION_FAILED; }