This commit is contained in:
Polprzewodnikowy 2021-11-30 01:31:24 +01:00
parent 42a8def063
commit 4a3108e1de
8 changed files with 8 additions and 9 deletions

View File

@ -52,9 +52,9 @@ build_riscv () {
pushd sw/riscv > /dev/null pushd sw/riscv > /dev/null
if [ "$FORCE_CLEAN" = true ]; then if [ "$FORCE_CLEAN" = true ]; then
make clean -j make clean
fi fi
make all USER_FLAGS="$USER_FLAGS" make all -j USER_FLAGS="$USER_FLAGS"
popd > /dev/null popd > /dev/null
BUILT_RISCV=true BUILT_RISCV=true

View File

@ -24,7 +24,7 @@ void main(void) {
LOG_I(" Mask ROM version: %d\r\n", header.version); LOG_I(" Mask ROM version: %d\r\n", header.version);
LOG_I("\r\n"); LOG_I("\r\n");
info_t info; cart_info_t info;
sc64_get_info(&info); sc64_get_info(&info);

View File

@ -46,7 +46,7 @@ void sc64_set_config(cfg_id_t id, uint32_t value) {
sc64_perform_cmd(SC64_CMD_CONFIG, args, NULL); sc64_perform_cmd(SC64_CMD_CONFIG, args, NULL);
} }
void sc64_get_info(info_t *info) { void sc64_get_info(cart_info_t *info) {
io32_t *src = UNCACHED(&header_text_info); io32_t *src = UNCACHED(&header_text_info);
uint32_t *dst = (uint32_t *) info->bootloader_version; uint32_t *dst = (uint32_t *) info->bootloader_version;
@ -60,8 +60,8 @@ void sc64_get_info(info_t *info) {
info->save_type = (save_type_t) sc64_get_config(CFG_ID_SAVE_TYPE); info->save_type = (save_type_t) sc64_get_config(CFG_ID_SAVE_TYPE);
info->cic_seed = (uint8_t) sc64_get_config(CFG_ID_CIC_SEED); info->cic_seed = (uint8_t) sc64_get_config(CFG_ID_CIC_SEED);
info->tv_type = (tv_type_t) sc64_get_config(CFG_ID_TV_TYPE); info->tv_type = (tv_type_t) sc64_get_config(CFG_ID_TV_TYPE);
info->save_offset = (io32_t *) sc64_get_config(CFG_ID_SAVE_OFFEST); info->save_offset = (io32_t *) (0x10000000 | sc64_get_config(CFG_ID_SAVE_OFFEST));
info->dd_offset = (io32_t *) sc64_get_config(CFG_ID_DD_OFFEST); info->dd_offset = (io32_t *) (0x10000000 | sc64_get_config(CFG_ID_DD_OFFEST));
info->boot_mode = (boot_mode_t) sc64_get_config(CFG_ID_BOOT_MODE); info->boot_mode = (boot_mode_t) sc64_get_config(CFG_ID_BOOT_MODE);
} }

View File

@ -95,7 +95,7 @@ typedef struct {
io32_t *dd_offset; io32_t *dd_offset;
boot_mode_t boot_mode; boot_mode_t boot_mode;
char bootloader_version[32]; char bootloader_version[32];
} info_t; } cart_info_t;
extern char header_text_info; extern char header_text_info;
@ -107,7 +107,7 @@ bool sc64_wait_cpu_busy(void);
bool sc64_perform_cmd(uint8_t cmd, uint32_t *args, uint32_t *result); bool sc64_perform_cmd(uint8_t cmd, uint32_t *args, uint32_t *result);
uint32_t sc64_get_config(cfg_id_t id); uint32_t sc64_get_config(cfg_id_t id);
void sc64_set_config(cfg_id_t id, uint32_t value); void sc64_set_config(cfg_id_t id, uint32_t value);
void sc64_get_info(info_t *info); void sc64_get_info(cart_info_t *info);
void sc64_wait_usb_tx_ready(void); void sc64_wait_usb_tx_ready(void);
void sc64_usb_tx_data(io32_t *address, uint32_t length); void sc64_usb_tx_data(io32_t *address, uint32_t length);
void sc64_debug_write(uint8_t type, const void *data, uint32_t len); void sc64_debug_write(uint8_t type, const void *data, uint32_t len);

View File

@ -107,7 +107,6 @@ typedef struct {
#define PIFRAM ((io8_t *) PIFRAM_BASE) #define PIFRAM ((io8_t *) PIFRAM_BASE)
void wait_ms(uint32_t ms); void wait_ms(uint32_t ms);
uint32_t io_read(io32_t *address); uint32_t io_read(io32_t *address);
void io_write(io32_t *address, uint32_t value); void io_write(io32_t *address, uint32_t value);