From 97c81061edfb1ea9cabaeeab99aafcdb18d6647b Mon Sep 17 00:00:00 2001 From: d0k3 Date: Wed, 22 Jun 2016 23:51:52 +0200 Subject: [PATCH] Fix SD writes --- payload_stage2/source/fatfs/diskio.c | 11 +- payload_stage2/source/fatfs/sdmmc/delay.h | 9 - payload_stage2/source/fatfs/sdmmc/delay.s | 28 +- payload_stage2/source/fatfs/sdmmc/sdmmc.c | 911 ++++++++++++++-------- payload_stage2/source/fatfs/sdmmc/sdmmc.h | 206 +++-- 5 files changed, 733 insertions(+), 432 deletions(-) delete mode 100644 payload_stage2/source/fatfs/sdmmc/delay.h diff --git a/payload_stage2/source/fatfs/diskio.c b/payload_stage2/source/fatfs/diskio.c index 1008bfb..613550e 100644 --- a/payload_stage2/source/fatfs/diskio.c +++ b/payload_stage2/source/fatfs/diskio.c @@ -89,15 +89,16 @@ DRESULT disk_read ( DRESULT disk_write ( __attribute__((unused)) BYTE pdrv, /* Physical drive nmuber to identify the drive */ - __attribute__((unused)) - const BYTE *buff, /* Data to be written */ - __attribute__((unused)) + const BYTE *buff, /* Data to be written */ DWORD sector, /* Sector address in LBA */ - __attribute__((unused)) UINT count /* Number of sectors to write */ ) { - return RES_OK; + if (sdmmc_sdcard_writesectors(sector, count, (BYTE *)buff)) { + return RES_PARERR; + } + + return RES_OK; } #endif diff --git a/payload_stage2/source/fatfs/sdmmc/delay.h b/payload_stage2/source/fatfs/sdmmc/delay.h deleted file mode 100644 index afad438..0000000 --- a/payload_stage2/source/fatfs/sdmmc/delay.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2014 Normmatt -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include "common.h" - -void ioDelay(u32 us); diff --git a/payload_stage2/source/fatfs/sdmmc/delay.s b/payload_stage2/source/fatfs/sdmmc/delay.s index b3baccd..3a2cfdf 100644 --- a/payload_stage2/source/fatfs/sdmmc/delay.s +++ b/payload_stage2/source/fatfs/sdmmc/delay.s @@ -1,17 +1,15 @@ -// Copyright 2014 Normmatt -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - .arm -.global ioDelay -.type ioDelay STT_FUNC +.global waitcycles +.type waitcycles STT_FUNC -@ioDelay ( u32 us ) -ioDelay: - ldr r1, =0x18000000 @ VRAM -1: - @ Loop doing uncached reads from VRAM to make loop timing more reliable - ldr r2, [r1] - subs r0, #1 - bgt 1b - bx lr +@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} diff --git a/payload_stage2/source/fatfs/sdmmc/sdmmc.c b/payload_stage2/source/fatfs/sdmmc/sdmmc.c index 1c0f74a..dbf353e 100644 --- a/payload_stage2/source/fatfs/sdmmc/sdmmc.c +++ b/payload_stage2/source/fatfs/sdmmc/sdmmc.c @@ -1,384 +1,637 @@ -// Copyright 2014 Normmatt -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright (c) 2014, Normmatt + * + * Alternatively, the contents of this file may be used under the terms + * of the GNU General Public License Version 2, as described below: + * + * This file is free software: you may copy, redistribute and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 2 of the License, or (at your + * option) any later version. + * + * This file is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "sdmmc.h" -#include "delay.h" +//#include "DrawCharacter.h" -struct mmcdevice handleNAND; -struct mmcdevice handleSD; +//Uncomment to enable 32bit fifo support? +//not currently working +//#define DATA32_SUPPORT -static inline u16 sdmmc_read16(u16 reg) { - return *(vu16*)(SDMMC_BASE + reg); -} +#define TRUE 1 +#define FALSE 0 -static inline void sdmmc_write16(u16 reg, u16 val) { - *(vu16*)(SDMMC_BASE + reg) = val; -} +#define bool int -static inline u32 sdmmc_read32(u16 reg) { - return *(vu32*)(SDMMC_BASE + reg); -} +#define NO_INLINE __attribute__ ((noinline)) -static inline void sdmmc_write32(u16 reg, u32 val) { - *(vu32*)(SDMMC_BASE + reg) = val; -} +#define RGB(r,g,b) (r<<24|b<<16|g<<8|r) -static inline void sdmmc_mask16(u16 reg, const u16 clear, const u16 set) { - u16 val = sdmmc_read16(reg); - val &= ~clear; - val |= set; - sdmmc_write16(reg, val); -} +#ifdef __cplusplus +extern "C" { +#endif + void waitcycles(uint32_t val); +#ifdef __cplusplus +}; +#endif -static inline void setckl(u32 data) -{ - sdmmc_mask16(REG_SDCLKCTL, 0x100, 0); - sdmmc_mask16(REG_SDCLKCTL, 0x2FF, data & 0x2FF); - sdmmc_mask16(REG_SDCLKCTL, 0x0, 0x100); -} +//#define DEBUG_SDMMC + +#ifdef DEBUG_SDMMC + extern uint8_t* topScreen; + extern void DrawHexWithName(unsigned char *screen, const char *str, unsigned int hex, int x, int y, int color, int bgcolor); + #define DEBUGPRINT(scr,str,hex,x,y,color,bg) DrawHexWithName(scr,str,hex,x,y,color,bg) +#else + #define DEBUGPRINT(...) +#endif +//extern "C" void sdmmc_send_command(struct mmcdevice *ctx, uint32_t cmd, uint32_t args); +//extern "C" void inittarget(struct mmcdevice *ctx); +//extern "C" int SD_Init(); +//extern "C" int SD_Init2(); +//extern "C" int Nand_Init2(); +//extern "C" void InitSD(); + +struct mmcdevice handelNAND; +struct mmcdevice handelSD; mmcdevice *getMMCDevice(int drive) { - if(drive==0) return &handleNAND; - return &handleSD; + if(drive==0) return &handelNAND; + return &handelSD; } -static u32 __attribute__((noinline)) geterror(struct mmcdevice *ctx) +int geterror(struct mmcdevice *ctx) { - return (ctx->error << 29) >> 31; + return (ctx->error << 29) >> 31; } -static void __attribute__((noinline)) inittarget(struct mmcdevice *ctx) -{ - sdmmc_mask16(REG_SDPORTSEL,0x3,(u16)ctx->devicenumber); - setckl(ctx->clk); - if (ctx->SDOPT == 0) { - sdmmc_mask16(REG_SDOPT, 0, 0x8000); - } else { - sdmmc_mask16(REG_SDOPT, 0x8000, 0); - } +void inittarget(struct mmcdevice *ctx) +{ + sdmmc_mask16(REG_SDPORTSEL,0x3,(uint16_t)ctx->devicenumber); + setckl(ctx->clk); + if(ctx->SDOPT == 0) + { + sdmmc_mask16(REG_SDOPT,0,0x8000); + } + else + { + sdmmc_mask16(REG_SDOPT,0x8000,0); + } + } -static void __attribute__((noinline)) sdmmc_send_command(struct mmcdevice *ctx, u32 cmd, u32 args) + +void NO_INLINE sdmmc_send_command(struct mmcdevice *ctx, uint32_t cmd, uint32_t args) { - bool getSDRESP = (cmd << 15) >> 31; - u16 flags = (cmd << 15) >> 31; - const bool readdata = cmd & 0x20000; - const bool writedata = cmd & 0x40000; - - if (readdata || writedata) - flags |= TMIO_STAT0_DATAEND; - - ctx->error = 0; - while (sdmmc_read16(REG_SDSTATUS1) & TMIO_STAT1_CMD_BUSY); //mmc working? - sdmmc_write16(REG_SDIRMASK0,0); - sdmmc_write16(REG_SDIRMASK1,0); - sdmmc_write16(REG_SDSTATUS0,0); - sdmmc_write16(REG_SDSTATUS1,0); - sdmmc_mask16(REG_SDDATACTL32,0x1800,0); - - sdmmc_write16(REG_SDCMDARG0,args &0xFFFF); - sdmmc_write16(REG_SDCMDARG1,args >> 16); - sdmmc_write16(REG_SDCMD,cmd &0xFFFF); - - u32 size = ctx->size; - vu8 *dataPtr = ctx->data; - - bool useBuf = ( NULL != dataPtr ); - - u16 status0 = 0; - while(true) { - u16 status1 = sdmmc_read16(REG_SDSTATUS1); - if (status1 & TMIO_STAT1_RXRDY) { - if (readdata && useBuf) { - sdmmc_mask16(REG_SDSTATUS1, TMIO_STAT1_RXRDY, 0); - //sdmmc_write16(REG_SDSTATUS1,~TMIO_STAT1_RXRDY); - if (size > 0x1FF) { - for(int i = 0; i<0x200; i+=2) { - u16 data = sdmmc_read16(REG_SDFIFO); - *dataPtr++ = data & 0xFF; - *dataPtr++ = data >> 8; - } - size -= 0x200; - } - } - } - - if (status1 & TMIO_STAT1_TXRQ) { - if (writedata && useBuf) { - sdmmc_mask16(REG_SDSTATUS1, TMIO_STAT1_TXRQ, 0); - //sdmmc_write16(REG_SDSTATUS1,~TMIO_STAT1_TXRQ); - if (size > 0x1FF) { - for (int i = 0; i<0x200; i+=2) { - u16 data = *dataPtr++; - data |= *dataPtr++ << 8; - sdmmc_write16(REG_SDFIFO, data); - } - size -= 0x200; - } - } - } - if (status1 & TMIO_MASK_GW) { - ctx->error |= 4; - break; - } - - if (!(status1 & TMIO_STAT1_CMD_BUSY)) { - status0 = sdmmc_read16(REG_SDSTATUS0); - if (sdmmc_read16(REG_SDSTATUS0) & TMIO_STAT0_CMDRESPEND) - ctx->error |= 0x1; - if (status0 & TMIO_STAT0_DATAEND) - ctx->error |= 0x2; - - if ((status0 & flags) == flags) - break; - } - } - ctx->stat0 = sdmmc_read16(REG_SDSTATUS0); - ctx->stat1 = sdmmc_read16(REG_SDSTATUS1); - sdmmc_write16(REG_SDSTATUS0,0); - sdmmc_write16(REG_SDSTATUS1,0); - - if (getSDRESP != 0) { - ctx->ret[0] = (u32)sdmmc_read16(REG_SDRESP0) | (u32)(sdmmc_read16(REG_SDRESP1) << 16); - ctx->ret[1] = (u32)sdmmc_read16(REG_SDRESP2) | (u32)(sdmmc_read16(REG_SDRESP3) << 16); - ctx->ret[2] = (u32)sdmmc_read16(REG_SDRESP4) | (u32)(sdmmc_read16(REG_SDRESP5) << 16); - ctx->ret[3] = (u32)sdmmc_read16(REG_SDRESP6) | (u32)(sdmmc_read16(REG_SDRESP7) << 16); - } + bool getSDRESP = (cmd << 15) >> 31; + uint16_t flags = (cmd << 15) >> 31; + const bool readdata = cmd & 0x20000; + const bool writedata = cmd & 0x40000; + + if(readdata || writedata) + { + flags |= TMIO_STAT0_DATAEND; + } + + ctx->error = 0; + while((sdmmc_read16(REG_SDSTATUS1) & TMIO_STAT1_CMD_BUSY)); //mmc working? + sdmmc_write16(REG_SDIRMASK0,0); + sdmmc_write16(REG_SDIRMASK1,0); + sdmmc_write16(REG_SDSTATUS0,0); + sdmmc_write16(REG_SDSTATUS1,0); +#ifdef DATA32_SUPPORT +// if(readdata)sdmmc_mask16(REG_DATACTL32, 0x1000, 0x800); +// if(writedata)sdmmc_mask16(REG_DATACTL32, 0x800, 0x1000); +// sdmmc_mask16(REG_DATACTL32,0x1800,2); +#else + sdmmc_mask16(REG_DATACTL32,0x1800,0); +#endif + sdmmc_write16(REG_SDCMDARG0,args &0xFFFF); + sdmmc_write16(REG_SDCMDARG1,args >> 16); + sdmmc_write16(REG_SDCMD,cmd &0xFFFF); + + uint32_t size = ctx->size; + uint16_t *dataPtr = (uint16_t*)ctx->data; +#ifdef DATA32_SUPPORT + uint32_t *dataPtr32 = (uint32_t*)ctx->data; +#endif + + bool useBuf = ( NULL != dataPtr ); +#ifdef DATA32_SUPPORT + bool useBuf32 = (useBuf && (0 == (3 & ((uint32_t)dataPtr)))); +#endif + + uint16_t status0 = 0; + while(1) + { + volatile uint16_t status1 = sdmmc_read16(REG_SDSTATUS1); +#ifdef DATA32_SUPPORT + volatile uint16_t ctl32 = sdmmc_read16(REG_DATACTL32); + if((ctl32 & 0x100)) +#else + if((status1 & TMIO_STAT1_RXRDY)) +#endif + { + if(readdata) + { + if(useBuf) + { + sdmmc_mask16(REG_SDSTATUS1, TMIO_STAT1_RXRDY, 0); + //sdmmc_write16(REG_SDSTATUS1,~TMIO_STAT1_RXRDY); + if(size > 0x1FF) + { + #ifdef DATA32_SUPPORT + if(useBuf32) + { + for(int i = 0; i<0x200; i+=4) + { + *dataPtr32++ = sdmmc_read32(REG_SDFIFO32); + } + } + else + { + #endif + for(int i = 0; i<0x200; i+=2) + { + *dataPtr++ = sdmmc_read16(REG_SDFIFO); + } + #ifdef DATA32_SUPPORT + } + #endif + size -= 0x200; + } + } + + sdmmc_mask16(REG_DATACTL32, 0x800, 0); + } + } +#ifdef DATA32_SUPPORT + if(!(ctl32 & 0x200)) +#else + if((status1 & TMIO_STAT1_TXRQ)) +#endif + { + if(writedata) + { + if(useBuf) + { + sdmmc_mask16(REG_SDSTATUS1, TMIO_STAT1_TXRQ, 0); + //sdmmc_write16(REG_SDSTATUS1,~TMIO_STAT1_TXRQ); + if(size > 0x1FF) + { + #ifdef DATA32_SUPPORT + for(int i = 0; i<0x200; i+=4) + { + sdmmc_write32(REG_SDFIFO32,*dataPtr32++); + } + #else + for(int i = 0; i<0x200; i+=2) + { + sdmmc_write16(REG_SDFIFO,*dataPtr++); + } + #endif + size -= 0x200; + } + } + + sdmmc_mask16(REG_DATACTL32, 0x1000, 0); + } + } + if(status1 & TMIO_MASK_GW) + { + ctx->error |= 4; + break; + } + + if(!(status1 & TMIO_STAT1_CMD_BUSY)) + { + status0 = sdmmc_read16(REG_SDSTATUS0); + if(sdmmc_read16(REG_SDSTATUS0) & TMIO_STAT0_CMDRESPEND) + { + ctx->error |= 0x1; + } + if(status0 & TMIO_STAT0_DATAEND) + { + ctx->error |= 0x2; + } + + if((status0 & flags) == flags) + break; + } + } + ctx->stat0 = sdmmc_read16(REG_SDSTATUS0); + ctx->stat1 = sdmmc_read16(REG_SDSTATUS1); + sdmmc_write16(REG_SDSTATUS0,0); + sdmmc_write16(REG_SDSTATUS1,0); + + if(getSDRESP != 0) + { + ctx->ret[0] = sdmmc_read16(REG_SDRESP0) | (sdmmc_read16(REG_SDRESP1) << 16); + ctx->ret[1] = sdmmc_read16(REG_SDRESP2) | (sdmmc_read16(REG_SDRESP3) << 16); + ctx->ret[2] = sdmmc_read16(REG_SDRESP4) | (sdmmc_read16(REG_SDRESP5) << 16); + ctx->ret[3] = sdmmc_read16(REG_SDRESP6) | (sdmmc_read16(REG_SDRESP7) << 16); + } } -u32 __attribute__((noinline)) sdmmc_sdcard_readsectors(u32 sector_no, u32 numsectors, vu8 *out) +int NO_INLINE sdmmc_sdcard_writesectors(uint32_t sector_no, uint32_t numsectors, uint8_t *in) { - if (handleSD.isSDHC == 0) - sector_no <<= 9; - inittarget(&handleSD); - sdmmc_write16(REG_SDSTOP,0x100); - - sdmmc_write16(REG_SDBLKCOUNT,numsectors); - handleSD.data = out; - handleSD.size = numsectors << 9; - sdmmc_send_command(&handleSD,0x33C12,sector_no); - return geterror(&handleSD); + if(handelSD.isSDHC == 0) sector_no <<= 9; + inittarget(&handelSD); + sdmmc_write16(REG_SDSTOP,0x100); +#ifdef DATA32_SUPPORT + sdmmc_write16(REG_SDBLKCOUNT32,numsectors); + sdmmc_write16(REG_SDBLKLEN32,0x200); +#endif + sdmmc_write16(REG_SDBLKCOUNT,numsectors); + handelSD.data = in; + handelSD.size = numsectors << 9; + sdmmc_send_command(&handelSD,0x52C19,sector_no); + return geterror(&handelSD); } -u32 __attribute__((noinline)) sdmmc_nand_readsectors(u32 sector_no, u32 numsectors, vu8 *out) +int NO_INLINE sdmmc_sdcard_readsectors(uint32_t sector_no, uint32_t numsectors, uint8_t *out) { - if (handleNAND.isSDHC == 0) - sector_no <<= 9; - inittarget(&handleNAND); - sdmmc_write16(REG_SDSTOP,0x100); - - sdmmc_write16(REG_SDBLKCOUNT,numsectors); - - handleNAND.data = out; - handleNAND.size = numsectors << 9; - sdmmc_send_command(&handleNAND,0x33C12,sector_no); - inittarget(&handleSD); - return geterror(&handleNAND); + if(handelSD.isSDHC == 0) sector_no <<= 9; + inittarget(&handelSD); + sdmmc_write16(REG_SDSTOP,0x100); +#ifdef DATA32_SUPPORT + sdmmc_write16(REG_SDBLKCOUNT32,numsectors); + sdmmc_write16(REG_SDBLKLEN32,0x200); +#endif + sdmmc_write16(REG_SDBLKCOUNT,numsectors); + handelSD.data = out; + handelSD.size = numsectors << 9; + sdmmc_send_command(&handelSD,0x33C12,sector_no); + return geterror(&handelSD); } -static u32 calcSDSize(u8* csd, int type) + + +int NO_INLINE sdmmc_nand_readsectors(uint32_t sector_no, uint32_t numsectors, uint8_t *out) { - u32 result = 0; - if (type == -1) type = csd[14] >> 6; - switch (type) { - case 0: - { - u32 block_len = csd[9] & 0xf; - block_len = 1u << block_len; - u32 mult = (u32)(csd[4] >> 7) | (u32)((csd[5] & 3) << 1); - mult = 1u << (mult + 2); - result = csd[8] & 3; - result = (result << 8) | csd[7]; - result = (result << 2) | (csd[6] >> 6); - result = (result + 1) * mult * block_len / 512; - } - break; - case 1: - result = csd[7] & 0x3f; - result = (result << 8) | csd[6]; - result = (result << 8) | csd[5]; - result = (result + 1) * 1024; - break; - default: - break; //Do nothing otherwise - } - return result; + if(handelNAND.isSDHC == 0) sector_no <<= 9; + inittarget(&handelNAND); + sdmmc_write16(REG_SDSTOP,0x100); +#ifdef DATA32_SUPPORT + sdmmc_write16(REG_SDBLKCOUNT32,numsectors); + sdmmc_write16(REG_SDBLKLEN32,0x200); +#endif + sdmmc_write16(REG_SDBLKCOUNT,numsectors); + handelNAND.data = out; + handelNAND.size = numsectors << 9; + sdmmc_send_command(&handelNAND,0x33C12,sector_no); + inittarget(&handelSD); + return geterror(&handelNAND); } -static void InitSD() +int NO_INLINE sdmmc_nand_writesectors(uint32_t sector_no, uint32_t numsectors, uint8_t *in) //experimental { - //NAND - handleNAND.isSDHC = 0; - handleNAND.SDOPT = 0; - handleNAND.res = 0; - handleNAND.initarg = 1; - handleNAND.clk = 0x80; - handleNAND.devicenumber = 1; - - //SD - handleSD.isSDHC = 0; - handleSD.SDOPT = 0; - handleSD.res = 0; - handleSD.initarg = 0; - handleSD.clk = 0x80; - handleSD.devicenumber = 0; - - *(vu16*)0x10006100 &= 0xF7FFu; //SDDATACTL32 - *(vu16*)0x10006100 &= 0xEFFFu; //SDDATACTL32 - *(vu16*)0x10006100 |= 0x402u; //SDDATACTL32 - *(vu16*)0x100060D8 = (*(vu16*)0x100060D8 & 0xFFDD) | 2; - *(vu16*)0x10006100 &= 0xFFFDu; //SDDATACTL32 - *(vu16*)0x100060D8 &= 0xFFDDu; //SDDATACTL - *(vu16*)0x10006104 = 0; //SDBLKLEN32 - *(vu16*)0x10006108 = 1; //SDBLKCOUNT32 - *(vu16*)0x100060E0 &= 0xFFFEu; //SDRESET - *(vu16*)0x100060E0 |= 1u; //SDRESET - *(vu16*)0x10006020 |= TMIO_MASK_ALL; //SDIR_MASK0 - *(vu16*)0x10006022 |= TMIO_MASK_ALL>>16; //SDIR_MASK1 - *(vu16*)0x100060FC |= 0xDBu; //SDCTL_RESERVED7 - *(vu16*)0x100060FE |= 0xDBu; //SDCTL_RESERVED8 - *(vu16*)0x10006002 &= 0xFFFCu; //SDPORTSEL - *(vu16*)0x10006024 = 0x40; //Nintendo sets this to 0x20 - *(vu16*)0x10006028 = 0x40EB; //Nintendo sets this to 0x40EE - *(vu16*)0x10006002 &= 0xFFFCu; ////SDPORTSEL - *(vu16*)0x10006026 = 512; //SDBLKLEN - *(vu16*)0x10006008 = 0; //SDSTOP - - inittarget(&handleSD); + if(handelNAND.isSDHC == 0) sector_no <<= 9; + inittarget(&handelNAND); + sdmmc_write16(REG_SDSTOP,0x100); +#ifdef DATA32_SUPPORT + sdmmc_write16(REG_SDBLKCOUNT32,numsectors); + sdmmc_write16(REG_SDBLKLEN32,0x200); +#endif + sdmmc_write16(REG_SDBLKCOUNT,numsectors); + handelNAND.data = in; + handelNAND.size = numsectors << 9; + sdmmc_send_command(&handelNAND,0x52C19,sector_no); + inittarget(&handelSD); + return geterror(&handelNAND); } -static int Nand_Init() +static uint32_t calcSDSize(uint8_t* csd, int type) { - inittarget(&handleNAND); - ioDelay(0xF000); - - sdmmc_send_command(&handleNAND,0,0); - - do { - do { - sdmmc_send_command(&handleNAND,0x10701,0x100000); - } while ( !(handleNAND.error & 1) ); - } while((handleNAND.ret[0] & 0x80000000) == 0); - - sdmmc_send_command(&handleNAND,0x10602,0x0); - if (handleNAND.error & 0x4) return -1; - - sdmmc_send_command(&handleNAND,0x10403,handleNAND.initarg << 0x10); - if (handleNAND.error & 0x4) return -1; - - sdmmc_send_command(&handleNAND,0x10609,handleNAND.initarg << 0x10); - if (handleNAND.error & 0x4) return -1; - - handleNAND.total_size = calcSDSize((u8*)&handleNAND.ret[0],0); - handleNAND.clk = 1; - setckl(1); - - sdmmc_send_command(&handleNAND,0x10407,handleNAND.initarg << 0x10); - if (handleNAND.error & 0x4) return -1; - - handleNAND.SDOPT = 1; - - sdmmc_send_command(&handleNAND,0x10506,0x3B70100); - if (handleNAND.error & 0x4) return -1; - - sdmmc_send_command(&handleNAND,0x10506,0x3B90100); - if (handleNAND.error & 0x4) return -1; - - sdmmc_send_command(&handleNAND,0x1040D,handleNAND.initarg << 0x10); - if (handleNAND.error & 0x4) return -1; - - sdmmc_send_command(&handleNAND,0x10410,0x200); - if (handleNAND.error & 0x4) return -1; - - handleNAND.clk |= 0x200; - - inittarget(&handleSD); + uint32_t result=0; + if(type == -1) type = csd[14] >> 6; + switch(type) + { + case 0: + { + uint32_t block_len=csd[9]&0xf; + block_len=1<>7)|((csd[5]&3)<<1); + mult=1<<(mult+2); + result=csd[8]&3; + result=(result<<8)|csd[7]; + result=(result<<2)|(csd[6]>>6); + result=(result+1)*mult*block_len/512; + } + break; + case 1: + result=csd[7]&0x3f; + result=(result<<8)|csd[6]; + result=(result<<8)|csd[5]; + result=(result+1)*1024; + break; + } + return result; +} - return 0; +void InitSD() +{ + //NAND + handelNAND.isSDHC = 0; + handelNAND.SDOPT = 0; + handelNAND.res = 0; + handelNAND.initarg = 1; + handelNAND.clk = 0x80; + handelNAND.devicenumber = 1; + + //SD + handelSD.isSDHC = 0; + handelSD.SDOPT = 0; + handelSD.res = 0; + handelSD.initarg = 0; + handelSD.clk = 0x80; + handelSD.devicenumber = 0; + + //sdmmc_mask16(0x100,0x800,0); + //sdmmc_mask16(0x100,0x1000,0); + //sdmmc_mask16(0x100,0x0,0x402); + //sdmmc_mask16(0xD8,0x22,0x2); + //sdmmc_mask16(0x100,0x2,0); + //sdmmc_mask16(0xD8,0x22,0); + //sdmmc_write16(0x104,0); + //sdmmc_write16(0x108,1); + //sdmmc_mask16(REG_SDRESET,1,0); //not in new Version -- nintendo's code does this + //sdmmc_mask16(REG_SDRESET,0,1); //not in new Version -- nintendo's code does this + //sdmmc_mask16(0x20,0,0x31D); + //sdmmc_mask16(0x22,0,0x837F); + //sdmmc_mask16(0xFC,0,0xDB); + //sdmmc_mask16(0xFE,0,0xDB); + ////sdmmc_write16(REG_SDCLKCTL,0x20); + ////sdmmc_write16(REG_SDOPT,0x40EE); + ////sdmmc_mask16(0x02,0x3,0); + //sdmmc_write16(REG_SDCLKCTL,0x40); + //sdmmc_write16(REG_SDOPT,0x40EB); + //sdmmc_mask16(0x02,0x3,0); + //sdmmc_write16(REG_SDBLKLEN,0x200); + //sdmmc_write16(REG_SDSTOP,0); + + *(volatile uint16_t*)0x10006100 &= 0xF7FFu; //SDDATACTL32 + *(volatile uint16_t*)0x10006100 &= 0xEFFFu; //SDDATACTL32 +#ifdef DATA32_SUPPORT + *(volatile uint16_t*)0x10006100 |= 0x402u; //SDDATACTL32 +#else + *(volatile uint16_t*)0x10006100 |= 0x402u; //SDDATACTL32 +#endif + *(volatile uint16_t*)0x100060D8 = (*(volatile uint16_t*)0x100060D8 & 0xFFDD) | 2; +#ifdef DATA32_SUPPORT + *(volatile uint16_t*)0x10006100 &= 0xFFFFu; //SDDATACTL32 + *(volatile uint16_t*)0x100060D8 &= 0xFFDFu; //SDDATACTL + *(volatile uint16_t*)0x10006104 = 512; //SDBLKLEN32 +#else + *(volatile uint16_t*)0x10006100 &= 0xFFFDu; //SDDATACTL32 + *(volatile uint16_t*)0x100060D8 &= 0xFFDDu; //SDDATACTL + *(volatile uint16_t*)0x10006104 = 0; //SDBLKLEN32 +#endif + *(volatile uint16_t*)0x10006108 = 1; //SDBLKCOUNT32 + *(volatile uint16_t*)0x100060E0 &= 0xFFFEu; //SDRESET + *(volatile uint16_t*)0x100060E0 |= 1u; //SDRESET + *(volatile uint16_t*)0x10006020 |= TMIO_MASK_ALL; //SDIR_MASK0 + *(volatile uint16_t*)0x10006022 |= TMIO_MASK_ALL>>16; //SDIR_MASK1 + *(volatile uint16_t*)0x100060FC |= 0xDBu; //SDCTL_RESERVED7 + *(volatile uint16_t*)0x100060FE |= 0xDBu; //SDCTL_RESERVED8 + *(volatile uint16_t*)0x10006002 &= 0xFFFCu; //SDPORTSEL +#ifdef DATA32_SUPPORT + *(volatile uint16_t*)0x10006024 = 0x20; + *(volatile uint16_t*)0x10006028 = 0x40EE; +#else + *(volatile uint16_t*)0x10006024 = 0x40; //Nintendo sets this to 0x20 + *(volatile uint16_t*)0x10006028 = 0x40EB; //Nintendo sets this to 0x40EE +#endif + *(volatile uint16_t*)0x10006002 &= 0xFFFCu; ////SDPORTSEL + *(volatile uint16_t*)0x10006026 = 512; //SDBLKLEN + *(volatile uint16_t*)0x10006008 = 0; //SDSTOP + + inittarget(&handelSD); } -static int SD_Init() +int Nand_Init() { - inittarget(&handleSD); + inittarget(&handelNAND); + waitcycles(0xF000); + + DEBUGPRINT(topScreen, "0x00000 ", handelNAND.error, 10, 20 + 13*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelNAND,0,0); + + DEBUGPRINT(topScreen, "0x10701 ", handelNAND.error, 10, 20 + 13*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + do + { + do + { + sdmmc_send_command(&handelNAND,0x10701,0x100000); + DEBUGPRINT(topScreen, "error ", handelNAND.error, 10, 20 + 17*8, RGB(40, 40, 40), RGB(208, 208, 208)); + DEBUGPRINT(topScreen, "ret: ", handelNAND.ret[0], 10, 20 + 18*8, RGB(40, 40, 40), RGB(208, 208, 208)); + DEBUGPRINT(topScreen, "test ", 3, 10, 20 + 19*8, RGB(40, 40, 40), RGB(208, 208, 208)); + } while ( !(handelNAND.error & 1) ); + } + while((handelNAND.ret[0] & 0x80000000) == 0); + + DEBUGPRINT(topScreen, "0x10602 ", handelNAND.error, 10, 20 + 13*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelNAND,0x10602,0x0); + if((handelNAND.error & 0x4))return -1; + + DEBUGPRINT(topScreen, "0x10403 ", handelNAND.error, 10, 20 + 13*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelNAND,0x10403,handelNAND.initarg << 0x10); + if((handelNAND.error & 0x4))return -1; + + DEBUGPRINT(topScreen, "0x10609 ", handelNAND.error, 10, 20 + 13*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelNAND,0x10609,handelNAND.initarg << 0x10); + if((handelNAND.error & 0x4))return -1; + + DEBUGPRINT(topScreen, "0x10407 ", handelNAND.error, 10, 20 + 13*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + handelNAND.total_size = calcSDSize((uint8_t*)&handelNAND.ret[0],0); + handelNAND.clk = 1; + setckl(1); + + sdmmc_send_command(&handelNAND,0x10407,handelNAND.initarg << 0x10); + if((handelNAND.error & 0x4))return -1; + + DEBUGPRINT(topScreen, "0x10506 ", handelNAND.error, 10, 20 + 13*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + handelNAND.SDOPT = 1; + + sdmmc_send_command(&handelNAND,0x10506,0x3B70100); + if((handelNAND.error & 0x4))return -1; + + DEBUGPRINT(topScreen, "0x10506 ", handelNAND.error, 10, 20 + 13*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelNAND,0x10506,0x3B90100); + if((handelNAND.error & 0x4))return -1; + + DEBUGPRINT(topScreen, "0x1040D ", handelNAND.error, 10, 20 + 13*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelNAND,0x1040D,handelNAND.initarg << 0x10); + if((handelNAND.error & 0x4))return -1; + + DEBUGPRINT(topScreen, "0x10410 ", handelNAND.error, 10, 20 + 13*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelNAND,0x10410,0x200); + if((handelNAND.error & 0x4))return -1; + + handelNAND.clk |= 0x200; + + inittarget(&handelSD); + + return 0; +} - ioDelay(1u << 18); //Card needs a little bit of time to be detected, it seems +int SD_Init() +{ + inittarget(&handelSD); + //waitcycles(0x3E8); + //waitcycles(0xF000); - //If not inserted - if (!(*((vu16*)0x1000601c) & TMIO_STAT0_SIGSTATE)) return -1; + waitcycles(1u << 19); //Card needs a little bit of time to be detected, it seems + if (!(*((volatile uint16_t*)0x1000601c) & TMIO_STAT0_SIGSTATE)) return -1; // check if card inserted - sdmmc_send_command(&handleSD,0,0); - sdmmc_send_command(&handleSD,0x10408,0x1AA); - //u32 temp = (handleSD.ret[0] == 0x1AA) << 0x1E; - u32 temp = (handleSD.error & 0x1) << 0x1E; - - //int count = 0; - u32 temp2 = 0; - do { - do { - sdmmc_send_command(&handleSD,0x10437,handleSD.initarg << 0x10); - sdmmc_send_command(&handleSD,0x10769,0x00FF8000 | temp); - temp2 = 1; - } while ( !(handleSD.error & 1) ); - - } while((handleSD.ret[0] & 0x80000000) == 0); - - if(!((handleSD.ret[0] >> 30) & 1) || !temp) - temp2 = 0; - - handleSD.isSDHC = temp2; - - sdmmc_send_command(&handleSD,0x10602,0); - if (handleSD.error & 0x4) return -1; - - sdmmc_send_command(&handleSD,0x10403,0); - if (handleSD.error & 0x4) return -1; - handleSD.initarg = handleSD.ret[0] >> 0x10; - - sdmmc_send_command(&handleSD,0x10609,handleSD.initarg << 0x10); - if (handleSD.error & 0x4) return -1; - - handleSD.total_size = calcSDSize((u8*)&handleSD.ret[0],-1); - handleSD.clk = 1; - setckl(1); - - sdmmc_send_command(&handleSD,0x10507,handleSD.initarg << 0x10); - if (handleSD.error & 0x4) return -1; - - sdmmc_send_command(&handleSD,0x10437,handleSD.initarg << 0x10); - if (handleSD.error & 0x4) return -1; - - handleSD.SDOPT = 1; - sdmmc_send_command(&handleSD,0x10446,0x2); - if (handleSD.error & 0x4) return -1; - - sdmmc_send_command(&handleSD,0x1040D,handleSD.initarg << 0x10); - if (handleSD.error & 0x4) return -1; - - sdmmc_send_command(&handleSD,0x10410,0x200); - if (handleSD.error & 0x4) return -1; - handleSD.clk |= 0x200; + DEBUGPRINT(topScreen, "0x00000 ", handelSD.error, 10, 20 + 14*8, RGB(40, 40, 40), RGB(208, 208, 208)); + sdmmc_send_command(&handelSD,0,0); + DEBUGPRINT(topScreen, "0x10408 ", handelSD.error, 10, 20 + 14*8, RGB(40, 40, 40), RGB(208, 208, 208)); + sdmmc_send_command(&handelSD,0x10408,0x1AA); + //uint32_t temp = (handelSD.ret[0] == 0x1AA) << 0x1E; + uint32_t temp = (handelSD.error & 0x1) << 0x1E; + + DEBUGPRINT(topScreen, "0x10769 ", handelSD.error, 10, 20 + 14*8, RGB(40, 40, 40), RGB(208, 208, 208)); + DEBUGPRINT(topScreen, "sd ret: ", handelSD.ret[0], 10, 20 + 15*8, RGB(40, 40, 40), RGB(208, 208, 208)); + DEBUGPRINT(topScreen, "temp: ", temp, 10, 20 + 16*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + //int count = 0; + uint32_t temp2 = 0; + do + { + do + { + sdmmc_send_command(&handelSD,0x10437,handelSD.initarg << 0x10); + sdmmc_send_command(&handelSD,0x10769,0x00FF8000 | temp); + temp2 = 1; + } while ( !(handelSD.error & 1) ); + + //DEBUGPRINT(topScreen, "sd error ", handelSD.error, 10, 20 + 17*8, RGB(40, 40, 40), RGB(208, 208, 208)); + //DEBUGPRINT(topScreen, "sd ret: ", handelSD.ret[0], 10, 20 + 18*8, RGB(40, 40, 40), RGB(208, 208, 208)); + //DEBUGPRINT(topScreen, "count: ", count++, 10, 20 + 19*8, RGB(40, 40, 40), RGB(208, 208, 208)); + } + while((handelSD.ret[0] & 0x80000000) == 0); + //do + //{ + // sdmmc_send_command(&handelSD,0x10437,handelSD.initarg << 0x10); + // sdmmc_send_command(&handelSD,0x10769,0x00FF8000 | temp); + // + // DEBUGPRINT(topScreen, "sd error ", handelSD.error, 10, 20 + 17*8, RGB(40, 40, 40), RGB(208, 208, 208)); + // DEBUGPRINT(topScreen, "sd ret: ", handelSD.ret[0], 10, 20 + 18*8, RGB(40, 40, 40), RGB(208, 208, 208)); + // DEBUGPRINT(topScreen, "count: ", count++, 10, 20 + 19*8, RGB(40, 40, 40), RGB(208, 208, 208)); + //} + //while(!(handelSD.ret[0] & 0x80000000)); + + if(!((handelSD.ret[0] >> 30) & 1) || !temp) + temp2 = 0; + + handelSD.isSDHC = temp2; + //handelSD.isSDHC = (handelSD.ret[0] & 0x40000000); + + DEBUGPRINT(topScreen, "0x10602 ", handelSD.error, 10, 20 + 14*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelSD,0x10602,0); + if((handelSD.error & 0x4)) return -1; + + DEBUGPRINT(topScreen, "0x10403 ", handelSD.error, 10, 20 + 14*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelSD,0x10403,0); + if((handelSD.error & 0x4)) return -1; + handelSD.initarg = handelSD.ret[0] >> 0x10; + + DEBUGPRINT(topScreen, "0x10609 ", handelSD.error, 10, 20 + 14*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelSD,0x10609,handelSD.initarg << 0x10); + if((handelSD.error & 0x4)) return -1; + + handelSD.total_size = calcSDSize((uint8_t*)&handelSD.ret[0],-1); + handelSD.clk = 1; + setckl(1); + + DEBUGPRINT(topScreen, "0x10507 ", handelSD.error, 10, 20 + 14*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelSD,0x10507,handelSD.initarg << 0x10); + if((handelSD.error & 0x4)) return -1; - return 0; + DEBUGPRINT(topScreen, "0x10437 ", handelSD.error, 10, 20 + 14*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelSD,0x10437,handelSD.initarg << 0x10); + if((handelSD.error & 0x4)) return -1; + + DEBUGPRINT(topScreen, "0x10446 ", handelSD.error, 10, 20 + 14*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + handelSD.SDOPT = 1; + sdmmc_send_command(&handelSD,0x10446,0x2); + if((handelSD.error & 0x4)) return -1; + + DEBUGPRINT(topScreen, "0x1040D ", handelSD.error, 10, 20 + 14*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelSD,0x1040D,handelSD.initarg << 0x10); + if((handelSD.error & 0x4)) return -1; + + DEBUGPRINT(topScreen, "0x10410 ", handelSD.error, 10, 20 + 14*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + sdmmc_send_command(&handelSD,0x10410,0x200); + if((handelSD.error & 0x4)) return -1; + handelSD.clk |= 0x200; + + return 0; } -void sdmmc_sdcard_init() +int sdmmc_sdcard_init() { - InitSD(); - Nand_Init(); - SD_Init(); + DEBUGPRINT(topScreen, "sdmmc_sdcard_init ", handelSD.error, 10, 20 + 2*8, RGB(40, 40, 40), RGB(208, 208, 208)); + InitSD(); + //SD_Init2(); + //Nand_Init(); + Nand_Init(); + DEBUGPRINT(topScreen, "nand_res ", nand_res, 10, 20 + 3*8, RGB(40, 40, 40), RGB(208, 208, 208)); + if (SD_Init() != 0) return FALSE; + DEBUGPRINT(topScreen, "sd_res ", sd_res, 10, 20 + 4*8, RGB(40, 40, 40), RGB(208, 208, 208)); + + return TRUE; } -int sdmmc_get_cid(int isNand, uint32_t *info) +int sdmmc_get_cid( int isNand, uint32_t *info) { struct mmcdevice *device; if(isNand) - device = &handleNAND; + device = &handelNAND; else - device = &handleSD; + device = &handelSD; inittarget(device); // use cmd7 to put sd card in standby mode @@ -408,8 +661,8 @@ int sdmmc_get_cid(int isNand, uint32_t *info) if(isNand) { - inittarget(&handleSD); + inittarget(&handelSD); } return 0; -} \ No newline at end of file +} diff --git a/payload_stage2/source/fatfs/sdmmc/sdmmc.h b/payload_stage2/source/fatfs/sdmmc/sdmmc.h index 02f1032..e440bdf 100644 --- a/payload_stage2/source/fatfs/sdmmc/sdmmc.h +++ b/payload_stage2/source/fatfs/sdmmc/sdmmc.h @@ -1,52 +1,52 @@ -// Copyright 2014 Normmatt -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include "common.h" - -#define SDMMC_BASE 0x10006000u - -#define REG_SDCMD 0x00 -#define REG_SDPORTSEL 0x02 -#define REG_SDCMDARG 0x04 -#define REG_SDCMDARG0 0x04 -#define REG_SDCMDARG1 0x06 -#define REG_SDSTOP 0x08 -#define REG_SDBLKCOUNT 0x0a - -#define REG_SDRESP0 0x0c -#define REG_SDRESP1 0x0e -#define REG_SDRESP2 0x10 -#define REG_SDRESP3 0x12 -#define REG_SDRESP4 0x14 -#define REG_SDRESP5 0x16 -#define REG_SDRESP6 0x18 -#define REG_SDRESP7 0x1a - -#define REG_SDSTATUS0 0x1c -#define REG_SDSTATUS1 0x1e - -#define REG_SDIRMASK0 0x20 -#define REG_SDIRMASK1 0x22 -#define REG_SDCLKCTL 0x24 - -#define REG_SDBLKLEN 0x26 -#define REG_SDOPT 0x28 -#define REG_SDFIFO 0x30 - -#define REG_SDDATACTL 0xd8 -#define REG_SDRESET 0xe0 -#define REG_SDPROTECTED 0xf6 //bit 0 determines if sd is protected or not? - -#define REG_SDDATACTL32 0x100 -#define REG_SDBLKLEN32 0x104 -#define REG_SDBLKCOUNT32 0x108 -#define REG_SDFIFO32 0x10C - -#define REG_CLK_AND_WAIT_CTL 0x138 -#define REG_RESET_SDIO 0x1e0 +#ifndef __SDMMC_H__ +#define __SDMMC_H__ + +#define TRUE 1 +#define FALSE 0 + +#include + +#define SDMMC_BASE 0x10006000 + +#define REG_SDCMD 0x00 +#define REG_SDPORTSEL 0x02 +#define REG_SDCMDARG 0x04 +#define REG_SDCMDARG0 0x04 +#define REG_SDCMDARG1 0x06 +#define REG_SDSTOP 0x08 +#define REG_SDBLKCOUNT 0x0a + +#define REG_SDRESP0 0x0c +#define REG_SDRESP1 0x0e +#define REG_SDRESP2 0x10 +#define REG_SDRESP3 0x12 +#define REG_SDRESP4 0x14 +#define REG_SDRESP5 0x16 +#define REG_SDRESP6 0x18 +#define REG_SDRESP7 0x1a + +#define REG_SDSTATUS0 0x1c +#define REG_SDSTATUS1 0x1e + +#define REG_SDIRMASK0 0x20 +#define REG_SDIRMASK1 0x22 +#define REG_SDCLKCTL 0x24 + +#define REG_SDBLKLEN 0x26 +#define REG_SDOPT 0x28 +#define REG_SDFIFO 0x30 + +#define REG_DATACTL 0xd8 +#define REG_SDRESET 0xe0 +#define REG_SDPROTECTED 0xf6 //bit 0 determines if sd is protected or not? + +#define REG_DATACTL32 0x100 +#define REG_SDBLKLEN32 0x104 +#define REG_SDBLKCOUNT32 0x108 +#define REG_SDFIFO32 0x10C + +#define REG_CLK_AND_WAIT_CTL 0x138 +#define REG_RESET_SDIO 0x1e0 #define TMIO_STAT0_CMDRESPEND 0x0001 #define TMIO_STAT0_DATAEND 0x0004 @@ -97,32 +97,90 @@ #define TMIO_MASK_ALL 0x837f031d #define TMIO_MASK_GW (TMIO_STAT1_ILL_ACCESS | TMIO_STAT1_CMDTIMEOUT | TMIO_STAT1_TXUNDERRUN | TMIO_STAT1_RXOVERFLOW | \ - TMIO_STAT1_DATATIMEOUT | TMIO_STAT1_STOPBIT_ERR | TMIO_STAT1_CRCFAIL | TMIO_STAT1_CMD_IDX_ERR) + TMIO_STAT1_DATATIMEOUT | TMIO_STAT1_STOPBIT_ERR | TMIO_STAT1_CRCFAIL | TMIO_STAT1_CMD_IDX_ERR) #define TMIO_MASK_READOP (TMIO_STAT1_RXRDY | TMIO_STAT1_DATAEND) #define TMIO_MASK_WRITEOP (TMIO_STAT1_TXRQ | TMIO_STAT1_DATAEND) -typedef struct mmcdevice { - vu8* data; - u32 size; - u32 error; - u16 stat0; - u16 stat1; - u32 ret[4]; - u32 initarg; - u32 isSDHC; - u32 clk; - u32 SDOPT; - u32 devicenumber; - u32 total_size; //size in sectors of the device - u32 res; -} mmcdevice; - -mmcdevice *getMMCDevice(int drive); - -void sdmmc_sdcard_init(); -u32 sdmmc_sdcard_readsectors(u32 sector_no, u32 numsectors, vu8 *out); - -u32 sdmmc_nand_readsectors(u32 sector_no, u32 numsectors, vu8 *out); - -int sdmmc_get_cid( int isNand, uint32_t *info); \ No newline at end of file +#ifdef __cplusplus +extern "C" { +#endif + + typedef struct mmcdevice { + uint8_t* data; + uint32_t size; + uint32_t error; + uint16_t stat0; + uint16_t stat1; + uint32_t ret[4]; + uint32_t initarg; + uint32_t isSDHC; + uint32_t clk; + uint32_t SDOPT; + uint32_t devicenumber; + uint32_t total_size; //size in sectors of the device + uint32_t res; + } mmcdevice; + + int sdmmc_sdcard_init(); + int sdmmc_sdcard_readsector(uint32_t sector_no, uint8_t *out); + int sdmmc_sdcard_readsectors(uint32_t sector_no, uint32_t numsectors, uint8_t *out); + int sdmmc_sdcard_writesector(uint32_t sector_no, uint8_t *in); + int sdmmc_sdcard_writesectors(uint32_t sector_no, uint32_t numsectors, uint8_t *in); + + int sdmmc_nand_readsectors(uint32_t sector_no, uint32_t numsectors, uint8_t *out); + int sdmmc_nand_writesectors(uint32_t sector_no, uint32_t numsectors, uint8_t *in); + + int sdmmc_get_cid( int isNand, uint32_t *info); + + mmcdevice *getMMCDevice(int drive); + + void InitSD(); + int Nand_Init(); + int SD_Init(); + +#ifdef __cplusplus +}; +#endif + +//--------------------------------------------------------------------------------- +static inline uint16_t sdmmc_read16(uint16_t reg) { +//--------------------------------------------------------------------------------- + return *(volatile uint16_t*)(SDMMC_BASE + reg); +} + +//--------------------------------------------------------------------------------- +static inline void sdmmc_write16(uint16_t reg, uint16_t val) { +//--------------------------------------------------------------------------------- + *(volatile uint16_t*)(SDMMC_BASE + reg) = val; +} + +//--------------------------------------------------------------------------------- +static inline uint32_t sdmmc_read32(uint16_t reg) { +//--------------------------------------------------------------------------------- + return *(volatile uint32_t*)(SDMMC_BASE + reg); +} + +//--------------------------------------------------------------------------------- +static inline void sdmmc_write32(uint16_t reg, uint32_t val) { +//--------------------------------------------------------------------------------- + *(volatile uint32_t*)(SDMMC_BASE + reg) = val; +} + +//--------------------------------------------------------------------------------- +static inline void sdmmc_mask16(uint16_t reg, const uint16_t clear, const uint16_t set) { +//--------------------------------------------------------------------------------- + uint16_t val = sdmmc_read16(reg); + val &= ~clear; + val |= set; + sdmmc_write16(reg, val); +} + +static inline void setckl(uint32_t data) +{ + sdmmc_mask16(REG_SDCLKCTL,0x100,0); + sdmmc_mask16(REG_SDCLKCTL,0x2FF,data&0x2FF); + sdmmc_mask16(REG_SDCLKCTL,0x0,0x100); +} + +#endif