Macintosh-HW/BlueSCSI
1
0
Fork 0
mirror of https://github.com/erichelgeson/BlueSCSI.git synced 2024-06-02 00:41:30 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup of SCSI phase change code, and adjustment of bus settle delays.

Browse Source
This commit is contained in:
Glenn Anderson 2022-04-08 11:10:07 -07:00
parent 08f25847f2
commit ba1b3df680
1 changed files with 83 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
src/BlueSCSI.cpp
View File

@ -152,6 +152,18 @@ SdFs SD;
// SCSI input pin check (inactive=0,avtive=1) // SCSI input pin check (inactive=0,avtive=1)
#define SCSI_IN(VPIN) ((~GPIOREG(VPIN)->IDR>>(VPIN&15))&1) #define SCSI_IN(VPIN) ((~GPIOREG(VPIN)->IDR>>(VPIN&15))&1)
// SCSI phase change as single write to port B
#define SCSIPHASEMASK(MSGACTIVE, CDACTIVE, IOACTIVE) ((BITMASK(vMSG)<<((MSGACTIVE)?16:0)) | (BITMASK(vCD)<<((CDACTIVE)?16:0)) | (BITMASK(vIO)<<((IOACTIVE)?16:0)))
#define SCSI_PHASE_DATAOUT SCSIPHASEMASK(inactive, inactive, inactive)
#define SCSI_PHASE_DATAIN SCSIPHASEMASK(inactive, inactive, active)
#define SCSI_PHASE_COMMAND SCSIPHASEMASK(inactive, active, inactive)
#define SCSI_PHASE_STATUS SCSIPHASEMASK(inactive, active, active)
#define SCSI_PHASE_MESSAGEOUT SCSIPHASEMASK(active, active, inactive)
#define SCSI_PHASE_MESSAGEIN SCSIPHASEMASK(active, active, active)
#define SCSI_PHASE_CHANGE(MASK) { PBREG->BSRR = (MASK); }
// GPIO mode // GPIO mode
// IN , FLOAT : 4 // IN , FLOAT : 4
// IN , PU/PD : 8 // IN , PU/PD : 8
@ -171,7 +183,7 @@ SdFs SD;
// BSY,REQ,MSG,CD,IO Turn on the output (no change required for OD) // BSY,REQ,MSG,CD,IO Turn on the output (no change required for OD)
#define SCSI_TARGET_ACTIVE() { if (DB_MODE_OUT != 7) gpio_mode(REQ, GPIO_OUTPUT_PP);} #define SCSI_TARGET_ACTIVE() { if (DB_MODE_OUT != 7) gpio_mode(REQ, GPIO_OUTPUT_PP);}
// BSY,REQ,MSG,CD,IO Turn off output, BSY is the last input // BSY,REQ,MSG,CD,IO Turn off output, BSY is the last input
#define SCSI_TARGET_INACTIVE() { if (DB_MODE_OUT == 7) SCSI_OUT(vREQ,inactive) else { if (DB_MODE_IN == 8) gpio_mode(REQ, GPIO_INPUT_PU) else gpio_mode(REQ, GPIO_INPUT_FLOATING)} SCSI_OUT(vMSG,inactive); SCSI_OUT(vCD,inactive);SCSI_OUT(vIO,inactive); gpio_mode(BSY, GPIO_INPUT_PU); } #define SCSI_TARGET_INACTIVE() { if (DB_MODE_OUT == 7) SCSI_OUT(vREQ,inactive) else { if (DB_MODE_IN == 8) gpio_mode(REQ, GPIO_INPUT_PU) else gpio_mode(REQ, GPIO_INPUT_FLOATING)} SCSI_PHASE_CHANGE(SCSI_PHASE_DATAOUT); gpio_mode(BSY, GPIO_INPUT_PU); }
// HDDiamge file // HDDiamge file
#define HDIMG_ID_POS 2 // Position to embed ID number #define HDIMG_ID_POS 2 // Position to embed ID number
@ -201,7 +213,6 @@ byte m_sts; // Status byte
byte m_msg; // Message bytes byte m_msg; // Message bytes
HDDIMG *m_img; // HDD image for current SCSI-ID, LUN HDDIMG *m_img; // HDD image for current SCSI-ID, LUN
byte m_buf[MAX_BLOCKSIZE]; // General purpose buffer byte m_buf[MAX_BLOCKSIZE]; // General purpose buffer
int m_msc;
byte m_msb[256]; // Command storage bytes byte m_msb[256]; // Command storage bytes
/* /*
@ -775,6 +786,7 @@ inline byte readHandshake(void)
*/ */
inline void writeHandshake(byte d) inline void writeHandshake(byte d)
{ {
// This has a 400ns bus settle delay built in. Not optimal for multi-byte transfers.
GPIOB->regs->BSRR = db_bsrr[d]; // setup DB,DBP (160ns) GPIOB->regs->BSRR = db_bsrr[d]; // setup DB,DBP (160ns)
SCSI_DB_OUTPUT() // (180ns) SCSI_DB_OUTPUT() // (180ns)
// ACK.Fall to DB output delay 100ns(MAX) (DTC-510B) // ACK.Fall to DB output delay 100ns(MAX) (DTC-510B)
@ -791,21 +803,6 @@ inline void writeHandshake(byte d)
while( SCSI_IN(vACK)); while( SCSI_IN(vACK));
} }
/*
* Data in phase.
* Send len bytes of data array p.
*/
void writeDataPhase(int len, const byte* p)
{
LOGN("DATAIN PHASE");
SCSI_OUT(vMSG,inactive) // gpio_write(MSG, low);
SCSI_OUT(vCD ,inactive) // gpio_write(CD, low);
SCSI_OUT(vIO , active) // gpio_write(IO, high);
for (int i = 0; i < len; i++) {
writeHandshake(p[i]);
}
}
#if READ_SPEED_OPTIMIZE #if READ_SPEED_OPTIMIZE
#pragma GCC push_options #pragma GCC push_options
#pragma GCC optimize ("-Os") #pragma GCC optimize ("-Os")
@ -818,8 +815,8 @@ void writeDataPhase(int len, const byte* p)
* Alignment matters. For the 3 instruction wait loops,it looks like crossing * Alignment matters. For the 3 instruction wait loops,it looks like crossing
* an 8 byte prefetch buffer can add 2 cycles of wait every branch taken. * an 8 byte prefetch buffer can add 2 cycles of wait every branch taken.
*/ */
void writeDataLoop(uint32_t blocksize) __attribute__ ((aligned(8))); void writeDataLoop(uint32_t blocksize, const byte* srcptr) __attribute__ ((aligned(8)));
void writeDataLoop(uint32_t blocksize) void writeDataLoop(uint32_t blocksize, const byte* srcptr)
{ {
#define REQ_ON() (port_b->BRR = req_bit); #define REQ_ON() (port_b->BRR = req_bit);
#define FETCH_BSRR_DB() (bsrr_val = bsrr_tbl[*srcptr++]) #define FETCH_BSRR_DB() (bsrr_val = bsrr_tbl[*srcptr++])
@ -827,11 +824,10 @@ void writeDataLoop(uint32_t blocksize)
#define WAIT_ACK_ACTIVE() while((*port_a_idr>>(vACK&15)&1)) #define WAIT_ACK_ACTIVE() while((*port_a_idr>>(vACK&15)&1))
#define WAIT_ACK_INACTIVE() while(!(*port_a_idr>>(vACK&15)&1)) #define WAIT_ACK_INACTIVE() while(!(*port_a_idr>>(vACK&15)&1))
register byte *srcptr= m_buf; // Source buffer register const byte *endptr= srcptr + blocksize; // End pointer
register byte *endptr= m_buf + blocksize; // End pointer
register const uint32_t *bsrr_tbl = db_bsrr; // Table to convert to BSRR register const uint32_t *bsrr_tbl = db_bsrr; // Table to convert to BSRR
register uint32_t bsrr_val; // BSRR value to output (DB, DBP, REQ = ACTIVE) register uint32_t bsrr_val; // BSRR value to output (DB, DBP, REQ = ACTIVE)
register uint32_t req_bit = BITMASK(vREQ); register uint32_t req_bit = BITMASK(vREQ);
register gpio_reg_map *port_b = PBREG; register gpio_reg_map *port_b = PBREG;
@ -868,16 +864,34 @@ void writeDataLoop(uint32_t blocksize)
#pragma GCC pop_options #pragma GCC pop_options
#endif #endif
/* /*
* Data in phase.
* Send len bytes of data array p.
*/
void writeDataPhase(int len, const byte* p)
{
LOGN("DATAIN PHASE");
SCSI_PHASE_CHANGE(SCSI_PHASE_DATAIN);
#if READ_SPEED_OPTIMIZE
// Bus settle delay 400ns. Following code was measured at 800ns before REQ asserted. STM32F103.
SCSI_DB_OUTPUT()
writeDataLoop(len, p);
SCSI_DB_INPUT()
#else
for (int i = 0; i < len; i++) {
writeHandshake(p[i]);
}
#endif
}
/*
* Data in phase. * Data in phase.
* Send len block while reading from SD card. * Send len block while reading from SD card.
*/ */
void writeDataPhaseSD(uint32_t adds, uint32_t len) void writeDataPhaseSD(uint32_t adds, uint32_t len)
{ {
LOGN("DATAIN PHASE(SD)"); LOGN("DATAIN PHASE(SD)");
SCSI_OUT(vMSG,inactive) // gpio_write(MSG, low); SCSI_PHASE_CHANGE(SCSI_PHASE_DATAIN);
SCSI_OUT(vCD ,inactive) // gpio_write(CD, low);
SCSI_OUT(vIO , active) // gpio_write(IO, high);
//Bus settle delay 400ns, file.seek() measured at over 1000ns. //Bus settle delay 400ns, file.seek() measured at over 1000ns.
uint32_t pos = adds * m_img->m_blocksize; uint32_t pos = adds * m_img->m_blocksize;
@ -891,7 +905,7 @@ void writeDataPhaseSD(uint32_t adds, uint32_t len)
enableResetJmp(); enableResetJmp();
#if READ_SPEED_OPTIMIZE #if READ_SPEED_OPTIMIZE
writeDataLoop(m_img->m_blocksize); writeDataLoop(m_img->m_blocksize, m_buf);
#else #else
for(int j = 0; j < m_img->m_blocksize; j++) { for(int j = 0; j < m_img->m_blocksize; j++) {
writeHandshake(m_buf[j]); writeHandshake(m_buf[j]);
@ -901,20 +915,6 @@ void writeDataPhaseSD(uint32_t adds, uint32_t len)
SCSI_DB_INPUT() SCSI_DB_INPUT()
} }
/*
* Data out phase.
* len block read
*/
void readDataPhase(int len, byte* p)
{
LOGN("DATAOUT PHASE");
SCSI_OUT(vMSG,inactive) // gpio_write(MSG, low);
SCSI_OUT(vCD ,inactive) // gpio_write(CD, low);
SCSI_OUT(vIO ,inactive) // gpio_write(IO, low);
for(uint32_t i = 0; i < len; i++)
p[i] = readHandshake();
}
#if WRITE_SPEED_OPTIMIZE #if WRITE_SPEED_OPTIMIZE
#pragma GCC push_options #pragma GCC push_options
#pragma GCC optimize ("-Os") #pragma GCC optimize ("-Os")
@ -922,11 +922,10 @@ void readDataPhase(int len, byte* p)
/* /*
* See writeDataLoop for optimization info. * See writeDataLoop for optimization info.
*/ */
void readDataLoop(uint32_t blockSize) __attribute__ ((aligned(16))); void readDataLoop(uint32_t blockSize, byte* dstptr) __attribute__ ((aligned(16)));
void readDataLoop(uint32_t blockSize) void readDataLoop(uint32_t blockSize, byte* dstptr)
{ {
register byte *dstptr= m_buf; register byte *endptr= dstptr + blockSize - 1;
register byte *endptr= m_buf + blockSize - 1;
#define REQ_ON() (port_b->BRR = req_bit); #define REQ_ON() (port_b->BRR = req_bit);
#define REQ_OFF() (port_b->BSRR = req_bit); #define REQ_OFF() (port_b->BSRR = req_bit);
@ -958,6 +957,23 @@ void readDataLoop(uint32_t blockSize)
#pragma GCC pop_options #pragma GCC pop_options
#endif #endif
/*
* Data out phase.
* len block read
*/
void readDataPhase(int len, byte* p)
{
LOGN("DATAOUT PHASE");
SCSI_PHASE_CHANGE(SCSI_PHASE_DATAOUT);
// Bus settle delay 400ns. The following code was measured at 450ns before REQ asserted. STM32F103.
#if WRITE_SPEED_OPTIMIZE
readDataLoop(len, p);
#else
for(uint32_t i = 0; i < len; i++)
p[i] = readHandshake();
#endif
}
/* /*
* Data out phase. * Data out phase.
* Write to SD card while reading len block. * Write to SD card while reading len block.
@ -965,9 +981,7 @@ void readDataLoop(uint32_t blockSize)
void readDataPhaseSD(uint32_t adds, uint32_t len) void readDataPhaseSD(uint32_t adds, uint32_t len)
{ {
LOGN("DATAOUT PHASE(SD)"); LOGN("DATAOUT PHASE(SD)");
SCSI_OUT(vMSG,inactive) // gpio_write(MSG, low); SCSI_PHASE_CHANGE(SCSI_PHASE_DATAOUT);
SCSI_OUT(vCD ,inactive) // gpio_write(CD, low);
SCSI_OUT(vIO ,inactive) // gpio_write(IO, low);
//Bus settle delay 400ns, file.seek() measured at over 1000ns. //Bus settle delay 400ns, file.seek() measured at over 1000ns.
uint32_t pos = adds * m_img->m_blocksize; uint32_t pos = adds * m_img->m_blocksize;
@ -975,7 +989,7 @@ void readDataPhaseSD(uint32_t adds, uint32_t len)
for(uint32_t i = 0; i < len; i++) { for(uint32_t i = 0; i < len; i++) {
m_resetJmp = true; m_resetJmp = true;
#if WRITE_SPEED_OPTIMIZE #if WRITE_SPEED_OPTIMIZE
readDataLoop(m_img->m_blocksize); readDataLoop(m_img->m_blocksize, m_buf);
#else #else
for(int j = 0; j < m_img->m_blocksize; j++) { for(int j = 0; j < m_img->m_blocksize; j++) {
m_buf[j] = readHandshake(); m_buf[j] = readHandshake();
@ -999,16 +1013,14 @@ void readDataPhaseSD(uint32_t adds, uint32_t len)
void verifyDataPhaseSD(uint32_t adds, uint32_t len) void verifyDataPhaseSD(uint32_t adds, uint32_t len)
{ {
LOGN("DATAOUT PHASE(SD)"); LOGN("DATAOUT PHASE(SD)");
SCSI_OUT(vMSG,inactive) // gpio_write(MSG, low); SCSI_PHASE_CHANGE(SCSI_PHASE_DATAOUT);
SCSI_OUT(vCD ,inactive) // gpio_write(CD, low);
SCSI_OUT(vIO ,inactive) // gpio_write(IO, low);
//Bus settle delay 400ns, file.seek() measured at over 1000ns. //Bus settle delay 400ns, file.seek() measured at over 1000ns.
uint32_t pos = adds * m_img->m_blocksize; uint32_t pos = adds * m_img->m_blocksize;
m_img->m_file.seek(pos); m_img->m_file.seek(pos);
for(uint32_t i = 0; i < len; i++) { for(uint32_t i = 0; i < len; i++) {
#if WRITE_SPEED_OPTIMIZE #if WRITE_SPEED_OPTIMIZE
readDataLoop(m_img->m_blocksize); readDataLoop(m_img->m_blocksize, m_buf);
#else #else
for(int j = 0; j < m_img->m_blocksize; j++) { for(int j = 0; j < m_img->m_blocksize; j++) {
m_buf[j] = readHandshake(); m_buf[j] = readHandshake();
@ -1439,26 +1451,11 @@ static byte dtc510b_setDriveparameter(void)
void MsgIn2(int msg) void MsgIn2(int msg)
{ {
LOGN("MsgIn2"); LOGN("MsgIn2");
SCSI_OUT(vMSG, active) // gpio_write(MSG, high); SCSI_PHASE_CHANGE(SCSI_PHASE_MESSAGEIN);
SCSI_OUT(vCD , active) // gpio_write(CD, high); // Bus settle delay 400ns built in to writeHandshake
SCSI_OUT(vIO , active) // gpio_write(IO, high);
writeHandshake(msg); writeHandshake(msg);
} }
/*
* MsgOut2.
*/
void MsgOut2()
{
LOGN("MsgOut2");
SCSI_OUT(vMSG, active) // gpio_write(MSG, high);
SCSI_OUT(vCD , active) // gpio_write(CD, high);
SCSI_OUT(vIO ,inactive) // gpio_write(IO, low);
m_msb[m_msc] = readHandshake();
m_msc++;
m_msc %= 256;
}
/* /*
* Main loop. * Main loop.
*/ */
@ -1498,17 +1495,18 @@ void loop()
SCSI_TARGET_ACTIVE() // (BSY), REQ, MSG, CD, IO output turned on SCSI_TARGET_ACTIVE() // (BSY), REQ, MSG, CD, IO output turned on
// //
if(isHigh(gpio_read(ATN))) { if(isHigh(gpio_read(ATN))) {
SCSI_PHASE_CHANGE(SCSI_PHASE_MESSAGEOUT);
// Bus settle delay 400ns. Following code was measured at 350ns before REQ asserted. Added another 50ns. STM32F103.
SCSI_PHASE_CHANGE(SCSI_PHASE_MESSAGEOUT);// 28ns delay STM32F103
SCSI_PHASE_CHANGE(SCSI_PHASE_MESSAGEOUT);// 28ns delay STM32F103
bool syncenable = false; bool syncenable = false;
int syncperiod = 50; int syncperiod = 50;
int syncoffset = 0; int syncoffset = 0;
int loopWait = 0; int msc = 0;
m_msc = 0; while(isHigh(gpio_read(ATN)) && msc < 255) {
memset(m_msb, 0x00, sizeof(m_msb)); m_msb[msc++] = readHandshake();
while(isHigh(gpio_read(ATN)) && loopWait < 255) {
MsgOut2();
loopWait++;
} }
for(int i = 0; i < m_msc; i++) { for(int i = 0; i < msc; i++) {
// ABORT // ABORT
if (m_msb[i] == 0x06) { if (m_msb[i] == 0x06) {
goto BusFree; goto BusFree;
@ -1550,10 +1548,9 @@ void loop()
} }
LOG("Command:"); LOG("Command:");
SCSI_OUT(vMSG,inactive) // gpio_write(MSG, low); SCSI_PHASE_CHANGE(SCSI_PHASE_COMMAND);
SCSI_OUT(vCD , active) // gpio_write(CD, high); // Bus settle delay 400ns. The following code was measured at 20ns before REQ asserted. Added another 380ns. STM32F103.
SCSI_OUT(vIO ,inactive) // gpio_write(IO, low); asm("nop;nop;nop;nop;nop;nop;nop;nop");// This asm causes some code reodering, which adds 270ns, plus 8 nop cycles for an additional 110ns. STM32F103
int len; int len;
byte cmd[12]; byte cmd[12];
cmd[0] = readHandshake(); cmd[0] = readHandshake();
@ -1686,15 +1683,13 @@ void loop()
} }
LOGN("Sts"); LOGN("Sts");
SCSI_OUT(vMSG,inactive) // gpio_write(MSG, low); SCSI_PHASE_CHANGE(SCSI_PHASE_STATUS);
SCSI_OUT(vCD , active) // gpio_write(CD, high); // Bus settle delay 400ns built in to writeHandshake
SCSI_OUT(vIO , active) // gpio_write(IO, high);
writeHandshake(m_sts); writeHandshake(m_sts);
LOGN("MsgIn"); LOGN("MsgIn");
SCSI_OUT(vMSG, active) // gpio_write(MSG, high); SCSI_PHASE_CHANGE(SCSI_PHASE_MESSAGEIN);
SCSI_OUT(vCD , active) // gpio_write(CD, high); // Bus settle delay 400ns built in to writeHandshake
SCSI_OUT(vIO , active) // gpio_write(IO, high);
writeHandshake(m_msg); writeHandshake(m_msg);
BusFree: BusFree: