git subrepo pull --force emummc
subrepo: subdir: "emummc" merged: "2fc47cbb8" upstream: origin: "https://github.com/lulle2007200/emuMMC.git" branch: "develop" commit: "2fc47cbb8" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "30db3b8"
This commit is contained in:
72
emummc/source/emmc/nx_emmc.c
vendored
72
emummc/source/emmc/nx_emmc.c
vendored
@@ -18,6 +18,8 @@
|
||||
#include "../utils/types.h"
|
||||
#include "nx_emmc.h"
|
||||
|
||||
static u32 emmc_mode = EMMC_MMC_HS400;
|
||||
|
||||
int nx_emmc_part_read(sdmmc_storage_t *storage, emmc_part_t *part, u32 sector_off, u32 num_sectors, void *buf)
|
||||
{
|
||||
// The last LBA is inclusive.
|
||||
@@ -33,3 +35,73 @@ int nx_emmc_part_write(sdmmc_storage_t *storage, emmc_part_t *part, u32 sector_o
|
||||
return 0;
|
||||
return sdmmc_storage_write(storage, part->lba_start + sector_off, num_sectors, buf);
|
||||
}
|
||||
|
||||
int emmc_init_retry(bool power_cycle)
|
||||
{
|
||||
u32 bus_width = SDMMC_BUS_WIDTH_8;
|
||||
u32 type = SDHCI_TIMING_MMC_HS400;
|
||||
|
||||
// Power cycle SD eMMC.
|
||||
if (power_cycle)
|
||||
{
|
||||
emmc_mode--;
|
||||
nx_emmc_end();
|
||||
}
|
||||
|
||||
// Get init parameters.
|
||||
switch (emmc_mode)
|
||||
{
|
||||
case EMMC_INIT_FAIL: // Reset to max.
|
||||
return 0;
|
||||
case EMMC_1BIT_HS52:
|
||||
bus_width = SDMMC_BUS_WIDTH_1;
|
||||
type = SDHCI_TIMING_MMC_HS52;
|
||||
break;
|
||||
case EMMC_8BIT_HS52:
|
||||
type = SDHCI_TIMING_MMC_HS52;
|
||||
break;
|
||||
case EMMC_MMC_HS200:
|
||||
type = SDHCI_TIMING_MMC_HS200;
|
||||
break;
|
||||
case EMMC_MMC_HS400:
|
||||
type = SDHCI_TIMING_MMC_HS400;
|
||||
break;
|
||||
default:
|
||||
emmc_mode = EMMC_MMC_HS400;
|
||||
}
|
||||
|
||||
return sdmmc_storage_init_mmc(&emmc_storage, &emmc_sdmmc, bus_width, type);
|
||||
}
|
||||
|
||||
void nx_emmc_end() { sdmmc_storage_end(&emmc_storage); }
|
||||
|
||||
bool nx_emmc_initialize(bool power_cycle)
|
||||
{
|
||||
// Reset mode in case of previous failure.
|
||||
if (emmc_mode == EMMC_INIT_FAIL)
|
||||
emmc_mode = EMMC_MMC_HS400;
|
||||
|
||||
if (power_cycle)
|
||||
nx_emmc_end();
|
||||
|
||||
int res = !emmc_init_retry(false);
|
||||
|
||||
while (true)
|
||||
{
|
||||
if (!res)
|
||||
return true;
|
||||
else
|
||||
{
|
||||
if (emmc_mode == EMMC_INIT_FAIL)
|
||||
break;
|
||||
else
|
||||
res = !emmc_init_retry(true);
|
||||
}
|
||||
}
|
||||
|
||||
nx_emmc_end();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
int nx_emmc_set_partition(u32 partition) { return sdmmc_storage_set_mmc_partition(&emmc_storage, partition); }
|
||||
|
||||
17
emummc/source/emmc/nx_emmc.h
vendored
17
emummc/source/emmc/nx_emmc.h
vendored
@@ -20,6 +20,15 @@
|
||||
#include "../utils/types.h"
|
||||
#include "sdmmc.h"
|
||||
|
||||
enum
|
||||
{
|
||||
EMMC_INIT_FAIL = 0,
|
||||
EMMC_1BIT_HS52 = 1,
|
||||
EMMC_8BIT_HS52 = 2,
|
||||
EMMC_MMC_HS200 = 3,
|
||||
EMMC_MMC_HS400 = 4,
|
||||
};
|
||||
|
||||
typedef struct _gpt_entry_t
|
||||
{
|
||||
u8 type_guid[0x10];
|
||||
@@ -61,7 +70,15 @@ typedef struct _emmc_part_t
|
||||
s8 name[37];
|
||||
} emmc_part_t;
|
||||
|
||||
extern sdmmc_storage_t emmc_storage;
|
||||
extern sdmmc_t emmc_sdmmc;
|
||||
|
||||
int nx_emmc_part_read(sdmmc_storage_t *storage, emmc_part_t *part, u32 sector_off, u32 num_sectors, void *buf);
|
||||
int nx_emmc_part_write(sdmmc_storage_t *storage, emmc_part_t *part, u32 sector_off, u32 num_sectors, void *buf);
|
||||
|
||||
int nx_emmc_init_retry(bool power_cycle);
|
||||
bool nx_emmc_initialize(bool power_cycle);
|
||||
int nx_emmc_set_partition(u32 partition);
|
||||
void nx_emmc_end();
|
||||
|
||||
#endif
|
||||
|
||||
142
emummc/source/emmc/sdmmc.c
vendored
142
emummc/source/emmc/sdmmc.c
vendored
@@ -293,6 +293,59 @@ int sdmmc_storage_end(sdmmc_storage_t *storage)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int _sdmmc_storage_readwrite_fs(sdmmc_storage_t *storage, u32 sector, u32 num_sectors, void *buf, u32 is_write){
|
||||
sdmmc_accessor_t *accessor_sd = sdmmc_accessor_sd();
|
||||
sdmmc_accessor_t *accessor_nand = sdmmc_accessor_nand();
|
||||
|
||||
if (sdmmc_calculate_dma_addr(accessor_sd, buf, num_sectors))
|
||||
{
|
||||
return !accessor_sd->vtab->read_write(accessor_sd, sector, num_sectors, buf, num_sectors * 512, !is_write);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (sdmmc_calculate_dma_addr(accessor_nand, buf, num_sectors))
|
||||
{
|
||||
// buf is on the nand dma buffer
|
||||
int original_dma_idx = sdmmc_calculate_dma_index(accessor_nand, buf, num_sectors);
|
||||
sdmmc_dma_buffer_t *original_dma_buffer = &accessor_nand->parent->dmaBuffers[original_dma_idx];
|
||||
|
||||
// Next entry
|
||||
int dma_idx = sdmmc_calculate_fitting_dma_index(accessor_sd, num_sectors) + 1;
|
||||
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer = original_dma_buffer->device_addr_buffer;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_masked = original_dma_buffer->device_addr_buffer_masked;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_size = original_dma_buffer->device_addr_buffer_size;
|
||||
|
||||
u64 res = accessor_sd->vtab->read_write(accessor_sd, sector, num_sectors, buf, num_sectors * 512, 1);
|
||||
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer = 0;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_masked = 0;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_size = 0;
|
||||
|
||||
return !res;
|
||||
}
|
||||
else
|
||||
{
|
||||
// buf is on a heap
|
||||
int dma_idx = sdmmc_calculate_fitting_dma_index(accessor_sd, num_sectors);
|
||||
void *dma_buf = &accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer[0];
|
||||
u64 res;
|
||||
|
||||
if(is_write){
|
||||
memcpy(dma_buf, buf, num_sectors * 512);
|
||||
res = accessor_sd->vtab->read_write(accessor_sd, sector, num_sectors, dma_buf, num_sectors * 512, !is_write);
|
||||
}
|
||||
else
|
||||
{
|
||||
res = accessor_sd->vtab->read_write(accessor_sd, sector, num_sectors, dma_buf, num_sectors * 512, !is_write);
|
||||
memcpy(buf, dma_buf, num_sectors * 512);
|
||||
}
|
||||
|
||||
return !res;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int _sdmmc_storage_readwrite(sdmmc_storage_t *storage, u32 sector, u32 num_sectors, void *buf, u32 is_write)
|
||||
{
|
||||
u8 *bbuf = (u8 *)buf;
|
||||
@@ -358,54 +411,12 @@ out:
|
||||
return 1;
|
||||
}
|
||||
|
||||
extern _sdmmc_accessor_sd sdmmc_accessor_sd;
|
||||
extern _sdmmc_accessor_nand sdmmc_accessor_nand;
|
||||
|
||||
int sdmmc_storage_read(sdmmc_storage_t *storage, u32 sector, u32 num_sectors, void *buf)
|
||||
{
|
||||
if (!custom_driver)
|
||||
{
|
||||
sdmmc_accessor_t *accessor_sd = sdmmc_accessor_sd();
|
||||
sdmmc_accessor_t *accessor_nand = sdmmc_accessor_nand();
|
||||
|
||||
if (sdmmc_calculate_dma_addr(accessor_sd, buf, num_sectors))
|
||||
{
|
||||
return !accessor_sd->vtab->read_write(accessor_sd, sector, num_sectors, buf, num_sectors * 512, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (sdmmc_calculate_dma_addr(accessor_nand, buf, num_sectors))
|
||||
{
|
||||
// buf is on the nand dma buffer
|
||||
int original_dma_idx = sdmmc_calculate_dma_index(accessor_nand, buf, num_sectors);
|
||||
sdmmc_dma_buffer_t *original_dma_buffer = &accessor_nand->parent->dmaBuffers[original_dma_idx];
|
||||
|
||||
// Next entry
|
||||
int dma_idx = sdmmc_calculate_fitting_dma_index(accessor_sd, num_sectors) + 1;
|
||||
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer = original_dma_buffer->device_addr_buffer;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_masked = original_dma_buffer->device_addr_buffer_masked;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_size = original_dma_buffer->device_addr_buffer_size;
|
||||
|
||||
u64 res = accessor_sd->vtab->read_write(accessor_sd, sector, num_sectors, buf, num_sectors * 512, 1);
|
||||
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer = 0;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_masked = 0;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_size = 0;
|
||||
|
||||
return !res;
|
||||
}
|
||||
else
|
||||
{
|
||||
// buf is on a heap
|
||||
int dma_idx = sdmmc_calculate_fitting_dma_index(accessor_sd, num_sectors);
|
||||
void *dma_buf = &accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer[0];
|
||||
|
||||
u64 res = accessor_sd->vtab->read_write(accessor_sd, sector, num_sectors, dma_buf, num_sectors * 512, 1);
|
||||
memcpy(buf, dma_buf, num_sectors * 512);
|
||||
|
||||
return !res;
|
||||
}
|
||||
}
|
||||
return _sdmmc_storage_readwrite_fs(storage, sector, num_sectors, buf, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -417,48 +428,7 @@ int sdmmc_storage_write(sdmmc_storage_t *storage, u32 sector, u32 num_sectors, v
|
||||
{
|
||||
if (!custom_driver)
|
||||
{
|
||||
sdmmc_accessor_t *accessor_sd = sdmmc_accessor_sd();
|
||||
sdmmc_accessor_t *accessor_nand = sdmmc_accessor_nand();
|
||||
|
||||
if (sdmmc_calculate_dma_addr(accessor_sd, buf, num_sectors))
|
||||
{
|
||||
return !accessor_sd->vtab->read_write(accessor_sd, sector, num_sectors, buf, num_sectors * 512, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (sdmmc_calculate_dma_addr(accessor_nand, buf, num_sectors))
|
||||
{
|
||||
// buf is on the nand dma buffer
|
||||
int original_dma_idx = sdmmc_calculate_dma_index(accessor_nand, buf, num_sectors);
|
||||
sdmmc_dma_buffer_t *original_dma_buffer = &accessor_nand->parent->dmaBuffers[original_dma_idx];
|
||||
|
||||
// Next entry
|
||||
int dma_idx = sdmmc_calculate_fitting_dma_index(accessor_sd, num_sectors) + 1;
|
||||
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer = original_dma_buffer->device_addr_buffer;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_masked = original_dma_buffer->device_addr_buffer_masked;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_size = original_dma_buffer->device_addr_buffer_size;
|
||||
|
||||
u64 res = accessor_sd->vtab->read_write(accessor_sd, sector, num_sectors, buf, num_sectors * 512, 0);
|
||||
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer = 0;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_masked = 0;
|
||||
accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer_size = 0;
|
||||
|
||||
return !res;
|
||||
}
|
||||
else
|
||||
{
|
||||
// buf is on a heap
|
||||
int dma_idx = sdmmc_calculate_fitting_dma_index(accessor_sd, num_sectors);
|
||||
void *dma_buf = &accessor_sd->parent->dmaBuffers[dma_idx].device_addr_buffer[0];
|
||||
|
||||
memcpy(dma_buf, buf, num_sectors * 512);
|
||||
u64 res = accessor_sd->vtab->read_write(accessor_sd, sector, num_sectors, dma_buf, num_sectors * 512, 0);
|
||||
|
||||
return !res;
|
||||
}
|
||||
}
|
||||
return _sdmmc_storage_readwrite_fs(storage, sector, num_sectors, buf, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user