Clean-up, fixed mistake

GCC, why no u warn me of strict aliasing
This commit is contained in:
Aurora
2016-03-11 15:08:05 +01:00
parent 6707a36ffe
commit 9468582d83
22 changed files with 78 additions and 434 deletions

View File

@@ -1,15 +1,4 @@
#pragma once
#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
#define u8 uint8_t
#define u16 uint16_t
#define u32 uint32_t
#define u64 uint64_t
#define vu8 volatile u8
#define vu16 volatile u16
#define vu32 volatile u32
#define vu64 volatile u64
#include "../../types.h"

View File

@@ -4,12 +4,7 @@
@waitcycles ( u32 us )
waitcycles:
PUSH {R0-R2,LR}
STR R0, [SP,#4]
waitcycles_loop:
LDR R3, [SP,#4]
SUBS R2, R3, #1
STR R2, [SP,#4]
CMP R3, #0
BNE waitcycles_loop
POP {R0-R2,PC}
waitcycles_loop:
subs r0, #1
bgt waitcycles_loop
bx lr

View File

@@ -337,7 +337,7 @@ static int SD_Init()
{
inittarget(&handleSD);
waitcycles(1u << 19); //Card needs a little bit of time to be detected, it seems
waitcycles(1u << 18); //Card needs a little bit of time to be detected, it seems
//If not inserted
if (!(*((vu16*)0x1000601c) & TMIO_STAT0_SIGSTATE)) return -1;

View File

@@ -124,5 +124,4 @@ u32 sdmmc_sdcard_writesectors(u32 sector_no, u32 numsectors, vu8 *in);
mmcdevice *getMMCDevice(int drive);
u32 sdmmc_nand_readsectors(u32 sector_no, u32 numsectors, vu8 *out);
u32 sdmmc_nand_writesectors(u32 sector_no, u32 numsectors, vu8 *in);
u32 sdmmc_nand_writesectors(u32 sector_no, u32 numsectors, vu8 *in);