Macintosh-HW
/
BlueSCSI
mirror of https://github.com/erichelgeson/BlueSCSI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

constant for block size

This commit is contained in:
Eric Helgeson 2022-09-23 14:09:32 -05:00
parent 13d7b985b7
commit e35bae560c
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/BlueSCSI.cpp
View File

@ -1834,7 +1834,7 @@ byte onListFiles(SCSI_DEVICE *dev, const byte *cdb) {
File dir; File dir;
File file; File file;
memset(m_buf, 0, 4096); memset(m_buf, 0, MAC_BLK_SIZE);
int ENTRY_SIZE = 40; int ENTRY_SIZE = 40;
char name[MAX_MAC_PATH + 1]; char name[MAX_MAC_PATH + 1];
dir.open("/shared"); dir.open("/shared");
@ -1848,7 +1848,6 @@ byte onListFiles(SCSI_DEVICE *dev, const byte *cdb) {
file.close(); file.close();
if(name[0] == '.') if(name[0] == '.')
continue; continue;
byte file_entry[ENTRY_SIZE] = {0}; byte file_entry[ENTRY_SIZE] = {0};
file_entry[0] = index; file_entry[0] = index;
file_entry[1] = isDir; file_entry[1] = isDir;
@ -1865,7 +1864,7 @@ byte onListFiles(SCSI_DEVICE *dev, const byte *cdb) {
index = index + 1; index = index + 1;
} }
dir.close(); dir.close();
writeDataPhase(4096, (const byte *)m_buf); writeDataPhase(MAC_BLK_SIZE, (const byte *)m_buf);
return SCSI_STATUS_GOOD; return SCSI_STATUS_GOOD;
} }
@ -1892,8 +1891,7 @@ byte onCountFiles(SCSI_DEVICE *dev, const byte *cdb) {
index = index + 1; index = index + 1;
} }
dir.close(); dir.close();
LOG_FILE.println(index);
LOG_FILE.sync();
if(index > 100) { if(index > 100) {
dev->m_senseKey = SCSI_SENSE_ILLEGAL_REQUEST; dev->m_senseKey = SCSI_SENSE_ILLEGAL_REQUEST;
dev->m_additional_sense_code = OPEN_RETRO_SCSI_TOO_MANY_FILES; dev->m_additional_sense_code = OPEN_RETRO_SCSI_TOO_MANY_FILES;
@ -1955,12 +1953,11 @@ byte onGetFile(SCSI_DEVICE *dev, const byte *cdb) {
} }
uint32_t file_total = file.size(); uint32_t file_total = file.size();
memset(m_buf, 0, MAC_BLK_SIZE);
byte buf[512] = {0}; file.seekSet(offset * MAC_BLK_SIZE);
file.seekSet(offset * 512); int read_bytes = file.read(m_buf, MAC_BLK_SIZE);
int read_bytes = file.read(buf, 512); writeDataPhase(read_bytes, m_buf);
writeDataPhase(read_bytes, buf); if(offset * MAC_BLK_SIZE >= file_total) // transfer done, close.
if(offset * 512 >= file_total) // transfer done, close.
{ {
file.close(); file.close();
} }

2
src/BlueSCSI.h
View File

@ -243,7 +243,7 @@ enum SCSI_DEVICE_TYPE
#define HDIMG_BLK_POS 5 // Position to embed block size numbers #define HDIMG_BLK_POS 5 // Position to embed block size numbers
#define MAX_FILE_PATH 64 // Maximum file name length #define MAX_FILE_PATH 64 // Maximum file name length
#define MAX_MAC_PATH 32 // Maximum file name length on vintage macs #define MAX_MAC_PATH 32 // Maximum file name length on vintage macs
#define MAC_BLK_SIZE 4096
/* /*
* Data byte to BSRR register setting value and parity table * Data byte to BSRR register setting value and parity table
*/ */