specchioriflesso/USB_Host_Shield_2.0
1
Fork 0
mirror of https://github.com/felis/USB_Host_Shield_2.0.git synced 2024-03-22 11:31:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added new BulkOnly public functions: SCSITransaction12() and SCSITransaction16()

Browse source
This commit is contained in:
Adam McDaniel 2020-04-15 16:15:05 -06:00
parent cd87628af4
commit 9500a00429
2 changed files with 132 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
masstorage.cpp
View file

@ -110,6 +110,51 @@ uint8_t BulkOnly::SCSITransaction10(CDB10_t *cdb, uint16_t buf_size, void *buf,
return (HandleSCSIError(Transaction(&cbw, buf_size, buf))); return (HandleSCSIError(Transaction(&cbw, buf_size, buf)));
} }
/**
* Wrap and execute a SCSI CDB with length of 12 (LBA32 size)
*
* @param cdb CDB to execute
* @param buf_size Size of expected transaction
* @param buf Buffer
* @param dir MASS_CMD_DIR_IN | MASS_CMD_DIR_OUT
* @return
*/
uint8_t BulkOnly::SCSITransaction12(CDB12_t *cdb, uint16_t buf_size, void *buf, uint8_t dir) {
// promote buf_size to 32bits.
CommandBlockWrapper cbw = CommandBlockWrapper(++dCBWTag, (uint32_t)buf_size, cdb, dir);
return (HandleSCSIError(Transaction(&cbw, buf_size, buf)));
}
/**
* Wrap and execute a SCSI CDB with length of 16 (LBA32 size)
*
* @param cdb CDB to execute
* @param buf_size Size of expected transaction
* @param buf Buffer
* @param dir MASS_CMD_DIR_IN | MASS_CMD_DIR_OUT
* @return
*/
uint8_t BulkOnly::SCSITransaction16(CDB_LBA32_16_t *cdb, uint16_t buf_size, void *buf, uint8_t dir) {
// promote buf_size to 32bits.
CommandBlockWrapper cbw = CommandBlockWrapper(++dCBWTag, (uint32_t)buf_size, cdb, dir);
return (HandleSCSIError(Transaction(&cbw, buf_size, buf)));
}
/**
* Wrap and execute a SCSI CDB with length of 16 (LBA64 size)
*
* @param cdb CDB to execute
* @param buf_size Size of expected transaction
* @param buf Buffer
* @param dir MASS_CMD_DIR_IN | MASS_CMD_DIR_OUT
* @return
*/
uint8_t BulkOnly::SCSITransaction16(CDB_LBA64_16_t *cdb, uint16_t buf_size, void *buf, uint8_t dir) {
// promote buf_size to 32bits.
CommandBlockWrapper cbw = CommandBlockWrapper(++dCBWTag, (uint32_t)buf_size, cdb, dir);
return (HandleSCSIError(Transaction(&cbw, buf_size, buf)));
}
/** /**
* Lock or Unlock the tray or door on device. * Lock or Unlock the tray or door on device.
* Caution: Some devices with buggy firmware will lock up. * Caution: Some devices with buggy firmware will lock up.

90
masstorage.h
View file

@ -243,6 +243,7 @@ struct CDB10 {
uint8_t ALC_LB; uint8_t ALC_LB;
uint8_t Control; uint8_t Control;
public: public:
CDB10(uint8_t _Opcode, uint8_t _LUN) : CDB10(uint8_t _Opcode, uint8_t _LUN) :
@ -266,23 +267,41 @@ struct CDB12 {
unsigned Service_Action : 5; unsigned Service_Action : 5;
unsigned Misc : 3; unsigned Misc : 3;
uint8_t LBA_L_M_MB;
uint8_t LBA_L_M_LB; uint8_t LBA_L_M_LB;
uint8_t LBA_L_L_MB; uint8_t LBA_L_L_MB;
uint8_t LBA_L_L_LB; uint8_t LBA_L_L_LB;
uint8_t ALC_M_MB;
uint8_t ALC_M_LB; uint8_t ALC_M_LB;
uint8_t ALC_L_MB; uint8_t ALC_L_MB;
uint8_t ALC_L_LB; uint8_t ALC_L_LB;
uint8_t Misc2;
uint8_t Control; uint8_t Control;
public:
CDB12(uint8_t _Opcode) :
Opcode(_Opcode), Service_Action(0), Misc(0),
LBA_L_M_MB(0), LBA_L_M_LB(0), LBA_L_L_MB(0), LBA_L_L_LB(0),
ALC_M_MB(0), ALC_M_LB(0), ALC_L_MB(0), ALC_L_LB(0),
Misc2(0), Control(0) {
}
CDB12(uint8_t _Opcode, uint32_t xflen, uint32_t _LBA) :
Opcode(_Opcode), Service_Action(0), Misc(0),
LBA_L_M_MB(BGRAB3(_LBA)), LBA_L_M_LB(BGRAB2(_LBA)), LBA_L_L_MB(BGRAB1(_LBA)), LBA_L_L_LB(BGRAB0(_LBA)),
ALC_M_MB(BGRAB3(xflen)), ALC_M_LB(BGRAB2(xflen)), ALC_L_MB(BGRAB1(xflen)), ALC_L_LB(BGRAB0(xflen)),
Misc2(0), Control(0) {
}
} __attribute__((packed)); } __attribute__((packed));
typedef CDB12 CDB12_t; typedef CDB12 CDB12_t;
struct CDB_LBA32_16 { struct CDB_LBA32_16 {
uint8_t Opcode; uint8_t Opcode;
uint8_t Misc;
unsigned Service_Action : 5;
unsigned Misc : 3;
uint8_t LBA_L_M_MB; uint8_t LBA_L_M_MB;
uint8_t LBA_L_M_LB; uint8_t LBA_L_M_LB;
@ -301,8 +320,28 @@ struct CDB_LBA32_16 {
uint8_t Misc2; uint8_t Misc2;
uint8_t Control; uint8_t Control;
public:
CDB_LBA32_16(uint8_t _Opcode) :
Opcode(_Opcode), Misc(0),
LBA_L_M_MB(0), LBA_L_M_LB(0), LBA_L_L_MB(0), LBA_L_L_LB(0),
A_M_M_MB(0), A_M_M_LB(0), A_M_L_MB(0), A_M_L_LB(0),
ALC_M_MB(0), ALC_M_LB(0), ALC_L_MB(0), ALC_L_LB(0),
Misc2(0), Control(0) {
}
CDB_LBA32_16(uint8_t _Opcode, uint32_t xflen, uint32_t _CBP, uint32_t _LBA) :
Opcode(_Opcode), Misc(0),
LBA_L_M_MB(BGRAB3(_LBA)), LBA_L_M_LB(BGRAB2(_LBA)), LBA_L_L_MB(BGRAB1(_LBA)), LBA_L_L_LB(BGRAB0(_LBA)),
A_M_M_MB(BGRAB3(_CBP)), A_M_M_LB(BGRAB2(_CBP)), A_M_L_MB(BGRAB1(_CBP)), A_M_L_LB(BGRAB0(_CBP)),
ALC_M_MB(BGRAB3(xflen)), ALC_M_LB(BGRAB2(xflen)), ALC_L_MB(BGRAB1(xflen)), ALC_L_LB(BGRAB0(xflen)),
Misc2(0), Control(0) {
}
} __attribute__((packed)); } __attribute__((packed));
typedef CDB_LBA32_16 CDB_LBA32_16_t;
struct CDB_LBA64_16 { struct CDB_LBA64_16 {
uint8_t Opcode; uint8_t Opcode;
uint8_t Misc; uint8_t Misc;
@ -324,8 +363,28 @@ struct CDB_LBA64_16 {
uint8_t Misc2; uint8_t Misc2;
uint8_t Control; uint8_t Control;
public:
CDB_LBA64_16(uint8_t _Opcode, uint8_t _LUN) :
Opcode(_Opcode), Misc(0),
LBA_M_M_MB(0), LBA_M_M_LB(0), LBA_M_L_MB(0), LBA_M_L_LB(0),
LBA_L_M_MB(0), LBA_L_M_LB(0), LBA_L_L_MB(0), LBA_L_L_LB(0),
ALC_M_MB(0), ALC_M_LB(0), ALC_L_MB(0), ALC_L_LB(0),
Misc2(0), Control(0) {
}
CDB_LBA64_16(uint8_t _Opcode, uint8_t _LUN, uint32_t xflen, uint64_t _LBA) :
Opcode(_Opcode), Misc(0),
LBA_M_M_MB(BGRAB7(_LBA)), LBA_M_M_LB(BGRAB6(_LBA)), LBA_M_L_MB(BGRAB5(_LBA)), LBA_M_L_LB(BGRAB4(_LBA)),
LBA_L_M_MB(BGRAB3(_LBA)), LBA_L_M_LB(BGRAB2(_LBA)), LBA_L_L_MB(BGRAB1(_LBA)), LBA_L_L_LB(BGRAB0(_LBA)),
ALC_M_MB(BGRAB3(xflen)), ALC_M_LB(BGRAB2(xflen)), ALC_L_MB(BGRAB1(xflen)), ALC_L_LB(BGRAB0(xflen)),
Misc2(0), Control(0) {
}
} __attribute__((packed)); } __attribute__((packed));
typedef CDB_LBA64_16 CDB_LBA64_16_t;
struct InquiryResponse { struct InquiryResponse {
uint8_t DeviceType : 5; uint8_t DeviceType : 5;
uint8_t PeripheralQualifier : 3; uint8_t PeripheralQualifier : 3;
@ -431,6 +490,7 @@ public:
bmCBWLUN(cdb->LUN), bmReserved1(0), bmCBWCBLength(6), bmReserved2(0) { bmCBWLUN(cdb->LUN), bmReserved1(0), bmCBWCBLength(6), bmReserved2(0) {
memcpy(&CBWCB, cdb, 6); memcpy(&CBWCB, cdb, 6);
} }
// Wrap for CDB of 10 // Wrap for CDB of 10
CommandBlockWrapper(uint32_t tag, uint32_t xflen, CDB10_t *cdb, uint8_t dir) : CommandBlockWrapper(uint32_t tag, uint32_t xflen, CDB10_t *cdb, uint8_t dir) :
@ -438,6 +498,27 @@ public:
bmCBWLUN(cdb->LUN), bmReserved1(0), bmCBWCBLength(10), bmReserved2(0) { bmCBWLUN(cdb->LUN), bmReserved1(0), bmCBWCBLength(10), bmReserved2(0) {
memcpy(&CBWCB, cdb, 10); memcpy(&CBWCB, cdb, 10);
} }
// Wrap for CDB of 12
CommandBlockWrapper(uint32_t tag, uint32_t xflen, CDB12_t *cdb, uint8_t dir) :
CommandBlockWrapperBase(tag, xflen, dir),
bmCBWLUN(0), bmReserved1(0), bmCBWCBLength(10), bmReserved2(0) {
memcpy(&CBWCB, cdb, 12);
}
// Wrap for CDB of 16
CommandBlockWrapper(uint32_t tag, uint32_t xflen, CDB_LBA32_16_t *cdb, uint8_t dir) :
CommandBlockWrapperBase(tag, xflen, dir),
bmCBWLUN(0), bmReserved1(0), bmCBWCBLength(16), bmReserved2(0) {
memcpy(&CBWCB, cdb, 16);
}
CommandBlockWrapper(uint32_t tag, uint32_t xflen, CDB_LBA64_16_t *cdb, uint8_t dir) :
CommandBlockWrapperBase(tag, xflen, dir),
bmCBWLUN(0), bmReserved1(0), bmCBWCBLength(16), bmReserved2(0) {
memcpy(&CBWCB, cdb, 16);
}
} __attribute__((packed)); } __attribute__((packed));
struct CommandStatusWrapper { struct CommandStatusWrapper {
@ -545,6 +626,9 @@ public:
uint8_t SCSITransaction6(CDB6_t *cdb, uint16_t buf_size, void *buf, uint8_t dir); uint8_t SCSITransaction6(CDB6_t *cdb, uint16_t buf_size, void *buf, uint8_t dir);
uint8_t SCSITransaction10(CDB10_t *cdb, uint16_t buf_size, void *buf, uint8_t dir); uint8_t SCSITransaction10(CDB10_t *cdb, uint16_t buf_size, void *buf, uint8_t dir);
uint8_t SCSITransaction12(CDB12_t *cdb, uint16_t buf_size, void *buf, uint8_t dir);
uint8_t SCSITransaction16(CDB_LBA32_16_t *cdb, uint16_t buf_size, void *buf, uint8_t dir);
uint8_t SCSITransaction16(CDB_LBA64_16_t *cdb, uint16_t buf_size, void *buf, uint8_t dir);
private: private:
uint8_t Inquiry(uint8_t lun, uint16_t size, uint8_t *buf); uint8_t Inquiry(uint8_t lun, uint16_t size, uint8_t *buf);