Transform 'u8' to 'uint8_t' in src/target

[fw/openocd] / src / flash / s3c2440_nand.c

diff --git a/src/flash/s3c2440_nand.c b/src/flash/s3c2440_nand.c
index dc64ad6d2bfd3a8cc4c2189120a7ef7d77f51521..85a50989ac35a1ca2130034985e89c936e303e84 100644 (file)
--- a/src/flash/s3c2440_nand.c
+++ b/src/flash/s3c2440_nand.c
@@ -28,19 +28,12 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "nand.h"
 #include "s3c24xx_nand.h"
-#include "target.h"
 
-int s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
-int s3c2440_init(struct nand_device_s *device);
-int s3c2440_nand_ready(struct nand_device_s *device, int timeout);
+
+static int s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct nand_device_s *device);
+static int s3c2440_init(struct nand_device_s *device);
+//static int s3c2440_nand_ready(struct nand_device_s *device, int timeout);
 
 nand_flash_controller_t s3c2440_nand_controller =
 {
@@ -61,12 +54,12 @@ nand_flash_controller_t s3c2440_nand_controller =
        .nand_ready             = s3c2440_nand_ready,
 };
 
-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,
                                struct nand_device_s *device)
 {
        s3c24xx_nand_controller_t *info;
-       
+
        info = s3c24xx_nand_device_command(cmd_ctx, cmd, args, argc, device);
        if (info == NULL) {
                return ERROR_NAND_DEVICE_INVALID;
@@ -77,11 +70,11 @@ int s3c2440_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
        info->addr = S3C2440_NFADDR;
        info->data = S3C2440_NFDATA;
        info->nfstat = S3C2440_NFSTAT;
-               
+
        return ERROR_OK;
 }
 
-int s3c2440_init(struct nand_device_s *device)
+static int s3c2440_init(struct nand_device_s *device)
 {
        s3c24xx_nand_controller_t *s3c24xx_info = device->controller_priv;
        target_t *target = s3c24xx_info->target;
@@ -104,17 +97,17 @@ int s3c2440_nand_ready(struct nand_device_s *device, int timeout)
        u8 status;
 
        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;
        }
-       
-       do {            
+
+       do {
                target_read_u8(target, s3c24xx_info->nfstat, &status);
-               
+
                if (status & S3C2440_NFSTAT_READY)
                        return 1;
 
-               usleep(1000);
+               alive_sleep(1);
        } while (timeout-- > 0);
 
 
@@ -130,14 +123,14 @@ int s3c2440_read_block_data(struct nand_device_s *device, u8 *data, int data_siz
        u32 nfdata = s3c24xx_info->data;
        u32 tmp;
 
-       INFO("%s: reading data: %p, %p, %d\n", __func__, device, data, data_size);
+       LOG_INFO("%s: reading data: %p, %p, %d\n", __func__, device, data, data_size);
 
        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;
        }
 
-       while (data_size >= 4) {          
+       while (data_size >= 4) {
                target_read_u32(target, nfdata, &tmp);
 
                data[0] = tmp;
@@ -167,11 +160,11 @@ int s3c2440_write_block_data(struct nand_device_s *device, u8 *data, int data_si
        u32 tmp;
 
        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;
        }
 
-       while (data_size >= 4) {          
+       while (data_size >= 4) {
                tmp = le_to_h_u32(data);
                target_write_u32(target, nfdata, tmp);