flash: use lowercase for C variables

[openocd.git] / src / flash / nand / lpc3180.c

diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c
index d15fdce384a40853af72963b006aa7649b832424..6ce05753ebff752037ce78fb5c81fcc7dad5de6a 100644 (file)
--- a/src/flash/nand/lpc3180.c
+++ b/src/flash/nand/lpc3180.c
@@ -139,9 +139,9 @@ static int lpc3180_init(struct nand_device *nand)
 {
        struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
        struct target *target = nand->target;
-       int bus_width = nand->bus_width ? : 8;
-       int address_cycles = nand->address_cycles ? : 3;
-       int page_size = nand->page_size ? : 512;
+       int bus_width = nand->bus_width ? nand->bus_width : 8;
+       int address_cycles = nand->address_cycles ? nand->address_cycles : 3;
+       int page_size = nand->page_size ? nand->page_size : 512;
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
@@ -232,12 +232,12 @@ static int lpc3180_init(struct nand_device *nand)
                /* FLASHCLK_CTRL = 0x05 (enable clock for SLC flash controller) */
                target_write_u32(target, 0x400040c8, 0x05);
 
-               /* after reset set other registers of SLC so reset calling is here at the begining*/
+               /* after reset set other registers of SLC so reset calling is here at the beginning */
                lpc3180_reset(nand);
 
                /* SLC_CFG = 0x (Force nCE assert, DMA ECC enabled, ECC enabled, DMA burst enabled,
                 *DMA read from SLC, WIDTH = bus_width) */
-               target_write_u32(target, 0x20020014, 0x3e | (bus_width == 16) ? 1 : 0);
+               target_write_u32(target, 0x20020014, 0x3e | ((bus_width == 16) ? 1 : 0));
 
                /* SLC_IEN = 3 (INT_RDY_EN = 1) ,(INT_TC_STAT = 1) */
                target_write_u32(target, 0x20020020, 0x03);
@@ -1290,7 +1290,7 @@ COMMAND_HANDLER(handle_lpc3180_select_command)
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], num);
        struct nand_device *nand = get_nand_device_by_num(num);
        if (!nand) {
-               command_print(CMD_CTX, "nand device '#%s' is out of bounds", CMD_ARGV[0]);
+               command_print(CMD, "nand device '#%s' is out of bounds", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
@@ -1310,10 +1310,10 @@ COMMAND_HANDLER(handle_lpc3180_select_command)
        }
 
        if (lpc3180_info->selected_controller == LPC3180_MLC_CONTROLLER)
-               command_print(CMD_CTX, "%s controller selected",
+               command_print(CMD, "%s controller selected",
                        selected[lpc3180_info->selected_controller]);
        else
-               command_print(CMD_CTX,
+               command_print(CMD,
                        lpc3180_info->is_bulk ? "%s controller selected bulk mode is available" :
                        "%s controller selected bulk mode is not available",
                        selected[lpc3180_info->selected_controller]);