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

Whitespace/Type cleanup

This commit is contained in:
Sam Edwards 2024-02-17 11:21:26 -08:00
parent a45af3edec
commit ba06827814
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/BlueSCSI.cpp
View File

@ -339,7 +339,6 @@ bool hddimageOpen(SCSI_DEVICE *dev, FsFile *file,int id,int lun,int blocksize)
return true; // File opened return true; // File opened
failed: failed:
dev->m_file.close(); dev->m_file.close();
dev->m_fileSize = dev->m_blocksize = 0; // no file dev->m_fileSize = dev->m_blocksize = 0; // no file
//delete dev->m_file; //delete dev->m_file;
@ -463,12 +462,12 @@ void setup()
TRANSCEIVER_IO_SET(vTR_INITIATOR,TR_INPUT); TRANSCEIVER_IO_SET(vTR_INITIATOR,TR_INPUT);
#endif #endif
//GPIO(SCSI BUS)Initialization // GPIO(SCSI BUS)Initialization
//Port setting register (lower) // Port setting register (lower)
// GPIOB->regs->CRL |= 0x000000008; // SET INPUT W/ PUPD on PAB-PB0 // GPIOB->regs->CRL |= 0x000000008; // SET INPUT W/ PUPD on PAB-PB0
//Port setting register (upper) // Port setting register (upper)
//GPIOB->regs->CRH = 0x88888888; // SET INPUT W/ PUPD on PB15-PB8 // GPIOB->regs->CRH = 0x88888888; // SET INPUT W/ PUPD on PB15-PB8
// GPIOB->regs->ODR = 0x0000FF00; // SET PULL-UPs on PB15-PB8 // GPIOB->regs->ODR = 0x0000FF00; // SET PULL-UPs on PB15-PB8
// DB and DP are input modes // DB and DP are input modes
SCSI_DB_INPUT() SCSI_DB_INPUT()
@ -635,7 +634,7 @@ void findDriveImages(FsFile root) {
int lun = 0; int lun = 0;
int blk = 512; int blk = 512;
// Positionally read in and coerase the chars to integers. // Positionally read in and coerce the chars to integers.
// We only require the minimum and read in the next if provided. // We only require the minimum and read in the next if provided.
int file_name_length = strlen(name); int file_name_length = strlen(name);
if(file_name_length > 2) { // HD[N] if(file_name_length > 2) { // HD[N]

12
src/BlueSCSI.h
View File

@ -182,7 +182,7 @@ enum SCSI_DEVICE_TYPE
| 1 | 1 | 1 | MESSAGE IN | Initiator from target / | phase | | 1 | 1 | 1 | MESSAGE IN | Initiator from target / | phase |
|-----------------------------------------------------------------------------| |-----------------------------------------------------------------------------|
| Key: 0 = False, 1 = True, * = Reserved for future standardization | | Key: 0 = False, 1 = True, * = Reserved for future standardization |
+=============================================================================+ +=============================================================================+
*/ */
// SCSI phase change as single write to port B // 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 SCSIPHASEMASK(MSGACTIVE, CDACTIVE, IOACTIVE) ((BITMASK(vMSG)<<((MSGACTIVE)?16:0)) | (BITMASK(vCD)<<((CDACTIVE)?16:0)) | (BITMASK(vIO)<<((IOACTIVE)?16:0)))
@ -340,15 +340,15 @@ typedef struct _SCSI_INQUIRY_DATA
// HDD image // HDD image
typedef __attribute__((aligned(4))) struct _SCSI_DEVICE typedef __attribute__((aligned(4))) struct _SCSI_DEVICE
{ {
FsFile m_file; // File object FsFile m_file; // File object
uint64_t m_fileSize; // File size uint64_t m_fileSize; // File size
uint16_t m_blocksize; // SCSI BLOCK size uint16_t m_blocksize; // SCSI BLOCK size
uint16_t m_rawblocksize; // OPTICAL raw sector size uint16_t m_rawblocksize; // OPTICAL raw sector size
uint8_t m_type; // SCSI device type uint8_t m_type; // SCSI device type
uint32_t m_blockcount; // blockcount uint32_t m_blockcount; // blockcount
SCSI_INQUIRY_DATA inquiry_block; // SCSI information SCSI_INQUIRY_DATA inquiry_block; // SCSI information
uint8_t m_senseKey; // Sense key uint8_t m_senseKey; // Sense key
uint16_t m_additional_sense_code; // ASC/ASCQ uint16_t m_additional_sense_code; // ASC/ASCQ
uint8_t m_sector_offset; // optical sector offset for missing sync header uint8_t m_sector_offset; // optical sector offset for missing sync header
uint8_t flags; // various device flags uint8_t flags; // various device flags
} SCSI_DEVICE; } SCSI_DEVICE;