fix formatting

This commit is contained in:
Markus Fröschle
2017-04-20 15:22:55 +00:00
parent 11a432e59f
commit b445c02e06
8 changed files with 94 additions and 95 deletions

View File

@@ -55,8 +55,8 @@
#define CF_CACR_EUSP (0x00000020) /* Switch stacks in user mode */ #define CF_CACR_EUSP (0x00000020) /* Switch stacks in user mode */
#define CF_CACR_DF (0x00000010) /* Disable FPU */ #define CF_CACR_DF (0x00000010) /* Disable FPU */
#define _DCACHE_SET_MASK ((DCACHE_SIZE/64-1)<<CACHE_WAYS) #define _DCACHE_SET_MASK ((DCACHE_SIZE / 64 - 1) << CACHE_WAYS)
#define _ICACHE_SET_MASK ((ICACHE_SIZE/64-1)<<CACHE_WAYS) #define _ICACHE_SET_MASK ((ICACHE_SIZE / 64 - 1) << CACHE_WAYS)
#define LAST_DCACHE_ADDR _DCACHE_SET_MASK #define LAST_DCACHE_ADDR _DCACHE_SET_MASK
#define LAST_ICACHE_ADDR _ICACHE_SET_MASK #define LAST_ICACHE_ADDR _ICACHE_SET_MASK
@@ -68,14 +68,14 @@
#define CACHE_WAYS 0x0004 /* 4 way */ #define CACHE_WAYS 0x0004 /* 4 way */
#define CACHE_DISABLE_MODE (CF_CACR_DCINVA+ \ #define CACHE_DISABLE_MODE (CF_CACR_DCINVA + \
CF_CACR_BCINVA+ \ CF_CACR_BCINVA + \
CF_CACR_ICINVA) CF_CACR_ICINVA)
#define CACHE_INITIAL_MODE (CF_CACR_DEC+ \ #define CACHE_INITIAL_MODE (CF_CACR_DEC + \
CF_CACR_BEC+ \ CF_CACR_BEC + \
CF_CACR_IEC+ \ CF_CACR_IEC + \
CF_CACR_DESB+ \ CF_CACR_DESB + \
CF_CACR_EUSP) CF_CACR_EUSP)
extern void flush_and_invalidate_caches(void); extern void flush_and_invalidate_caches(void);

View File

@@ -80,7 +80,7 @@ DRESULT disk_ioctl (uint8_t, uint8_t, void*);
#define CT_MMC 0x01 /* MMC ver 3 */ #define CT_MMC 0x01 /* MMC ver 3 */
#define CT_SD1 0x02 /* SD ver 1 */ #define CT_SD1 0x02 /* SD ver 1 */
#define CT_SD2 0x04 /* SD ver 2 */ #define CT_SD2 0x04 /* SD ver 2 */
#define CT_SDC (CT_SD1|CT_SD2) /* SD */ #define CT_SDC (CT_SD1 | CT_SD2) /* SD */
#define CT_BLOCK 0x08 /* Block addressing */ #define CT_BLOCK 0x08 /* Block addressing */

View File

@@ -35,7 +35,6 @@
#include "sd_card.h" #include "sd_card.h"
#include "wait.h" #include "wait.h"
#include "diskio.h"
#include "ff.h" #include "ff.h"
#include "s19reader.h" #include "s19reader.h"
#include "mmu.h" #include "mmu.h"

View File

@@ -66,17 +66,17 @@ void flush_and_invalidate_caches(void)
" clr.l d0 \n\t" " clr.l d0 \n\t"
" clr.l d1 \n\t" " clr.l d1 \n\t"
" move.l d0,a0 \n\t" " move.l d0,a0 \n\t"
"1: \n\t" "cfa_setloop%=: \n\t"
" cpushl bc,(a0) | flush\n\t" " cpushl bc,(a0) | flush\n\t"
" lea 0x10(a0),a0 | index+1\n\t" " lea 0x10(a0),a0 | index+1\n\t"
" addq.l #1,d1 | index+1\n\t" " addq.l #1,d1 | index+1\n\t"
" cmpi.w #512,d1 | all sets?\n\t" " cmpi.w #512,d1 | all sets?\n\t"
" bne.s 1b | no->\n\t" " bne.s cfa_setloop%= | no->\n\t"
" clr.l d1 \n\t" " clr.l d1 \n\t"
" addq.l #1,d0 \n\t" " addq.l #1,d0 \n\t"
" move.l d0,a0 \n\t" " move.l d0,a0 \n\t"
" cmpi.w #4,d0 | all ways?\n\t" " cmpi.w #4,d0 | all ways?\n\t"
" bne.s 1b | no->\n\t" " bne.s cfa_setloop%= | no->\n\t"
/* input */ : /* input */ :
/* output */ : /* output */ :
/* clobber */ : "cc", "d0", "d1", "a0" /* clobber */ : "cc", "d0", "d1", "a0"