Release/Reserve Commands

build.sh

@@ -6,7 +6,6 @@ set -x
 DATE=$(date +%Y%m%d)
 VERSION="v1.1-$DATE"
 mkdir -p dist
-rm -f dist/*.bin
 
 for f in $(ls .pio/build/*/firmware.bin); do
     NAME="BlueSCSI-$VERSION-$(echo $f | cut -d\/ -f3).bin"

docs/1.0b-to-1.0c.adoc

@@ -3,25 +3,25 @@
 
 ## Introduction
 
-1.0-c was a small change to fix an issue with machines that provide low or no `TERMPOWER` over the SCSI bus. If you received a fully-assembled BlueSCSI after April 1st, 2021 then this was done for you. If you have a kit labeled 1.0-b you can make these modifications to become a 1.0-c.
+1.0-c was a small change to fix an issue with machines that provide low or no `TERMPOWER` over the SCSI bus. If you recived a Fully Assembled BlueSCSI after April 1st, 2021 then this was done for you. If you have a kit labled 1.0-b you can make these modifications to become a 1.0-c.
 
 ## Steps
 
-### Disconnect `TERMPOWER` from 220 Pull Up Jumper
+### Disconnect `TERMPOWER` from 220 Pull Up Jupmer
 
 Use a cutting tool to cut the small trace between the `TERMPOWR` and 220 Pull Up Jumper pictured below.
 
-Make sure continuity from `TERMPOWER` to the diode still flows correctly but is disconnected from the jumper.
+Make sure continiutiy from `TERMPOWER` to the diode still flows correctly but is disconnected from the jumper.
 
 image::images/1.0-b-bodge-1.jpg[]
 
-### Connect 5V to 220 Pull Up Jumper
+### Connect 5V to 220 Pull Up Jupmer
 
-Now we will provide pull up from the 5V provided by the BluePill.
+Now we will provide pull up from the 5v provided by the BluePill.
 
 image::images/1.0-b-bodge-2.png[]
 
 ### Complete!
 
-That’s it! 5V to the Pull Up resistors will now work when powered externally.
+Thats it! 5v to the Pull Up resistors will now work when powered externally.
 

docs/build-your-own.adoc

@@ -1,7 +1,7 @@
 
 # Build Your Own
 
-These instructions will guide you through purchasing all of the parts needed to assemble kits for yourselves and for friends! Please note the hardware is licensed non-commercial.
+These instructions will guide you thorugh purchasing all of the parts needed to assemble kits for yourselves and for friends! Please note the hardware is licensed non-comercial.
 
 If you'd like to buy the kits pre-packaged/pre-flashed or fully assembled we have a network of makers here to help you out at https://scsi.blue
 
@@ -11,11 +11,11 @@ Updated for 1.0-c.
 
 ### PCB's
 
-Grab the latest Gerbers. Gerber files tell the PCB manufacturer how to create the BlueSCSI boards.
+Grab the latest Gerbers. Gerber files tell the PCB manufactuer how to create the BlueSCSI boards.
 
 https://github.com/erichelgeson/BlueSCSI/tree/main/hw/
 
-Order the boards from https://jlcpcb.com/ or your manufacturer of choice.
+Order the boards from https://jlcpcb.com/ or your manufactuer of choice.
 
 ### Components
 
@@ -55,6 +55,6 @@ https://github.com/erichelgeson/BlueSCSI#flashing
 
 ## Usage
 
-Be sure to follow the usage instructions for getting your drive images set up:
+Be sure to follow the usage instructions for getting your drive images setup:
 
 https://github.com/erichelgeson/BlueSCSI#usage

platformio.ini

@@ -6,11 +6,12 @@ default_envs = STM32F1
 [env]
 framework = arduino
 lib_deps =
-    greiman/SdFat @ 2.2.0
+    greiman/SdFat @ ^2.0.6
 upload_protocol = stlink
 ; Different gcc versions produce much different binaries in terms of speed.
 platform_packages = platformio/toolchain-gccarmnoneeabi@1.90301.200702
 build_flags = 
+    -w
     -DARDUINO_GENERIC_STM32F103C
     -DARDUINO_LIB_DISCOVERY_PHASE
     -DARDUINO=10813
@@ -64,9 +65,10 @@ platform = ststm32
 board = genericSTM32F103C8
 board_build.mcu = stm32f103c8t6
 board_build.core = maple
+board_build.f_cpu = 128000000L
 framework = arduino
 lib_deps =
-    greiman/SdFat @ 2.2.0
+    greiman/SdFat @ ^2.0.6
 upload_protocol = dfu
 ; Different gcc versions produce much different binaries in terms of speed.
 platform_packages = platformio/toolchain-gccarmnoneeabi@1.90301.200702
@@ -78,6 +80,7 @@ build_flags =
     -D USB_MANUFACTURER="Unknown"
     -D USB_PRODUCT="\"BLUEPILL_F103C8\""
     -D HAL_PCD_MODULE_ENABLED
+    -w
     -DARDUINO_GENERIC_STM32F103C
     -DARDUINO_LIB_DISCOVERY_PHASE
     -DARDUINO=10813

src/BlueSCSI.h

@@ -1,329 +0,0 @@
-#ifndef __BLUESCSI_H__
-#define __BLUESCSI_H__
-
-#include <Arduino.h> // For Platform.IO
-#include <SdFat.h>
-
-// SCSI config
-#define MAX_SCSIID  7          // Maximum number of supported SCSI-IDs (The minimum is 0)
-#define MAX_SCSILUN 8          // Maximum number of LUNs supported     (The minimum is 0)
-#define NUM_SCSIID  MAX_SCSIID // Number of enabled SCSI IDs
-#define NUM_SCSILUN 1          // Number of enabled LUNs
-#define READ_PARITY_CHECK 0    // Perform read parity check (unverified)
-#define DEFAULT_SCSI_ID 1
-#define DEFAULT_SCSI_LUN 0
-#define SCSI_BUF_SIZE 512      // Size of the SCSI Buffer
-#define HDD_BLOCK_SIZE 512
-#define OPTICAL_BLOCK_SIZE 2048
-
-// HDD format
-#define MAX_BLOCKSIZE 4096     // Maximum BLOCK size
-
-// SDFAT
-#define SD1_CONFIG SdSpiConfig(PA4, DEDICATED_SPI, SD_SCK_MHZ(SPI_FULL_SPEED), &SPI)
-
-// LED ERRORS
-#define ERROR_FALSE_INIT  3
-#define ERROR_NO_SDCARD   5
-
-enum SCSI_DEVICE_TYPE
-{
-  SCSI_DEVICE_HDD,
-  SCSI_DEVICE_OPTICAL,
-};
-
-#define CDROM_RAW_SECTORSIZE    2352
-#define CDROM_COMMON_SECTORSIZE 2048
-
-#define MAX_SCSI_COMMAND  0xff
-#define SCSI_COMMAND_HANDLER(x) static byte x(SCSI_DEVICE *dev, const byte *cdb)
-
-#if DEBUG
-#define LOG(XX)     Serial.print(XX)
-#define LOGHEX(XX)  Serial.print(XX, HEX)
-#define LOGN(XX)    Serial.println(XX)
-#define LOGHEXN(XX) Serial.println(XX, HEX)
-#else
-#define LOG(XX)     //Serial.print(XX)
-#define LOGHEX(XX)  //Serial.print(XX, HEX)
-#define LOGN(XX)    //Serial.println(XX)
-#define LOGHEXN(XX) //Serial.println(XX, HEX)
-#endif
-
-#define active   1
-#define inactive 0
-#define high 0
-#define low 1
-
-#define isHigh(XX) ((XX) == high)
-#define isLow(XX) ((XX) != high)
-
-#define gpio_mode(pin,val) gpio_set_mode(PIN_MAP[pin].gpio_device, PIN_MAP[pin].gpio_bit, val);
-#define gpio_write(pin,val) gpio_write_bit(PIN_MAP[pin].gpio_device, PIN_MAP[pin].gpio_bit, val)
-#define gpio_read(pin) gpio_read_bit(PIN_MAP[pin].gpio_device, PIN_MAP[pin].gpio_bit)
-
-//#define DB0       PB8     // SCSI:DB0
-//#define DB1       PB9     // SCSI:DB1
-//#define DB2       PB10    // SCSI:DB2
-//#define DB3       PB11    // SCSI:DB3
-//#define DB4       PB12    // SCSI:DB4
-//#define DB5       PB13    // SCSI:DB5
-//#define DB6       PB14    // SCSI:DB6
-//#define DB7       PB15    // SCSI:DB7
-//#define DBP       PB0     // SCSI:DBP
-#define ATN       PA8      // SCSI:ATN
-#define BSY       PA9      // SCSI:BSY
-#define ACK       PA10     // SCSI:ACK
-#define RST       PA15     // SCSI:RST
-#define MSG       PB3      // SCSI:MSG
-#define SEL       PB4      // SCSI:SEL
-#define CD        PB5      // SCSI:C/D
-#define REQ       PB6      // SCSI:REQ
-#define IO        PB7      // SCSI:I/O
-
-#define SD_CS     PA4      // SDCARD:CS
-#define LED       PC13     // LED
-#define LED2      PA0      // External LED
-
-// Image Set Selector
-#ifdef XCVR
-#define IMAGE_SELECT1   PC14
-#define IMAGE_SELECT2   PC15
-#else
-#define IMAGE_SELECT1   PA1
-#define IMAGE_SELECT2   PB1
-#endif
-
-// GPIO register port
-#define PAREG GPIOA->regs
-#define PBREG GPIOB->regs
-#define PCREG GPIOC->regs
-
-// LED control
-#define LED_ON()  PCREG->BSRR = 0b00100000000000000000000000000000; PAREG->BSRR = 0b00000000000000000000000000000001;
-#define LED_OFF() PCREG->BSRR = 0b00000000000000000010000000000000; PAREG->BSRR = 0b00000000000000010000000000000000;
-
-// Virtual pin (Arduio compatibility is slow, so make it MCU-dependent)
-#define PA(BIT)       (BIT)
-#define PB(BIT)       (BIT+16)
-// Virtual pin decoding
-#define GPIOREG(VPIN)    ((VPIN)>=16?PBREG:PAREG)
-#define BITMASK(VPIN) (1<<((VPIN)&15))
-
-#define vATN       PA(8)      // SCSI:ATN
-#define vBSY       PA(9)      // SCSI:BSY
-#define vACK       PA(10)     // SCSI:ACK
-#define vRST       PA(15)     // SCSI:RST
-#define vMSG       PB(3)      // SCSI:MSG
-#define vSEL       PB(4)      // SCSI:SEL
-#define vCD        PB(5)      // SCSI:C/D
-#define vREQ       PB(6)      // SCSI:REQ
-#define vIO        PB(7)      // SCSI:I/O
-#define vSD_CS     PA(4)      // SDCARD:CS
-
-// SCSI output pin control: opendrain active LOW (direct pin drive)
-#define SCSI_OUT(VPIN,ACTIVE) { GPIOREG(VPIN)->BSRR = BITMASK(VPIN)<<((ACTIVE)?16:0); }
-
-// SCSI input pin check (inactive=0,avtive=1)
-#define SCSI_IN(VPIN) ((~GPIOREG(VPIN)->IDR>>(VPIN&15))&1)
-
-#define NOP(x) for(unsigned _nopcount = x; _nopcount; _nopcount--) { asm("NOP"); }
-
-/* SCSI Timing delays */
-// Due to limitations in timing granularity all of these are "very" rough estimates
-#define SCSI_BUS_SETTLE() NOP(30);                            // spec 400ns ours ~420us
-#define SCSI_DATA_RELEASE() NOP(30);                          // spec 400ns ours ~420us
-#define SCSI_HOLD_TIME() asm("NOP"); asm("NOP"); asm("NOP");  // spec 45ns ours ~42ns
-#define SCSI_DESKEW() // asm("NOP"); asm("NOP"); asm("NOP");     // spec 45ns ours ~42ns
-#define SCSI_CABLE_SKEW() // asm("NOP");                         // spec 10ns ours ~14ns
-#define SCSI_RESET_HOLD() asm("NOP"); asm("NOP");             // spec 25ns ours ~28ns
-#define SCSI_DISCONNECTION_DELAY() NOP(15);                   // spec 200ns ours ~210ns
-
-/* SCSI phases
-+=============-===============-==================================-============+
-|    Signal   |  Phase name   |       Direction of transfer      |  Comment   |
-|-------------|               |                                  |            |
-| MSG|C/D|I/O |               |                                  |            |
-|----+---+----+---------------+----------------------------------+------------|
-|  0 | 0 | 0  |  DATA OUT     |       Initiator to target     \  |  Data      |
-|  0 | 0 | 1  |  DATA IN      |       Initiator from target   /  |  phase     |
-|  0 | 1 | 0  |  COMMAND      |       Initiator to target        |            |
-|  0 | 1 | 1  |  STATUS       |       Initiator from target      |            |
-|  1 | 0 | 0  |  *            |                                  |            |
-|  1 | 0 | 1  |  *            |                                  |            |
-|  1 | 1 | 0  |  MESSAGE OUT  |       Initiator to target     \  |  Message   |
-|  1 | 1 | 1  |  MESSAGE IN   |       Initiator from target   /  |  phase     |
-|-----------------------------------------------------------------------------|
-| Key:  0 = False,  1 = True,  * = Reserved for future standardization        |
-+=============================================================================+ 
-*/
-// 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); }
-
-#ifdef XCVR
-#define TR_TARGET        PA1   // Target Transceiver Control Pin
-#define TR_DBP           PA2   // Data Pins Transceiver Control Pin
-#define TR_INITIATOR     PA3   // Initiator Transciever Control Pin
-
-#define vTR_TARGET       PA(1) // Target Transceiver Control Pin
-#define vTR_DBP          PA(2) // Data Pins Transceiver Control Pin
-#define vTR_INITIATOR    PA(3) // Initiator Transciever Control Pin
-
-#define TR_INPUT 1
-#define TR_OUTPUT 0
-
-// Transceiver control definitions
-#define TRANSCEIVER_IO_SET(VPIN,TR_INPUT) { GPIOREG(VPIN)->BSRR = BITMASK(VPIN) << ((TR_INPUT) ? 16 : 0); }
-
-// Turn on the output only for BSY
-#define SCSI_BSY_ACTIVE()      {  gpio_mode(BSY, GPIO_OUTPUT_PP); SCSI_OUT(vBSY, active) }
-
-#define SCSI_TARGET_ACTIVE()   { gpio_mode(REQ, GPIO_OUTPUT_PP); gpio_mode(MSG, GPIO_OUTPUT_PP); gpio_mode(CD, GPIO_OUTPUT_PP); gpio_mode(IO, GPIO_OUTPUT_PP); gpio_mode(BSY, GPIO_OUTPUT_PP);  TRANSCEIVER_IO_SET(vTR_TARGET,TR_OUTPUT);}
-// BSY,REQ,MSG,CD,IO Turn off output, BSY is the last input
-#define SCSI_TARGET_INACTIVE() { gpio_mode(REQ, GPIO_INPUT_FLOATING); gpio_mode(MSG, GPIO_INPUT_FLOATING); gpio_mode(CD, GPIO_INPUT_FLOATING); gpio_mode(IO, GPIO_INPUT_FLOATING); gpio_mode(BSY, GPIO_INPUT_FLOATING); TRANSCEIVER_IO_SET(vTR_TARGET,TR_INPUT); }
-
-#define DB_MODE_OUT 1  // push-pull mode
-#define DB_MODE_IN  4  // floating inputs
-
-#else
-
-// GPIO mode
-// IN , FLOAT      : 4
-// IN , PU/PD      : 8
-// OUT, PUSH/PULL  : 3
-// OUT, OD         : 1
-#define DB_MODE_OUT 3
-//#define DB_MODE_OUT 7
-#define DB_MODE_IN  8
-
-
-// Turn on the output only for BSY
-#define SCSI_BSY_ACTIVE()      { gpio_mode(BSY, GPIO_OUTPUT_OD); SCSI_OUT(vBSY,  active) }
-// 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); }
-// 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)} PBREG->BSRR = 0b000000000000000011101000; SCSI_OUT(vBSY,inactive); gpio_mode(BSY, GPIO_INPUT_PU); }
-
-#endif
-
-// Put DB and DP in output mode
-#define SCSI_DB_OUTPUT() { PBREG->CRL=(PBREG->CRL &0xfffffff0)|DB_MODE_OUT; PBREG->CRH = 0x11111111*DB_MODE_OUT; }
-// Put DB and DP in input mode
-#define SCSI_DB_INPUT()  { PBREG->CRL=(PBREG->CRL &0xfffffff0)|DB_MODE_IN ; PBREG->CRH = (uint32_t)(0x11111111*DB_MODE_IN); }
-
-// HDDiamge file
-#define HDIMG_ID_POS  2                 // Position to embed ID number
-#define HDIMG_LUN_POS 3                 // Position to embed LUN numbers
-#define HDIMG_BLK_POS 5                 // Position to embed block size numbers
-#define MAX_FILE_PATH 64                // Maximum file name length
-
-/*
- *  Data byte to BSRR register setting value and parity table
-*/
-
-// Parity bit generation
-#define PTY(V)   (1^((V)^((V)>>1)^((V)>>2)^((V)>>3)^((V)>>4)^((V)>>5)^((V)>>6)^((V)>>7))&1)
-
-// Data byte to BSRR register setting value conversion table
-// BSRR[31:24] =  DB[7:0]
-// BSRR[   16] =  PTY(DB)
-// BSRR[15: 8] = ~DB[7:0]
-// BSRR[    0] = ~PTY(DB)
-
-// Set DBP, set REQ = inactive
-#define DBP(D)    ((((((uint32_t)(D)<<8)|PTY(D))*0x00010001)^0x0000ff01)|BITMASK(vREQ))
-//#define DBP(D)    ((((((uint32_t)(D)<<8)|PTY(D))*0x00010001)^0x0000ff01))
-
-
-//#define DBP8(D)   DBP(D),DBP(D+1),DBP(D+2),DBP(D+3),DBP(D+4),DBP(D+5),DBP(D+6),DBP(D+7)
-//#define DBP32(D)  DBP8(D),DBP8(D+8),DBP8(D+16),DBP8(D+24)
-
-// BSRR register control value that simultaneously performs DB set, DP set, and REQ = H (inactrive)
-uint32_t db_bsrr[256];
-// Parity bit acquisition
-#define PARITY(DB) (db_bsrr[DB]&1)
-
-// Macro cleaning
-//#undef DBP32
-//#undef DBP8
-//#undef DBP
-//#undef PTY
-
-// #define GET_CDB6_LBA(x) ((x[2] & 01f) << 16) | (x[3] << 8) | x[4]
-#define READ_DATA_BUS() (byte)((~(uint32_t)GPIOB->regs->IDR)>>8)
-
-
-
-struct SCSI_INQUIRY_DATA
-{
-  union
-  {
-  struct {
-    // bitfields are in REVERSE order for ARM
-    // byte 0
-    byte peripheral_device_type:5;
-    byte peripheral_qualifier:3;
-    // byte 1
-    byte reserved_byte2:7;
-    byte rmb:1;
-    // byte 2
-    byte ansi_version:3;
-    byte always_zero_byte3:5;
-    // byte 3
-    byte response_format:4; // 0 = SCSI1, 1 = Before SCSI2 was finalized, 2 = SCSI2
-    byte reserved_byte4:2;
-    byte tiop:1;
-    byte always_zero_byte4:1;
-    // byte 4
-    byte additional_length;
-    // byte 5-6
-    byte reserved_byte5;
-    byte reserved_byte6;
-    // byte 7
-    byte sync:1;
-    byte always_zero_byte7_more:4;
-    byte always_zero_byte7:3;
-    // byte 8-15
-    char vendor[8];
-    // byte 16-31
-    char product[16];
-    // byte 32-35
-    char revision[4];
-    // byte 36
-    byte release;
-    // 37-46
-    char revision_date[10];
-  };
-  // raw bytes
-  byte raw[64];
-  };
-};
-
-// HDD image
-typedef __attribute__((aligned(4))) struct _SCSI_DEVICE
-{
-	FsFile        *m_file;                  // File object
-	uint64_t      m_fileSize;               // File size
-	uint16_t      m_blocksize;              // SCSI BLOCK size
-  uint16_t      m_rawblocksize;           // OPTICAL raw sector size
-  uint8_t       m_type;                   // SCSI device type
-  uint32_t      m_blockcount;             // blockcount
-  bool          m_raw;                    // Raw disk
-  SCSI_INQUIRY_DATA *inquiry_block;       // SCSI information
-  uint8_t       m_senseKey;               // Sense key
-  uint16_t      m_additional_sense_code;  // ASC/ASCQ 
-  bool          m_mode2;                  // MODE2 CDROM
-  uint8_t       m_sector_offset;          // optical sector offset for missing sync header
-} SCSI_DEVICE;
-
-
-#endif

src/scsi_cmds.h

@@ -21,7 +21,6 @@
 #define SCSI_RECV_DIAG_RESULTS      0x1C
 #define SCSI_SEND_DIAG              0x1D
 #define SCSI_PREVENT_ALLOW_REMOVAL  0x1E
-#define SCSI_ICD_EXTENDED_CMD       0x1F
 #define SCSI_READ_CAPACITY          0x25
 #define SCSI_READ10                 0x28
 #define SCSI_WRITE10                0x2A

src/scsi_sense.h

@@ -27,7 +27,6 @@
 #define SCSI_ASC_WRITE_PROTECTED                                0x2700
 #define SCSI_ASC_CANNOT_READ_MEDIUM_UNKNOWN_FORMAT              0x3001
 #define SCSI_ASC_CANNOT_READ_MEDIUM_INCOMPATIBLE_FORMAT         0x3002
-#define SCSI_ASC_SAVING_PARAMETERS_NOT_SUPPORTED                0x3900
 #define SCSI_ASC_MEDIUM_NOT_PRESENT                             0x3A00
 #define SCSI_ASC_LUN_NOT_READY_MANUAL_INTERVENTION_REQUIRED     0x0403
 
@@ -39,9 +38,6 @@
 #define SCSI_SENSE_MODE_FORMAT_DEVICE               0x03
 #define SCSI_SENSE_MODE_DISK_GEOMETRY               0x04
 #define SCSI_SENSE_MODE_FLEXABLE_GEOMETRY           0x05
-#define SCSI_SENSE_MODE_CACHING                     0x08
-#define SCSI_SENSE_MODE_CDROM                       0x0D
-#define SCSI_SENSE_MODE_CDROM_AUDIO_CONTROL         0x0E
 #define SCSI_SENSE_MODE_VENDOR_APPLE                0x30
 
 #define SCSI_SENSE_MODE_ALL                         0x3F