Transform 'u16' to 'uint16_t'

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

diff --git a/src/flash/tms470.c b/src/flash/tms470.c
index 0e48703b965e5fb167aba0608dd94c67b1fe87eb..33753d8314c0042f30e2cb9c469fd15b227efa6b 100644 (file)
--- a/src/flash/tms470.c
+++ b/src/flash/tms470.c
@@ -21,16 +21,14 @@
 #include "config.h"
 #endif
 
-#include "log.h"
 #include "tms470.h"
-#include <string.h>
-#include <unistd.h>
+
 
 static int tms470_register_commands(struct command_context_s *cmd_ctx);
 static int tms470_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
 static int tms470_erase(struct flash_bank_s *bank, int first, int last);
 static int tms470_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int tms470_write(struct flash_bank_s *bank, u8 * buffer, u32 offset, u32 count);
+static int tms470_write(struct flash_bank_s *bank, uint8_t * buffer, u32 offset, u32 count);
 static int tms470_probe(struct flash_bank_s *bank);
 static int tms470_auto_probe(struct flash_bank_s *bank);
 static int tms470_erase_check(struct flash_bank_s *bank);
@@ -196,7 +194,7 @@ static int tms470_read_part_info(struct flash_bank_s *bank)
        case 0x2b:
                part_name = "TMS470R1A288";
 
-               if ((bank->base >= 0x00000000) && (bank->base < 0x00008000))
+               if (bank->base < 0x00008000)
                {
                        tms470_info->ordinal = 0;
                        bank->base = 0x00000000;
@@ -232,7 +230,7 @@ static int tms470_read_part_info(struct flash_bank_s *bank)
        case 0x2d:
                part_name = "TMS470R1A384";
 
-               if ((bank->base >= 0x00000000) && (bank->base < 0x00020000))
+               if (bank->base < 0x00020000)
                {
                        tms470_info->ordinal = 0;
                        bank->base = 0x00000000;
@@ -788,11 +786,11 @@ static int tms470_erase_sector(struct flash_bank_s *bank, int sector)
         * clear status regiser, sent erase command, kickoff erase 
         */
        target_write_u16(target, flashAddr, 0x0040);
-       LOG_DEBUG("write *(u16 *)0x%08x=0x0040", flashAddr);
+       LOG_DEBUG("write *(uint16_t *)0x%08x=0x0040", flashAddr);
        target_write_u16(target, flashAddr, 0x0020);
-       LOG_DEBUG("write *(u16 *)0x%08x=0x0020", flashAddr);
+       LOG_DEBUG("write *(uint16_t *)0x%08x=0x0020", flashAddr);
        target_write_u16(target, flashAddr, 0xffff);
-       LOG_DEBUG("write *(u16 *)0x%08x=0xffff", flashAddr);
+       LOG_DEBUG("write *(uint16_t *)0x%08x=0xffff", flashAddr);
 
        /*
         * Monitor FMMSTAT, busy until clear, then check and other flags for
@@ -951,7 +949,7 @@ static int tms470_protect(struct flash_bank_s *bank, int set, int first, int las
 
 /* ---------------------------------------------------------------------- */
 
-static int tms470_write(struct flash_bank_s *bank, u8 * buffer, u32 offset, u32 count)
+static int tms470_write(struct flash_bank_s *bank, uint8_t * buffer, u32 offset, u32 count)
 {
        target_t *target = bank->target;
        u32 glbctrl, fmbac2, orig_fmregopt, fmbsea, fmbseb, fmmaxpp, fmmstat;
@@ -996,7 +994,7 @@ static int tms470_write(struct flash_bank_s *bank, u8 * buffer, u32 offset, u32
        for (i = 0; i < count; i += 2)
        {
                u32 addr = bank->base + offset + i;
-               u16 word = (((u16) buffer[i]) << 8) | (u16) buffer[i + 1];
+               uint16_t word = (((uint16_t) buffer[i]) << 8) | (uint16_t) buffer[i + 1];
 
                if (word != 0xffff)
                {
@@ -1077,7 +1075,7 @@ static int tms470_erase_check(struct flash_bank_s *bank)
        tms470_flash_bank_t *tms470_info = bank->driver_priv;
        int sector, result = ERROR_OK;
        u32 fmmac2, fmbac2, glbctrl, orig_fmregopt;
-       static u8 buffer[64 * 1024];
+       static uint8_t buffer[64 * 1024];
 
        if (target->state != TARGET_HALTED)
        {