Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cfi_flash: Fix indent of case statements

Browse Source 
case statements should be at the same level of indent as the switch
keyword. Fix all instances where this occurs.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
master
Mario Six 6 years ago committed by Stefan Roese
parent db91bb242f
commit dde0913b85
1 changed files with 100 additions and 100 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 200
      drivers/mtd/cfi_flash.c

200
drivers/mtd/cfi_flash.c
Unescape View File

@ -1220,29 +1220,29 @@ void flash_print_info(flash_info_t *info)
info->size >> 20, info->sector_count); info->size >> 20, info->sector_count);
printf(" "); printf(" ");
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS: case CFI_CMDSET_INTEL_PROG_REGIONS:
printf("Intel Prog Regions"); printf("Intel Prog Regions");
break; break;
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
printf("Intel Standard"); printf("Intel Standard");
break; break;
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
printf("Intel Extended"); printf("Intel Extended");
break; break;
case CFI_CMDSET_AMD_STANDARD: case CFI_CMDSET_AMD_STANDARD:
printf("AMD Standard"); printf("AMD Standard");
break; break;
case CFI_CMDSET_AMD_EXTENDED: case CFI_CMDSET_AMD_EXTENDED:
printf("AMD Extended"); printf("AMD Extended");
break; break;
#ifdef CONFIG_FLASH_CFI_LEGACY #ifdef CONFIG_FLASH_CFI_LEGACY
case CFI_CMDSET_AMD_LEGACY: case CFI_CMDSET_AMD_LEGACY:
printf("AMD Legacy"); printf("AMD Legacy");
break; break;
#endif #endif
default: default:
printf("Unknown (%d)", info->vendor); printf("Unknown (%d)", info->vendor);
break; break;
} }
printf(" command set, Manufacturer ID: 0x%02X, Device ID: 0x", printf(" command set, Manufacturer ID: 0x%02X, Device ID: 0x",
info->manufacturer_id); info->manufacturer_id);
@ -1480,94 +1480,94 @@ int flash_real_protect(flash_info_t *info, long sector, int prot)
int retcode = 0; int retcode = 0;
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_PROG_REGIONS: case CFI_CMDSET_INTEL_PROG_REGIONS:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
if (!cfi_protect_bugfix(info, sector, prot)) { if (!cfi_protect_bugfix(info, sector, prot)) {
flash_write_cmd(info, sector, 0,
FLASH_CMD_CLEAR_STATUS);
flash_write_cmd(info, sector, 0,
FLASH_CMD_PROTECT);
if (prot)
flash_write_cmd(info, sector, 0, flash_write_cmd(info, sector, 0,
FLASH_CMD_CLEAR_STATUS); FLASH_CMD_PROTECT_SET);
else
flash_write_cmd(info, sector, 0, flash_write_cmd(info, sector, 0,
FLASH_CMD_PROTECT); FLASH_CMD_PROTECT_CLEAR);
if (prot)
flash_write_cmd(info, sector, 0,
FLASH_CMD_PROTECT_SET);
else
flash_write_cmd(info, sector, 0,
FLASH_CMD_PROTECT_CLEAR);
}
break;
case CFI_CMDSET_AMD_EXTENDED:
case CFI_CMDSET_AMD_STANDARD:
/* U-Boot only checks the first byte */
if (manufact_match(info, ATM_MANUFACT)) {
if (prot) {
flash_unlock_seq(info, 0);
flash_write_cmd(info, 0,
info->addr_unlock1,
ATM_CMD_SOFTLOCK_START);
flash_unlock_seq(info, 0);
flash_write_cmd(info, sector, 0,
ATM_CMD_LOCK_SECT);
} else {
flash_write_cmd(info, 0,
info->addr_unlock1,
AMD_CMD_UNLOCK_START);
if (info->device_id == ATM_ID_BV6416)
flash_write_cmd(info, sector,
0, ATM_CMD_UNLOCK_SECT);
} }
break; }
case CFI_CMDSET_AMD_EXTENDED: if (info->legacy_unlock) {
case CFI_CMDSET_AMD_STANDARD: int flag = disable_interrupts();
/* U-Boot only checks the first byte */ int lock_flag;
if (manufact_match(info, ATM_MANUFACT)) {
if (prot) { flash_unlock_seq(info, 0);
flash_unlock_seq(info, 0); flash_write_cmd(info, 0, info->addr_unlock1,
flash_write_cmd(info, 0, AMD_CMD_SET_PPB_ENTRY);
info->addr_unlock1, lock_flag = flash_isset(info, sector, 0, 0x01);
ATM_CMD_SOFTLOCK_START); if (prot) {
flash_unlock_seq(info, 0); if (lock_flag) {
flash_write_cmd(info, sector, 0, flash_write_cmd(info, sector, 0,
ATM_CMD_LOCK_SECT); AMD_CMD_PPB_LOCK_BC1);
} else { flash_write_cmd(info, sector, 0,
flash_write_cmd(info, 0, AMD_CMD_PPB_LOCK_BC2);
info->addr_unlock1,
AMD_CMD_UNLOCK_START);
if (info->device_id == ATM_ID_BV6416)
flash_write_cmd(info, sector,
0, ATM_CMD_UNLOCK_SECT);
} }
} debug("sector %ld %slocked\n", sector,
if (info->legacy_unlock) { lock_flag ? "" : "already ");
int flag = disable_interrupts(); } else {
int lock_flag; if (!lock_flag) {
debug("unlock %ld\n", sector);
flash_unlock_seq(info, 0); flash_write_cmd(info, 0, 0,
flash_write_cmd(info, 0, info->addr_unlock1, AMD_CMD_PPB_UNLOCK_BC1);
AMD_CMD_SET_PPB_ENTRY); flash_write_cmd(info, 0, 0,
lock_flag = flash_isset(info, sector, 0, 0x01); AMD_CMD_PPB_UNLOCK_BC2);
if (prot) {
if (lock_flag) {
flash_write_cmd(info, sector, 0,
AMD_CMD_PPB_LOCK_BC1);
flash_write_cmd(info, sector, 0,
AMD_CMD_PPB_LOCK_BC2);
}
debug("sector %ld %slocked\n", sector,
lock_flag ? "" : "already ");
} else {
if (!lock_flag) {
debug("unlock %ld\n", sector);
flash_write_cmd(info, 0, 0,
AMD_CMD_PPB_UNLOCK_BC1);
flash_write_cmd(info, 0, 0,
AMD_CMD_PPB_UNLOCK_BC2);
}
debug("sector %ld %sunlocked\n", sector,
!lock_flag ? "" : "already ");
} }
if (flag) debug("sector %ld %sunlocked\n", sector,
enable_interrupts(); !lock_flag ? "" : "already ");
if (flash_status_check(info, sector,
info->erase_blk_tout,
prot ? "protect" : "unprotect"))
printf("status check error\n");
flash_write_cmd(info, 0, 0,
AMD_CMD_SET_PPB_EXIT_BC1);
flash_write_cmd(info, 0, 0,
AMD_CMD_SET_PPB_EXIT_BC2);
} }
break; if (flag)
enable_interrupts();
if (flash_status_check(info, sector,
info->erase_blk_tout,
prot ? "protect" : "unprotect"))
printf("status check error\n");
flash_write_cmd(info, 0, 0,
AMD_CMD_SET_PPB_EXIT_BC1);
flash_write_cmd(info, 0, 0,
AMD_CMD_SET_PPB_EXIT_BC2);
}
break;
#ifdef CONFIG_FLASH_CFI_LEGACY #ifdef CONFIG_FLASH_CFI_LEGACY
case CFI_CMDSET_AMD_LEGACY: case CFI_CMDSET_AMD_LEGACY:
flash_write_cmd(info, sector, 0, FLASH_CMD_CLEAR_STATUS); flash_write_cmd(info, sector, 0, FLASH_CMD_CLEAR_STATUS);
flash_write_cmd(info, sector, 0, FLASH_CMD_PROTECT); flash_write_cmd(info, sector, 0, FLASH_CMD_PROTECT);
if (prot) if (prot)
flash_write_cmd(info, sector, 0, FLASH_CMD_PROTECT_SET); flash_write_cmd(info, sector, 0, FLASH_CMD_PROTECT_SET);
else else
flash_write_cmd(info, sector, 0, FLASH_CMD_PROTECT_CLEAR); flash_write_cmd(info, sector, 0, FLASH_CMD_PROTECT_CLEAR);
#endif #endif
}; };

Write Preview
Loading…
Cancel
Save