lk: msm: Fix files to have uniform coding style
No functional changes, just style code formatting style changes here.
Change-Id: Id3f1995ef97765b393c5c26259011c9ce1321106
diff --git a/target/msm7630_surf/init.c b/target/msm7630_surf/init.c
index d148999..4a59275 100644
--- a/target/msm7630_surf/init.c
+++ b/target/msm7630_surf/init.c
@@ -51,7 +51,8 @@
#define DIFF_START_ADDR 0xF0F0F0F0
#define NUM_PAGES_PER_BLOCK 0x40
-static unsigned mmc_sdc_base[] = { MSM_SDC1_BASE, MSM_SDC2_BASE, MSM_SDC3_BASE, MSM_SDC4_BASE};
+static unsigned mmc_sdc_base[] =
+ { MSM_SDC1_BASE, MSM_SDC2_BASE, MSM_SDC3_BASE, MSM_SDC4_BASE };
static struct ptable flash_ptable;
static int hw_platform_type = -1;
@@ -66,47 +67,48 @@
*/
static struct ptentry board_part_list[] = {
{
- .start = 0,
- .length = 5 /* In MB */,
- .name = "boot",
- },
+ .start = 0,
+ .length = 5 /* In MB */ ,
+ .name = "boot",
+ },
{
- .start = DIFF_START_ADDR,
- .length = 180 /* In MB */,
- .name = "system",
- },
+ .start = DIFF_START_ADDR,
+ .length = 180 /* In MB */ ,
+ .name = "system",
+ },
{
- .start = DIFF_START_ADDR,
- .length = 5 /* In MB */,
- .name = "cache",
- },
+ .start = DIFF_START_ADDR,
+ .length = 5 /* In MB */ ,
+ .name = "cache",
+ },
{
- .start = DIFF_START_ADDR,
- .length = 1 /* In MB */,
- .name = "misc",
- },
+ .start = DIFF_START_ADDR,
+ .length = 1 /* In MB */ ,
+ .name = "misc",
+ },
{
- .start = DIFF_START_ADDR,
- .length = 1 /* In MB */,
- .name = "devinfo",
- },
+ .start = DIFF_START_ADDR,
+ .length = 1 /* In MB */ ,
+ .name = "devinfo",
+ },
{
- .start = DIFF_START_ADDR,
- .length = VARIABLE_LENGTH,
- .name = "userdata",
- },
+ .start = DIFF_START_ADDR,
+ .length = VARIABLE_LENGTH,
+ .name = "userdata",
+ },
{
- .start = DIFF_START_ADDR,
- .length = 3 /* In MB */,
- .name = "persist",
- },
+ .start = DIFF_START_ADDR,
+ .length = 3 /* In MB */ ,
+ .name = "persist",
+ },
{
- .start = DIFF_START_ADDR,
- .length = 5 /* In MB */,
- .name = "recovery",
- },
+ .start = DIFF_START_ADDR,
+ .length = 5 /* In MB */ ,
+ .name = "recovery",
+ },
};
-static int num_parts = sizeof(board_part_list)/sizeof(struct ptentry);
+
+static int num_parts = sizeof(board_part_list) / sizeof(struct ptentry);
void smem_ptable_init(void);
unsigned smem_get_apps_flash_start(void);
@@ -114,7 +116,7 @@
void keypad_init(void);
-static int emmc_boot = -1; /* set to uninitialized */
+static int emmc_boot = -1; /* set to uninitialized */
int target_is_emmc_boot(void);
static int platform_version = -1;
static int target_msm_id = -1;
@@ -123,45 +125,45 @@
int target_is_interleaved_mode(void)
{
- struct smem_board_info_v4 board_info_v4;
- unsigned int board_info_len = 0;
- unsigned smem_status;
- char *build_type;
- unsigned format = 0;
+ struct smem_board_info_v4 board_info_v4;
+ unsigned int board_info_len = 0;
+ unsigned smem_status;
+ char *build_type;
+ unsigned format = 0;
- if (interleaved_mode_enabled != -1)
- {
- return interleaved_mode_enabled;
- }
-
- smem_status = smem_read_alloc_entry_offset(SMEM_BOARD_INFO_LOCATION,
- &format, sizeof(format), 0);
- if(!smem_status)
- {
- if ((format == 3) || (format == 4))
- {
- if (format == 4)
- board_info_len = sizeof(board_info_v4);
- else
- board_info_len = sizeof(board_info_v4.board_info_v3);
-
- smem_status = smem_read_alloc_entry(SMEM_BOARD_INFO_LOCATION,
- &board_info_v4, board_info_len);
- if(!smem_status)
- {
- build_type = (char *)(board_info_v4.board_info_v3.build_id) + 9;
-
- interleaved_mode_enabled = 0;
-
- if (*build_type == 'C')
- {
- interleaved_mode_enabled = 1;
- }
- }
+ if (interleaved_mode_enabled != -1) {
+ return interleaved_mode_enabled;
}
- }
- return interleaved_mode_enabled;
+ smem_status = smem_read_alloc_entry_offset(SMEM_BOARD_INFO_LOCATION,
+ &format, sizeof(format), 0);
+ if (!smem_status) {
+ if ((format == 3) || (format == 4)) {
+ if (format == 4)
+ board_info_len = sizeof(board_info_v4);
+ else
+ board_info_len =
+ sizeof(board_info_v4.board_info_v3);
+
+ smem_status =
+ smem_read_alloc_entry(SMEM_BOARD_INFO_LOCATION,
+ &board_info_v4,
+ board_info_len);
+ if (!smem_status) {
+ build_type =
+ (char *)(board_info_v4.
+ board_info_v3.build_id) + 9;
+
+ interleaved_mode_enabled = 0;
+
+ if (*build_type == 'C') {
+ interleaved_mode_enabled = 1;
+ }
+ }
+ }
+ }
+
+ return interleaved_mode_enabled;
}
void target_init(void)
@@ -170,7 +172,7 @@
struct flash_info *flash_info;
unsigned total_num_of_blocks;
unsigned next_ptr_start_adr = 0;
- unsigned blocks_per_1MB = 8; /* Default value of 2k page size on 256MB flash drive*/
+ unsigned blocks_per_1MB = 8; /* Default value of 2k page size on 256MB flash drive */
unsigned base_addr;
unsigned char slot;
int i;
@@ -189,22 +191,19 @@
display_image_on_screen();
#endif
- if (target_is_emmc_boot())
- {
+ if (target_is_emmc_boot()) {
/* Must wait for modem-up before we can intialize MMC.
*/
- while (readl(MSM_SHARED_BASE + 0x14) != 1);
+ while (readl(MSM_SHARED_BASE + 0x14) != 1) ;
/* Trying Slot 2 first */
slot = 2;
- base_addr = mmc_sdc_base[slot-1];
- if(mmc_boot_main(slot, base_addr))
- {
+ base_addr = mmc_sdc_base[slot - 1];
+ if (mmc_boot_main(slot, base_addr)) {
/* Trying Slot 4 next */
slot = 4;
- base_addr = mmc_sdc_base[slot-1];
- if(mmc_boot_main(slot, base_addr))
- {
+ base_addr = mmc_sdc_base[slot - 1];
+ if (mmc_boot_main(slot, base_addr)) {
dprintf(CRITICAL, "mmc init failed!");
ASSERT(0);
}
@@ -222,7 +221,7 @@
offset = smem_get_apps_flash_start();
if (offset == 0xffffffff)
- while(1);
+ while (1) ;
total_num_of_blocks = flash_info->num_blocks;
blocks_per_1MB = (1 << 20) / (flash_info->block_size);
@@ -231,32 +230,35 @@
struct ptentry *ptn = &board_part_list[i];
unsigned len = ((ptn->length) * blocks_per_1MB);
- if(ptn->start != 0)
- ASSERT(ptn->start == DIFF_START_ADDR);
+ if (ptn->start != 0)
+ ASSERT(ptn->start == DIFF_START_ADDR);
ptn->start = next_ptr_start_adr;
- if(ptn->length == VARIABLE_LENGTH)
- {
+ if (ptn->length == VARIABLE_LENGTH) {
unsigned length_for_prt = 0;
unsigned j;
- for (j = i+1; j < num_parts; j++)
- {
- struct ptentry *temp_ptn = &board_part_list[j];
- ASSERT(temp_ptn->length != VARIABLE_LENGTH);
- length_for_prt += ((temp_ptn->length) * blocks_per_1MB);
+ for (j = i + 1; j < num_parts; j++) {
+ struct ptentry *temp_ptn = &board_part_list[j];
+ ASSERT(temp_ptn->length != VARIABLE_LENGTH);
+ length_for_prt +=
+ ((temp_ptn->length) * blocks_per_1MB);
}
- len = total_num_of_blocks - (offset + ptn->start + length_for_prt);
+ len =
+ total_num_of_blocks - (offset + ptn->start +
+ length_for_prt);
ASSERT(len >= 0);
}
next_ptr_start_adr = ptn->start + len;
- if(target_is_interleaved_mode()) {
- ptable_add(&flash_ptable, ptn->name, offset + (ptn->start / 2),
- (len / 2), ptn->flags, TYPE_APPS_PARTITION, PERM_WRITEABLE);
- }
- else {
- ptable_add(&flash_ptable, ptn->name, offset + ptn->start,
- len, ptn->flags, TYPE_APPS_PARTITION, PERM_WRITEABLE);
+ if (target_is_interleaved_mode()) {
+ ptable_add(&flash_ptable, ptn->name,
+ offset + (ptn->start / 2), (len / 2),
+ ptn->flags, TYPE_APPS_PARTITION,
+ PERM_WRITEABLE);
+ } else {
+ ptable_add(&flash_ptable, ptn->name,
+ offset + ptn->start, len, ptn->flags,
+ TYPE_APPS_PARTITION, PERM_WRITEABLE);
}
}
@@ -268,116 +270,130 @@
int target_platform_version(void)
{
- return platform_version;
+ return platform_version;
}
int target_is_msm8x55(void)
{
- if ((target_msm_id == MSM8255_ID) ||
- (target_msm_id == MSM8655_ID) ||
- (target_msm_id == APQ8055_ID))
- return 1;
- else
- return 0;
+ if ((target_msm_id == MSM8255_ID) ||
+ (target_msm_id == MSM8655_ID) || (target_msm_id == APQ8055_ID))
+ return 1;
+ else
+ return 0;
}
unsigned board_machtype(void)
{
- struct smem_board_info_v4 board_info_v4;
- unsigned int board_info_len = 0;
- enum platform platform_type = 0;
- unsigned smem_status;
- unsigned format = 0;
- if(hw_platform_type != -1)
- return hw_platform_type;
-
- smem_status = smem_read_alloc_entry_offset(SMEM_BOARD_INFO_LOCATION,
- &format, sizeof(format), 0);
- if(!smem_status)
- {
- if ((format == 3) || (format == 4))
- {
- if (format == 4)
- board_info_len = sizeof(board_info_v4);
- else
- board_info_len = sizeof(board_info_v4.board_info_v3);
-
- smem_status = smem_read_alloc_entry(SMEM_BOARD_INFO_LOCATION,
- &board_info_v4, board_info_len);
- if(!smem_status)
- {
- if(format == 4)
- platform_version = board_info_v4.platform_version;
-
- platform_type = board_info_v4.board_info_v3.hw_platform;
- target_msm_id = board_info_v4.board_info_v3.msm_id;
- switch (platform_type)
- {
- case HW_PLATFORM_SURF:
- hw_platform_type = ((target_is_msm8x55()) ?
- LINUX_MACHTYPE_8x55_SURF : LINUX_MACHTYPE_7x30_SURF); break;
- case HW_PLATFORM_FFA:
- hw_platform_type = ((target_is_msm8x55()) ?
- LINUX_MACHTYPE_8x55_FFA : LINUX_MACHTYPE_7x30_FFA); break;
- case HW_PLATFORM_FLUID:
- hw_platform_type = LINUX_MACHTYPE_7x30_FLUID; break;
- case HW_PLATFORM_SVLTE:
- hw_platform_type = LINUX_MACHTYPE_8x55_SVLTE_FFA; break;
- default:
- hw_platform_type = ((target_is_msm8x55()) ?
- LINUX_MACHTYPE_8x55_SURF : LINUX_MACHTYPE_7x30_SURF); break;
- }
+ struct smem_board_info_v4 board_info_v4;
+ unsigned int board_info_len = 0;
+ enum platform platform_type = 0;
+ unsigned smem_status;
+ unsigned format = 0;
+ if (hw_platform_type != -1)
return hw_platform_type;
- }
+
+ smem_status = smem_read_alloc_entry_offset(SMEM_BOARD_INFO_LOCATION,
+ &format, sizeof(format), 0);
+ if (!smem_status) {
+ if ((format == 3) || (format == 4)) {
+ if (format == 4)
+ board_info_len = sizeof(board_info_v4);
+ else
+ board_info_len =
+ sizeof(board_info_v4.board_info_v3);
+
+ smem_status =
+ smem_read_alloc_entry(SMEM_BOARD_INFO_LOCATION,
+ &board_info_v4,
+ board_info_len);
+ if (!smem_status) {
+ if (format == 4)
+ platform_version =
+ board_info_v4.platform_version;
+
+ platform_type =
+ board_info_v4.board_info_v3.hw_platform;
+ target_msm_id =
+ board_info_v4.board_info_v3.msm_id;
+ switch (platform_type) {
+ case HW_PLATFORM_SURF:
+ hw_platform_type =
+ ((target_is_msm8x55())?
+ LINUX_MACHTYPE_8x55_SURF :
+ LINUX_MACHTYPE_7x30_SURF);
+ break;
+ case HW_PLATFORM_FFA:
+ hw_platform_type =
+ ((target_is_msm8x55())?
+ LINUX_MACHTYPE_8x55_FFA :
+ LINUX_MACHTYPE_7x30_FFA);
+ break;
+ case HW_PLATFORM_FLUID:
+ hw_platform_type =
+ LINUX_MACHTYPE_7x30_FLUID;
+ break;
+ case HW_PLATFORM_SVLTE:
+ hw_platform_type =
+ LINUX_MACHTYPE_8x55_SVLTE_FFA;
+ break;
+ default:
+ hw_platform_type =
+ ((target_is_msm8x55())?
+ LINUX_MACHTYPE_8x55_SURF :
+ LINUX_MACHTYPE_7x30_SURF);
+ break;
+ }
+ return hw_platform_type;
+ }
+ }
}
- }
- hw_platform_type = LINUX_MACHTYPE_7x30_SURF;
- return hw_platform_type;
+ hw_platform_type = LINUX_MACHTYPE_7x30_SURF;
+ return hw_platform_type;
}
void reboot_device(unsigned reboot_reason)
{
- reboot(reboot_reason);
+ reboot(reboot_reason);
}
unsigned check_reboot_mode(void)
{
- unsigned mode[2] = {0, 0};
- unsigned int mode_len = sizeof(mode);
- unsigned smem_status;
+ unsigned mode[2] = { 0, 0 };
+ unsigned int mode_len = sizeof(mode);
+ unsigned smem_status;
- smem_status = smem_read_alloc_entry(SMEM_APPS_BOOT_MODE,
- &mode, mode_len );
- if(smem_status)
- {
- dprintf(CRITICAL, "ERROR: unable to read shared memory for reboot mode\n");
- return 0;
- }
- return mode[0];
+ smem_status = smem_read_alloc_entry(SMEM_APPS_BOOT_MODE,
+ &mode, mode_len);
+ if (smem_status) {
+ dprintf(CRITICAL,
+ "ERROR: unable to read shared memory for reboot mode\n");
+ return 0;
+ }
+ return mode[0];
}
static unsigned target_check_power_on_reason(void)
{
- unsigned power_on_status = 0;
- unsigned int status_len = sizeof(power_on_status);
- unsigned smem_status;
+ unsigned power_on_status = 0;
+ unsigned int status_len = sizeof(power_on_status);
+ unsigned smem_status;
- smem_status = smem_read_alloc_entry(SMEM_POWER_ON_STATUS_INFO,
- &power_on_status, status_len);
+ smem_status = smem_read_alloc_entry(SMEM_POWER_ON_STATUS_INFO,
+ &power_on_status, status_len);
- if (smem_status)
- {
- dprintf(CRITICAL, "ERROR: unable to read shared memory for power on reason\n");
- }
+ if (smem_status) {
+ dprintf(CRITICAL,
+ "ERROR: unable to read shared memory for power on reason\n");
+ }
- return power_on_status;
+ return power_on_status;
}
#if _EMMC_BOOT
void target_serialno(unsigned char *buf)
{
unsigned int serialno;
- serialno = mmc_get_psn();
+ serialno = mmc_get_psn();
snprintf(buf, 13, "%x", serialno);
}