mirror of
https://github.com/Decscots/Lockpick_RCM.git
synced 2024-11-01 06:25:06 +01:00
Remove "Os" pragmas, merge hekate changes
This commit is contained in:
parent
eee656bb34
commit
76a13c85fa
@ -40,9 +40,6 @@
|
|||||||
#include "diskio.h" /* Declarations of device I/O functions */
|
#include "diskio.h" /* Declarations of device I/O functions */
|
||||||
#include "../../gfx/gfx.h"
|
#include "../../gfx/gfx.h"
|
||||||
|
|
||||||
#pragma GCC push_options
|
|
||||||
#pragma GCC target ("thumb")
|
|
||||||
|
|
||||||
#define EFSPRINTF(text, ...) print_error(); gfx_printf("%k"text"%k\n", 0xFFFFFF00, 0xFFFFFFFF);
|
#define EFSPRINTF(text, ...) print_error(); gfx_printf("%k"text"%k\n", 0xFFFFFF00, 0xFFFFFFFF);
|
||||||
//#define EFSPRINTF(...)
|
//#define EFSPRINTF(...)
|
||||||
|
|
||||||
@ -6650,5 +6647,3 @@ FRESULT f_setcp (
|
|||||||
return FR_OK;
|
return FR_OK;
|
||||||
}
|
}
|
||||||
#endif /* FF_CODE_PAGE == 0 */
|
#endif /* FF_CODE_PAGE == 0 */
|
||||||
|
|
||||||
#pragma GCC pop_options
|
|
||||||
|
@ -97,7 +97,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#define FF_USE_LFN 1
|
#define FF_USE_LFN 3
|
||||||
#define FF_MAX_LFN 255
|
#define FF_MAX_LFN 255
|
||||||
/* The FF_USE_LFN switches the support for LFN (long file name).
|
/* The FF_USE_LFN switches the support for LFN (long file name).
|
||||||
/
|
/
|
||||||
|
@ -43,9 +43,6 @@
|
|||||||
|
|
||||||
#define MAX17050_VMAX_TOLERANCE 50 /* 50 mV */
|
#define MAX17050_VMAX_TOLERANCE 50 /* 50 mV */
|
||||||
|
|
||||||
#pragma GCC push_options
|
|
||||||
#pragma GCC optimize ("Os")
|
|
||||||
|
|
||||||
int max17050_get_property(enum MAX17050_reg reg, int *value)
|
int max17050_get_property(enum MAX17050_reg reg, int *value)
|
||||||
{
|
{
|
||||||
u16 data;
|
u16 data;
|
||||||
@ -267,5 +264,3 @@ int max17050_fix_configuration()
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma GCC pop_options
|
|
@ -37,12 +37,31 @@
|
|||||||
#define FUSE_WRITE_ACCESS_SW 0x30
|
#define FUSE_WRITE_ACCESS_SW 0x30
|
||||||
#define FUSE_PWR_GOOD_SW 0x34
|
#define FUSE_PWR_GOOD_SW 0x34
|
||||||
#define FUSE_SKU_INFO 0x110
|
#define FUSE_SKU_INFO 0x110
|
||||||
|
#define FUSE_CPU_SPEEDO_0_CALIB 0x114
|
||||||
|
#define FUSE_CPU_IDDQ_CALIB 0x118
|
||||||
|
#define FUSE_OPT_FT_REV 0x128
|
||||||
|
#define FUSE_CPU_SPEEDO_1_CALIB 0x12C
|
||||||
|
#define FUSE_CPU_SPEEDO_2_CALIB 0x130
|
||||||
|
#define FUSE_SOC_SPEEDO_0_CALIB 0x134
|
||||||
|
#define FUSE_SOC_SPEEDO_1_CALIB 0x138
|
||||||
|
#define FUSE_SOC_SPEEDO_2_CALIB 0x13C
|
||||||
|
#define FUSE_SOC_IDDQ_CALIB 0x140
|
||||||
|
#define FUSE_OPT_CP_REV 0x190
|
||||||
#define FUSE_FIRST_BOOTROM_PATCH_SIZE 0x19c
|
#define FUSE_FIRST_BOOTROM_PATCH_SIZE 0x19c
|
||||||
#define FUSE_PRIVATE_KEY0 0x1A4
|
#define FUSE_PRIVATE_KEY0 0x1A4
|
||||||
#define FUSE_PRIVATE_KEY1 0x1A8
|
#define FUSE_PRIVATE_KEY1 0x1A8
|
||||||
#define FUSE_PRIVATE_KEY2 0x1AC
|
#define FUSE_PRIVATE_KEY2 0x1AC
|
||||||
#define FUSE_PRIVATE_KEY3 0x1B0
|
#define FUSE_PRIVATE_KEY3 0x1B0
|
||||||
|
#define FUSE_PRIVATE_KEY4 0x1B4
|
||||||
#define FUSE_RESERVED_SW 0x1C0
|
#define FUSE_RESERVED_SW 0x1C0
|
||||||
|
#define FUSE_OPT_VENDOR_CODE 0x200
|
||||||
|
#define FUSE_OPT_FAB_CODE 0x204
|
||||||
|
#define FUSE_OPT_LOT_CODE_0 0x208
|
||||||
|
#define FUSE_OPT_LOT_CODE_1 0x20C
|
||||||
|
#define FUSE_OPT_WAFER_ID 0x210
|
||||||
|
#define FUSE_OPT_X_COORDINATE 0x214
|
||||||
|
#define FUSE_OPT_Y_COORDINATE 0x218
|
||||||
|
#define FUSE_GPU_IDDQ_CALIB 0x228
|
||||||
|
|
||||||
/*! Fuse commands. */
|
/*! Fuse commands. */
|
||||||
#define FUSE_READ 0x1
|
#define FUSE_READ 0x1
|
||||||
|
@ -18,9 +18,6 @@
|
|||||||
#include "../soc/clock.h"
|
#include "../soc/clock.h"
|
||||||
#include "../soc/t210.h"
|
#include "../soc/t210.h"
|
||||||
|
|
||||||
#pragma GCC push_options
|
|
||||||
#pragma GCC optimize ("Os")
|
|
||||||
|
|
||||||
int kfuse_read(u32 *buf)
|
int kfuse_read(u32 *buf)
|
||||||
{
|
{
|
||||||
int res = 0;
|
int res = 0;
|
||||||
@ -57,5 +54,3 @@ int kfuse_wait_ready()
|
|||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma GCC pop_options
|
|
||||||
|
@ -32,10 +32,6 @@
|
|||||||
//#define DPRINTF(...) gfx_printf(__VA_ARGS__)
|
//#define DPRINTF(...) gfx_printf(__VA_ARGS__)
|
||||||
#define DPRINTF(...)
|
#define DPRINTF(...)
|
||||||
|
|
||||||
#pragma GCC push_options
|
|
||||||
#pragma GCC target ("thumb")
|
|
||||||
#pragma GCC optimize ("Os")
|
|
||||||
|
|
||||||
/*! SCMMC controller base addresses. */
|
/*! SCMMC controller base addresses. */
|
||||||
static const u32 _sdmmc_bases[4] = {
|
static const u32 _sdmmc_bases[4] = {
|
||||||
0x700B0000,
|
0x700B0000,
|
||||||
@ -81,7 +77,7 @@ static int _sdmmc_set_voltage(sdmmc_t *sdmmc, u32 power)
|
|||||||
{
|
{
|
||||||
pwr |= TEGRA_MMC_PWRCTL_SD_BUS_POWER;
|
pwr |= TEGRA_MMC_PWRCTL_SD_BUS_POWER;
|
||||||
sdmmc->regs->pwrcon = pwr;
|
sdmmc->regs->pwrcon = pwr;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -389,7 +385,7 @@ int sdmmc_get_rsp(sdmmc_t *sdmmc, u32 *rsp, u32 size, u32 type)
|
|||||||
|
|
||||||
static void _sdmmc_reset(sdmmc_t *sdmmc)
|
static void _sdmmc_reset(sdmmc_t *sdmmc)
|
||||||
{
|
{
|
||||||
sdmmc->regs->swrst |=
|
sdmmc->regs->swrst |=
|
||||||
TEGRA_MMC_SWRST_SW_RESET_FOR_CMD_LINE | TEGRA_MMC_SWRST_SW_RESET_FOR_DAT_LINE;
|
TEGRA_MMC_SWRST_SW_RESET_FOR_CMD_LINE | TEGRA_MMC_SWRST_SW_RESET_FOR_DAT_LINE;
|
||||||
_sdmmc_get_clkcon(sdmmc);
|
_sdmmc_get_clkcon(sdmmc);
|
||||||
u32 timeout = get_tmr_ms() + 2000;
|
u32 timeout = get_tmr_ms() + 2000;
|
||||||
@ -460,7 +456,7 @@ static int _sdmmc_setup_read_small_block(sdmmc_t *sdmmc)
|
|||||||
static int _sdmmc_parse_cmdbuf(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, bool is_data_present)
|
static int _sdmmc_parse_cmdbuf(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, bool is_data_present)
|
||||||
{
|
{
|
||||||
u16 cmdflags = 0;
|
u16 cmdflags = 0;
|
||||||
|
|
||||||
switch (cmd->rsp_type)
|
switch (cmd->rsp_type)
|
||||||
{
|
{
|
||||||
case SDMMC_RSP_TYPE_0:
|
case SDMMC_RSP_TYPE_0:
|
||||||
@ -726,7 +722,7 @@ static int _sdmmc_check_mask_interrupt(sdmmc_t *sdmmc, u16 *pout, u16 mask)
|
|||||||
sdmmc->regs->norintsts = norintsts & mask;
|
sdmmc->regs->norintsts = norintsts & mask;
|
||||||
return SDMMC_MASKINT_MASKED;
|
return SDMMC_MASKINT_MASKED;
|
||||||
}
|
}
|
||||||
|
|
||||||
return SDMMC_MASKINT_NOERROR;
|
return SDMMC_MASKINT_NOERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -771,7 +767,7 @@ static int _sdmmc_stop_transmission_inner(sdmmc_t *sdmmc, u32 *rsp)
|
|||||||
|
|
||||||
if (!res)
|
if (!res)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
_sdmmc_cache_rsp(sdmmc, rsp, 4, SDMMC_RSP_TYPE_1);
|
_sdmmc_cache_rsp(sdmmc, rsp, 4, SDMMC_RSP_TYPE_1);
|
||||||
|
|
||||||
return _sdmmc_wait_prnsts_type1(sdmmc);
|
return _sdmmc_wait_prnsts_type1(sdmmc);
|
||||||
@ -905,7 +901,7 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_
|
|||||||
_sdmmc_parse_cmdbuf(sdmmc, cmd, is_data_present);
|
_sdmmc_parse_cmdbuf(sdmmc, cmd, is_data_present);
|
||||||
|
|
||||||
int res = _sdmmc_wait_request(sdmmc);
|
int res = _sdmmc_wait_request(sdmmc);
|
||||||
DPRINTF("rsp(%d): %08X, %08X, %08X, %08X\n", res,
|
DPRINTF("rsp(%d): %08X, %08X, %08X, %08X\n", res,
|
||||||
sdmmc->regs->rspreg0, sdmmc->regs->rspreg1, sdmmc->regs->rspreg2, sdmmc->regs->rspreg3);
|
sdmmc->regs->rspreg0, sdmmc->regs->rspreg1, sdmmc->regs->rspreg2, sdmmc->regs->rspreg3);
|
||||||
if (res)
|
if (res)
|
||||||
{
|
{
|
||||||
@ -947,7 +943,7 @@ static int _sdmmc_config_sdmmc1()
|
|||||||
gpio_output_enable(GPIO_PORT_Z, GPIO_PIN_1, GPIO_OUTPUT_DISABLE);
|
gpio_output_enable(GPIO_PORT_Z, GPIO_PIN_1, GPIO_OUTPUT_DISABLE);
|
||||||
usleep(100);
|
usleep(100);
|
||||||
|
|
||||||
// Check if SD card is inserted.
|
// Check if SD card is inserted.
|
||||||
if(!!gpio_read(GPIO_PORT_Z, GPIO_PIN_1))
|
if(!!gpio_read(GPIO_PORT_Z, GPIO_PIN_1))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@ -1059,7 +1055,7 @@ void sdmmc_end(sdmmc_t *sdmmc)
|
|||||||
if (!sdmmc->clock_stopped)
|
if (!sdmmc->clock_stopped)
|
||||||
{
|
{
|
||||||
_sdmmc_sd_clock_disable(sdmmc);
|
_sdmmc_sd_clock_disable(sdmmc);
|
||||||
// Disable SDMMC power.
|
// Disable SDMMC power.
|
||||||
_sdmmc_set_voltage(sdmmc, SDMMC_POWER_OFF);
|
_sdmmc_set_voltage(sdmmc, SDMMC_POWER_OFF);
|
||||||
|
|
||||||
// Disable SD card power.
|
// Disable SD card power.
|
||||||
@ -1138,7 +1134,7 @@ int sdmmc_enable_low_voltage(sdmmc_t *sdmmc)
|
|||||||
_sdmmc_set_voltage(sdmmc, SDMMC_POWER_1_8);
|
_sdmmc_set_voltage(sdmmc, SDMMC_POWER_1_8);
|
||||||
_sdmmc_get_clkcon(sdmmc);
|
_sdmmc_get_clkcon(sdmmc);
|
||||||
msleep(5);
|
msleep(5);
|
||||||
|
|
||||||
if (sdmmc->regs->hostctl2 & SDHCI_CTRL_VDD_180)
|
if (sdmmc->regs->hostctl2 & SDHCI_CTRL_VDD_180)
|
||||||
{
|
{
|
||||||
sdmmc->regs->clkcon |= TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE;
|
sdmmc->regs->clkcon |= TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE;
|
||||||
@ -1150,5 +1146,3 @@ int sdmmc_enable_low_voltage(sdmmc_t *sdmmc)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma GCC pop_options
|
|
||||||
|
Loading…
Reference in New Issue
Block a user