github.com/mist-devel.mist-firmware
1
0
Fork 0
mirror of https://github.com/mist-devel/mist-firmware.git synced 2026-04-25 12:01:54 +00:00
Code Releases Activity

tos.c: use block transfer for MIST1/no direct mode

Browse Source
This commit is contained in:
Gyorgy Szombathelyi
2023-09-26 12:34:55 +02:00
parent e39a931a1b
commit c80ef8220a
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hw/AT91SAM/spi.h
View File

@@ -72,17 +72,6 @@ static inline unsigned char SPI(unsigned char outByte) {
return((unsigned char)*AT91C_SPI_RDR);
}
static inline unsigned char SPI_READ() {
*AT91C_SPI_TDR = 0;
while (!(*AT91C_SPI_SR & AT91C_SPI_RDRF));
return((unsigned char)*AT91C_SPI_RDR);
}
static inline void SPI_WRITE(unsigned char outByte) {
while (!(*AT91C_SPI_SR & AT91C_SPI_TDRE));
*AT91C_SPI_TDR = outByte;
}
#define SPI_SDC_CLK_VALUE 2 // 24 MHz
#define SPI_MMC_CLK_VALUE 3 // 16 MHz
#define SPI_SLOW_CLK_VALUE 120 // 400kHz

37
tos.c
View File

@@ -17,6 +17,7 @@
#include "idxfile.h"
#include "font.h"
#include "mmc.h"
#include "utils.h"
#include "FatFs/diskio.h"
#define CONFIG_FILENAME "MIST CFG"
@@ -155,16 +156,13 @@ static void mist2_spi_set_speed(unsigned char speed)
if (user_io_core_type() == CORE_TYPE_MIST2) spi_set_speed(speed);
}
static void mist_memory_write(char *data, unsigned long words) {
static void mist_memory_write(const char *data, unsigned long words) {
spi_speed = spi_get_speed();
mist2_spi_set_speed(spi_newspeed);
EnableFpga();
SPI(MIST_WRITE_MEMORY);
while(words--) {
SPI_WRITE(*data++);
SPI_WRITE(*data++);
}
spi_write(data, words*2);
DisableFpga();
mist2_spi_set_speed(spi_speed);
@@ -182,7 +180,7 @@ static void mist_memory_read_block(char *data) {
mist2_spi_set_speed(spi_speed);
}
static void mist_memory_write_block(char *data) {
static void mist_memory_write_block(const char *data) {
EnableFpga();
SPI(MIST_WRITE_MEMORY);
@@ -191,13 +189,25 @@ static void mist_memory_write_block(char *data) {
DisableFpga();
}
static void mist_memory_write_blocks(const char *data, int count) {
spi_speed = spi_get_speed();
mist2_spi_set_speed(spi_newspeed);
EnableFpga();
SPI(MIST_WRITE_MEMORY);
spi_write(data, 512*count);
DisableFpga();
mist2_spi_set_speed(spi_speed);
}
void mist_memory_set(char data, unsigned long words) {
EnableFpga();
SPI(MIST_WRITE_MEMORY);
while(words--) {
SPI_WRITE(data);
SPI_WRITE(data);
SPI(data);
SPI(data);
}
DisableFpga();
@@ -356,18 +366,19 @@ static void handle_acsi(unsigned char *buffer) {
} else {
#endif
while(length) {
int blocksize = MIN(length, SECTOR_BUFFER_SIZE/512);
if(hdd_direct && target == 0) {
if(user_io_dip_switch1())
tos_debugf("ACSI: direct read %ld", lba);
disk_read(fs.pdrv, sector_buffer, lba++, 1);
disk_read(fs.pdrv, sector_buffer, lba, blocksize);
} else {
IDXSeek(&sd_image[target+2], lba);
FileReadBlock(&sd_image[target+2].file, sector_buffer);
lba++;
FileReadBlockEx(&sd_image[target+2].file, sector_buffer, blocksize);
}
// hexdump(sector_buffer, 32, 0);
mist_memory_write_block(sector_buffer);
length--;
mist_memory_write_blocks(sector_buffer, blocksize);
length-=blocksize;
lba+=blocksize;
}
#ifndef SD_NO_DIRECT_MODE
}