Mercurial > louis > kiibohd-controller

diff Bootloader/flash.c @ 308:ab4515606277

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix whitespace Use a consistent standard - Tabs in front for indenting, spaces after for anything else. This way everything stays nice and lined up while also letting users change there prefered indent level. Most of the new files from Haata where already in this format.
author Rowan Decker <Smasher816@gmail.com>
date Sun, 08 Mar 2015 18:40:01 -0700
parents 596d8e300a37
children f4d4cad283c6
line wrap: on
line diff
--- a/Bootloader/flash.c	Sun Mar 08 17:25:13 2015 -0700
+++ b/Bootloader/flash.c	Sun Mar 08 18:40:01 2015 -0700
@@ -33,60 +33,60 @@
 __attribute__((section(".ramtext.ftfl_submit_cmd"), long_call))
 int ftfl_submit_cmd(void)
 {
-        FTFL.fstat.raw = ((struct FTFL_FSTAT_t){
-                        .ccif = 1,
-                                .rdcolerr = 1,
-                                .accerr = 1,
-                                .fpviol = 1
-                                }).raw;
-        struct FTFL_FSTAT_t stat;
-        while (!(stat = FTFL.fstat).ccif)
-                /* NOTHING */; /* XXX maybe WFI? */
-        return (!!stat.mgstat0);
+	FTFL.fstat.raw = ((struct FTFL_FSTAT_t){
+			.ccif = 1,
+				.rdcolerr = 1,
+				.accerr = 1,
+				.fpviol = 1
+				}).raw;
+	struct FTFL_FSTAT_t stat;
+	while (!(stat = FTFL.fstat).ccif)
+		/* NOTHING */; /* XXX maybe WFI? */
+	return (!!stat.mgstat0);
 }
 
 int flash_prepare_flashing(void)
 {
-        /* switch to FlexRAM */
-        if (!FTFL.fcnfg.ramrdy) {
-                FTFL.fccob.set_flexram.fcmd = FTFL_FCMD_SET_FLEXRAM;
-                FTFL.fccob.set_flexram.flexram_function = FTFL_FLEXRAM_RAM;
-                return (ftfl_submit_cmd());
-        }
-        return (0);
+	/* switch to FlexRAM */
+	if (!FTFL.fcnfg.ramrdy) {
+		FTFL.fccob.set_flexram.fcmd = FTFL_FCMD_SET_FLEXRAM;
+		FTFL.fccob.set_flexram.flexram_function = FTFL_FLEXRAM_RAM;
+		return (ftfl_submit_cmd());
+	}
+	return (0);
 }
 
 int flash_erase_sector(uintptr_t addr)
 {
-        if (addr < (uintptr_t)&_app_rom &&
-                flash_ALLOW_BRICKABLE_ADDRESSES != 0x00023420)
-                return (-1);
-        FTFL.fccob.erase.fcmd = FTFL_FCMD_ERASE_SECTOR;
-        FTFL.fccob.erase.addr = addr;
-        return (ftfl_submit_cmd());
+	if (addr < (uintptr_t)&_app_rom &&
+		flash_ALLOW_BRICKABLE_ADDRESSES != 0x00023420)
+		return (-1);
+	FTFL.fccob.erase.fcmd = FTFL_FCMD_ERASE_SECTOR;
+	FTFL.fccob.erase.addr = addr;
+	return (ftfl_submit_cmd());
 }
 
 int flash_program_section(uintptr_t addr, size_t num_words)
 {
-        FTFL.fccob.program_section.fcmd = FTFL_FCMD_PROGRAM_SECTION;
-        FTFL.fccob.program_section.addr = addr;
-        FTFL.fccob.program_section.num_words = num_words;
-        return (ftfl_submit_cmd());
+	FTFL.fccob.program_section.fcmd = FTFL_FCMD_PROGRAM_SECTION;
+	FTFL.fccob.program_section.addr = addr;
+	FTFL.fccob.program_section.num_words = num_words;
+	return (ftfl_submit_cmd());
 }
 
 int flash_program_sector(uintptr_t addr, size_t len)
 {
-        return (len != FLASH_SECTOR_SIZE ||
-                (addr & (FLASH_SECTOR_SIZE - 1)) != 0 ||
-                flash_erase_sector(addr) ||
-                flash_program_section(addr, FLASH_SECTOR_SIZE/4));
+	return (len != FLASH_SECTOR_SIZE ||
+		(addr & (FLASH_SECTOR_SIZE - 1)) != 0 ||
+		flash_erase_sector(addr) ||
+		flash_program_section(addr, FLASH_SECTOR_SIZE/4));
 }
 
 void *flash_get_staging_area(uintptr_t addr, size_t len)
 {
-        if ((addr & (FLASH_SECTOR_SIZE - 1)) != 0 ||
-            len != FLASH_SECTOR_SIZE)
-                return (NULL);
-        return (FlexRAM);
+	if ((addr & (FLASH_SECTOR_SIZE - 1)) != 0 ||
+	    len != FLASH_SECTOR_SIZE)
+		return (NULL);
+	return (FlexRAM);
 }