diff options
author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-25 15:45:17 +0000 |
---|---|---|
committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-25 15:45:17 +0000 |
commit | d47e1b8f362379d8a2307f49e2b42115a3f40524 (patch) | |
tree | 6b3276ca066bf34e165c28a3de71f84dbc98175d /src/flash/s3c2440_nand.c | |
parent | a96f96d1f0827c6b0eb5d67cb9a94a4084e36184 (diff) |
- rename log functions to stop conflicts under win32 (wingdi)
git-svn-id: svn://svn.berlios.de/openocd/trunk@523 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash/s3c2440_nand.c')
-rw-r--r-- | src/flash/s3c2440_nand.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/flash/s3c2440_nand.c b/src/flash/s3c2440_nand.c index dc64ad6d..41081bff 100644 --- a/src/flash/s3c2440_nand.c +++ b/src/flash/s3c2440_nand.c @@ -104,7 +104,7 @@ 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; } @@ -130,10 +130,10 @@ 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; } @@ -167,7 +167,7 @@ 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; } |