1
0
mirror of https://github.com/mist-devel/mist-firmware.git synced 2026-01-13 23:26:33 +00:00

Simplify passing currentdirectory to fpga_init

iCurrentDirectory is already there
This commit is contained in:
Gyorgy Szombathelyi 2020-02-01 17:54:42 +01:00
parent d2b5af6b80
commit bb6c35657b
4 changed files with 11 additions and 11 deletions

14
fpga.c
View File

@ -50,6 +50,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
"mov r0, r0");
extern fileTYPE file;
extern unsigned long iCurrentDirectory;
extern char s[40];
extern adfTYPE df[4];
@ -115,7 +116,7 @@ void ShiftFpga(unsigned char data)
// Xilinx FPGA configuration
// was before unsigned char ConfigureFpga(void)
RAMFUNC unsigned char ConfigureFpga(char *name, unsigned long currentdirectory)
RAMFUNC unsigned char ConfigureFpga(char *name)
{
unsigned long t;
unsigned long n;
@ -159,7 +160,7 @@ RAMFUNC unsigned char ConfigureFpga(char *name, unsigned long currentdirectory)
name = "X7A102T BIN";
// open bitstream file
if (FileOpenDir(&file, name, currentdirectory) == 0)
if (FileOpenDir(&file, name, iCurrentDirectory) == 0)
{
iprintf("No FPGA configuration file found!\r");
FatalError(4);
@ -242,7 +243,7 @@ static inline void ShiftFpga(unsigned char data)
}
// Altera FPGA configuration
RAMFUNC unsigned char ConfigureFpga(char *name, unsigned long currentdirectory)
RAMFUNC unsigned char ConfigureFpga(char *name)
{
unsigned long i;
unsigned char *ptr;
@ -256,7 +257,7 @@ RAMFUNC unsigned char ConfigureFpga(char *name, unsigned long currentdirectory)
name = "CORE RBF";
// open bitstream file
if (FileOpenDir(&file, name, currentdirectory) == 0)
if (FileOpenDir(&file, name, iCurrentDirectory) == 0)
{
iprintf("No FPGA configuration file found!\r");
FatalError(4);
@ -891,9 +892,8 @@ unsigned char GetFPGAStatus(void)
return status;
}
extern unsigned long iCurrentDirectory;
void fpga_init(char *name, unsigned long currentdirectory) {
void fpga_init(char *name) {
unsigned long time = GetTimer(0);
int loaded_from_usb = USB_LOAD_VAR;
@ -903,7 +903,7 @@ void fpga_init(char *name, unsigned long currentdirectory) {
if((loaded_from_usb != USB_LOAD_VALUE) && !user_io_dip_switch1()) {
unsigned char ct;
if (ConfigureFpga(name, currentdirectory)) {
if (ConfigureFpga(name)) {
time = GetTimer(0) - time;
iprintf("FPGA configured in %lu ms\r", time >> 20);
} else {

4
fpga.h
View File

@ -3,8 +3,8 @@
#include "rafile.h"
void fpga_init(char *name, unsigned long currentdirectory);
unsigned char ConfigureFpga(char *, unsigned long) RAMFUNC;
void fpga_init(char *name);
unsigned char ConfigureFpga(char *) RAMFUNC;
void SendFile(RAFile *file);
void SendFileEncrypted(RAFile *file,unsigned char *key,int keysize);
void SendFileV2(RAFile* file, unsigned char* key, int keysize, int address, int size);

2
main.c
View File

@ -166,7 +166,7 @@ int main(void)
// tos config also contains cdc redirect settings used by minimig
tos_config_load(-1);
fpga_init(NULL, 0);
fpga_init(NULL);
cdc_control_open();

2
menu.c
View File

@ -3278,7 +3278,7 @@ void HandleUI(void)
OsdCoreNameSet(file.name);
// reset fpga with core
fpga_init(file.name, iCurrentDirectory);
fpga_init(file.name);
menustate = MENU_NONE1;
break;