Macintosh-HW/greenscsi
1
0
Fork 0
mirror of https://github.com/dkgrizzly/GreenSCSI.git synced 2024-11-27 22:52:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Speed improvements

Browse Source
This commit is contained in:
David Kuder 2021-11-30 00:12:32 -05:00
parent 494a803890
commit 178cffa658
2 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/config.h
View File

@ -6,6 +6,7 @@
// 2: Debug information output to LOG.txt (slow) // 2: Debug information output to LOG.txt (slow)
#define SYNCHRO false // Support Synchronous mode. #define SYNCHRO false // Support Synchronous mode.
#define ACK_INTERRUPTS false
#define READ_SPEED_OPTIMIZE true // #define READ_SPEED_OPTIMIZE true //
#define WRITE_SPEED_OPTIMIZE true // #define WRITE_SPEED_OPTIMIZE true //
#define USE_DB2ID_TABLE true // Use table to get ID from SEL-DB #define USE_DB2ID_TABLE true // Use table to get ID from SEL-DB

61
src/scsibus.ino
View File

@ -51,9 +51,6 @@ const uint8_t db2scsiid[256]={
// Put DB and DP in output mode // Put DB and DP in output mode
inline void SCSI_DB_OUTPUT(uint8_t d) { inline void SCSI_DB_OUTPUT(uint8_t d) {
// GPIOB_PDDR = db_bsrr[d];
// GPIOB_PDOR = db_bsrr[d] ^ SCSI_DB_MASK;
GPIOB_PDOR = db_bsrr[d]; GPIOB_PDOR = db_bsrr[d];
} }
@ -86,33 +83,29 @@ void onBusReset(void)
m_isBusReset = true; m_isBusReset = true;
} }
/* /*
* Read by handshake. * Read by handshake.
*/ */
inline uint8_t readHandshake(void) inline uint8_t readHandshake(void)
{ {
SET_REQ_ACTIVE(); SET_REQ_ACTIVE();
//SCSI_DB_INPUT(); while(!GET_ACK()) { if(m_isBusReset) { return 0; } }
while(!m_isBusReset && !GET_ACK());
uint8_t r = readIO(); uint8_t r = readIO();
SET_REQ_INACTIVE(); SET_REQ_INACTIVE();
while(GET_ACK()) { if(m_isBusReset) return 0; } while(GET_ACK()) { if(m_isBusReset) { return 0; } }
return r; return r;
} }
inline void readHandshakeBlock(uint8_t *d, uint16_t len) inline void readHandshakeBlock(uint8_t *d, uint16_t len)
{ {
//SCSI_DB_INPUT();
while(len) { while(len) {
SET_REQ_ACTIVE(); SET_REQ_ACTIVE();
while(!m_isBusReset && !GET_ACK()); while(!GET_ACK()) { if(m_isBusReset) { return 0; } }
*d++ = readIO(); *d++ = readIO();
len--; len--;
SET_REQ_INACTIVE(); SET_REQ_INACTIVE();
while(GET_ACK()) { while(GET_ACK()) { if(m_isBusReset) { return 0; } }
yield();
if(m_isBusReset) return;
}
} }
} }
@ -124,17 +117,11 @@ inline void writeHandshake(uint8_t d)
GPIOB_PDDR = SCSI_DB_MASK; GPIOB_PDDR = SCSI_DB_MASK;
SCSI_DB_OUTPUT(d); SCSI_DB_OUTPUT(d);
// ACK.Fall to DB output delay 100ns(MAX) (DTC-510B) SET_REQ_ACTIVE();
SET_REQ_ACTIVE(); // (30ns) while(!GET_ACK()) { if(m_isBusReset) { return 0; } }
while(!m_isBusReset && !GET_ACK());
// ACK.Fall to REQ.Raise delay 500ns(typ.) (DTC-510B)
GPIOB_PDDR = DBP(0xff);
GPIOB_PDOR = DBP(0xff) ^ SCSI_DB_MASK; // DB=0xFF
SET_REQ_INACTIVE(); SET_REQ_INACTIVE();
SCSI_DB_INPUT();
// REQ.Raise to DB hold time 0ns while(GET_ACK()) { if(m_isBusReset) { return 0; } }
SCSI_DB_INPUT(); // (150ns)
while( GET_ACK()) { if(m_isBusReset) return; }
} }
inline void writeHandshakeBlock(const uint8_t *d, uint16_t len) inline void writeHandshakeBlock(const uint8_t *d, uint16_t len)
@ -142,15 +129,13 @@ inline void writeHandshakeBlock(const uint8_t *d, uint16_t len)
GPIOB_PDDR = SCSI_DB_MASK; GPIOB_PDDR = SCSI_DB_MASK;
while(len) { while(len) {
SCSI_DB_OUTPUT(*d++); SCSI_DB_OUTPUT(*d++);
SET_REQ_ACTIVE(); // (30ns) SET_REQ_ACTIVE();
while(!GET_ACK()); while(!GET_ACK()) { if(m_isBusReset) { return 0; } }
len--; len--;
SET_REQ_INACTIVE(); SET_REQ_INACTIVE();
while( GET_ACK()) { while(GET_ACK()) { if(m_isBusReset) { return 0; } }
if(m_isBusReset) return;
} }
} SCSI_DB_INPUT();
SCSI_DB_INPUT(); // (150ns)
} }
/* /*
@ -160,9 +145,9 @@ inline void writeHandshakeBlock(const uint8_t *d, uint16_t len)
void writeDataPhase(int len, const uint8_t* p) void writeDataPhase(int len, const uint8_t* p)
{ {
//LOGN("DATAIN PHASE"); //LOGN("DATAIN PHASE");
SET_MSG_INACTIVE(); // gpio_write(MSG, low); SET_MSG_INACTIVE();
SET_CD_INACTIVE();; // gpio_write(CD, low); SET_CD_INACTIVE();
SET_IO_ACTIVE(); // gpio_write(IO, high); SET_IO_ACTIVE();
#if READ_SPEED_OPTIMIZE #if READ_SPEED_OPTIMIZE
writeHandshakeBlock(p, len); writeHandshakeBlock(p, len);
@ -195,9 +180,9 @@ void writeDataPhaseSD(uint32_t adds, uint32_t len)
uint32_t pos = adds * m_sel->m_blocksize; uint32_t pos = adds * m_sel->m_blocksize;
m_sel->m_file.seek(pos); m_sel->m_file.seek(pos);
SET_MSG_INACTIVE(); // gpio_write(MSG, low); SET_MSG_INACTIVE();
SET_CD_INACTIVE(); // gpio_write(CD, low); SET_CD_INACTIVE();
SET_IO_ACTIVE(); // gpio_write(IO, high); SET_IO_ACTIVE();
while(i < len) { while(i < len) {
// Asynchronous reads will make it faster ... // Asynchronous reads will make it faster ...
@ -236,8 +221,8 @@ void readDataPhase(int len, uint8_t* p)
{ {
//LOGN("DATAOUT PHASE"); //LOGN("DATAOUT PHASE");
SET_MSG_INACTIVE(); SET_MSG_INACTIVE();
SET_CD_INACTIVE();; SET_CD_INACTIVE();
SET_IO_INACTIVE();; SET_IO_INACTIVE();
#if WRITE_SPEED_OPTIMIZE #if WRITE_SPEED_OPTIMIZE
readHandshakeBlock(p, len); readHandshakeBlock(p, len);
@ -265,8 +250,8 @@ void readDataPhaseSD(uint32_t adds, uint32_t len)
uint32_t pos = adds * m_sel->m_blocksize; uint32_t pos = adds * m_sel->m_blocksize;
m_sel->m_file.seek(pos); m_sel->m_file.seek(pos);
SET_MSG_INACTIVE(); SET_MSG_INACTIVE();
SET_CD_INACTIVE();; SET_CD_INACTIVE();
SET_IO_INACTIVE();; SET_IO_INACTIVE();
while(i < len) { while(i < len) {
#if WRITE_SPEED_OPTIMIZE #if WRITE_SPEED_OPTIMIZE