yemai/CherryUSB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor msc scsi process

Browse Source
This commit is contained in:
sakumisu
2021-11-09 10:28:34 +08:00
parent bb5f7e434b
commit 7e207b70e2
3 changed files with 696 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1139
class/msc/usbd_msc.c
View File

File diff suppressed because it is too large Load Diff

39
class/msc/usbd_msc.h
View File

@@ -43,31 +43,12 @@ extern "C" {
#define CSW_STATUS_CMD_FAILED 0x01 #define CSW_STATUS_CMD_FAILED 0x01
#define CSW_STATUS_PHASE_ERROR 0x02 #define CSW_STATUS_PHASE_ERROR 0x02
/** MSC Bulk-Only Command Block Wrapper (CBW) */
struct CBW {
uint32_t Signature;
uint32_t Tag;
uint32_t DataLength;
uint8_t Flags;
uint8_t LUN;
uint8_t CBLength;
uint8_t CB[16];
} __packed;
/** MSC Bulk-Only Command Status Wrapper (CSW) */
struct CSW {
uint32_t Signature;
uint32_t Tag;
uint32_t DataResidue;
uint8_t Status;
} __packed;
/*Length of template descriptor: 23 bytes*/ /*Length of template descriptor: 23 bytes*/
#define MSC_DESCRIPTOR_LEN (9 + 7 + 7) #define MSC_DESCRIPTOR_LEN (9 + 7 + 7)
// clang-format off // clang-format off
#ifndef SUPPORT_USB_HS #ifndef SUPPORT_USB_HS
#define MSC_DESCRIPTOR_INIT(bFirstInterface, out_ep, in_ep,str_idx) \ #define MSC_DESCRIPTOR_INIT(bFirstInterface, out_ep, in_ep,str_idx) \
/* Interface */ \ /* Interface */ \
0x09, /* bLength */ \ 0x09, /* bLength */ \
USB_DESCRIPTOR_TYPE_INTERFACE, /* bDescriptorType */ \ USB_DESCRIPTOR_TYPE_INTERFACE, /* bDescriptorType */ \
bFirstInterface, /* bInterfaceNumber */ \ bFirstInterface, /* bInterfaceNumber */ \
@@ -76,22 +57,22 @@ struct CSW {
USB_DEVICE_CLASS_MASS_STORAGE, /* bInterfaceClass */ \ USB_DEVICE_CLASS_MASS_STORAGE, /* bInterfaceClass */ \
MSC_SUBCLASS_SCSI, /* bInterfaceSubClass */ \ MSC_SUBCLASS_SCSI, /* bInterfaceSubClass */ \
MSC_PROTOCOL_BULK_ONLY, /* bInterfaceProtocol */ \ MSC_PROTOCOL_BULK_ONLY, /* bInterfaceProtocol */ \
str_idx, /* iInterface */ /* Endpoint Out */ \ str_idx, /* iInterface */ \
0x07, /* bLength */ \ 0x07, /* bLength */ \
USB_DESCRIPTOR_TYPE_ENDPOINT, /* bDescriptorType */ \ USB_DESCRIPTOR_TYPE_ENDPOINT, /* bDescriptorType */ \
out_ep, /* bEndpointAddress */ \ out_ep, /* bEndpointAddress */ \
0x02, /* bmAttributes */ \ 0x02, /* bmAttributes */ \
0x40, 0x00, /* wMaxPacketSize */ \ 0x40, 0x00, /* wMaxPacketSize */ \
0x01, /* bInterval */ /* Endpoint In */ \ 0x00, /* bInterval */ \
0x07, /* bLength */ \ 0x07, /* bLength */ \
USB_DESCRIPTOR_TYPE_ENDPOINT, /* bDescriptorType */ \ USB_DESCRIPTOR_TYPE_ENDPOINT, /* bDescriptorType */ \
in_ep, /* bEndpointAddress */ \ in_ep, /* bEndpointAddress */ \
0x02, /* bmAttributes */ \ 0x02, /* bmAttributes */ \
0x40, 0x00, /* wMaxPacketSize */ \ 0x40, 0x00, /* wMaxPacketSize */ \
0x01 /* bInterval */ 0x00 /* bInterval */
#else #else
#define MSC_DESCRIPTOR_INIT(bFirstInterface, out_ep, in_ep,str_idx) \ #define MSC_DESCRIPTOR_INIT(bFirstInterface, out_ep, in_ep,str_idx) \
/* Interface */ \ /* Interface */ \
0x09, /* bLength */ \ 0x09, /* bLength */ \
USB_DESCRIPTOR_TYPE_INTERFACE, /* bDescriptorType */ \ USB_DESCRIPTOR_TYPE_INTERFACE, /* bDescriptorType */ \
bFirstInterface, /* bInterfaceNumber */ \ bFirstInterface, /* bInterfaceNumber */ \
@@ -100,19 +81,19 @@ struct CSW {
USB_DEVICE_CLASS_MASS_STORAGE, /* bInterfaceClass */ \ USB_DEVICE_CLASS_MASS_STORAGE, /* bInterfaceClass */ \
MSC_SUBCLASS_SCSI, /* bInterfaceSubClass */ \ MSC_SUBCLASS_SCSI, /* bInterfaceSubClass */ \
MSC_PROTOCOL_BULK_ONLY, /* bInterfaceProtocol */ \ MSC_PROTOCOL_BULK_ONLY, /* bInterfaceProtocol */ \
str_idx, /* iInterface */ /* Endpoint Out */ \ str_idx, /* iInterface */ \
0x07, /* bLength */ \ 0x07, /* bLength */ \
USB_DESCRIPTOR_TYPE_ENDPOINT, /* bDescriptorType */ \ USB_DESCRIPTOR_TYPE_ENDPOINT, /* bDescriptorType */ \
out_ep, /* bEndpointAddress */ \ out_ep, /* bEndpointAddress */ \
0x02, /* bmAttributes */ \ 0x02, /* bmAttributes */ \
0x02, 0x00, /* wMaxPacketSize */ \ 0x00, 0x02, /* wMaxPacketSize */ \
0x01, /* bInterval */ /* Endpoint In */ \ 0x00, /* bInterval */ \
0x07, /* bLength */ \ 0x07, /* bLength */ \
USB_DESCRIPTOR_TYPE_ENDPOINT, /* bDescriptorType */ \ USB_DESCRIPTOR_TYPE_ENDPOINT, /* bDescriptorType */ \
in_ep, /* bEndpointAddress */ \ in_ep, /* bEndpointAddress */ \
0x02, /* bmAttributes */ \ 0x02, /* bmAttributes */ \
0x02, 0x00, /* wMaxPacketSize */ \ 0x00, 0x02, /* wMaxPacketSize */ \
0x01 /* bInterval */ 0x00 /* bInterval */
#endif #endif
// clang-format on // clang-format on

89
class/msc/usbd_scsi.h
View File

@@ -13,39 +13,39 @@
#define _USBD_SCSI_H_ #define _USBD_SCSI_H_
/* SCSI Commands */ /* SCSI Commands */
#define SCSI_TEST_UNIT_READY 0x00 #define SCSI_TEST_UNIT_READY 0x00
#define SCSI_REQUEST_SENSE 0x03 #define SCSI_REQUEST_SENSE 0x03
#define SCSI_FORMAT_UNIT 0x04 #define SCSI_FORMAT_UNIT 0x04
#define SCSI_INQUIRY 0x12 #define SCSI_INQUIRY 0x12
#define SCSI_MODE_SELECT6 0x15 #define SCSI_MODE_SELECT6 0x15
#define SCSI_MODE_SENSE6 0x1A #define SCSI_MODE_SENSE6 0x1A
#define SCSI_START_STOP_UNIT 0x1B #define SCSI_START_STOP_UNIT 0x1B
#define SCSI_SEND_DIAGNOSTIC 0x1D #define SCSI_SEND_DIAGNOSTIC 0x1D
#define SCSI_MEDIA_REMOVAL 0x1E #define SCSI_PREVENT_ALLOW_MEDIA_REMOVAL 0x1E
#define SCSI_READ_FORMAT_CAPACITIES 0x23 #define SCSI_READ_FORMAT_CAPACITIES 0x23
#define SCSI_READ_CAPACITY 0x25 #define SCSI_READ_CAPACITY10 0x25
#define SCSI_READ10 0x28 #define SCSI_READ10 0x28
#define SCSI_WRITE10 0x2A #define SCSI_WRITE10 0x2A
#define SCSI_VERIFY10 0x2F #define SCSI_VERIFY10 0x2F
#define SCSI_SYNC_CACHE10 0x35 #define SCSI_SYNC_CACHE10 0x35
#define SCSI_READ12 0xA8 #define SCSI_READ12 0xA8
#define SCSI_WRITE12 0xAA #define SCSI_WRITE12 0xAA
#define SCSI_MODE_SELECT10 0x55 #define SCSI_MODE_SELECT10 0x55
#define SCSI_MODE_SENSE10 0x5A #define SCSI_MODE_SENSE10 0x5A
#define SCSI_ATA_COMMAND_PASS_THROUGH16 0x85 #define SCSI_ATA_COMMAND_PASS_THROUGH16 0x85
#define SCSI_READ16 0x88 #define SCSI_READ16 0x88
#define SCSI_WRITE16 0x8A #define SCSI_WRITE16 0x8A
#define SCSI_VERIFY16 0x8F #define SCSI_VERIFY16 0x8F
#define SCSI_SYNC_CACHE16 0x91 #define SCSI_SYNC_CACHE16 0x91
#define SCSI_SERVICE_ACTION_IN16 0x9E #define SCSI_SERVICE_ACTION_IN16 0x9E
#define SCSI_READ_CAPACITY16 0x9E #define SCSI_READ_CAPACITY16 0x9E
#define SCSI_SERVICE_ACTION_OUT16 0x9F #define SCSI_SERVICE_ACTION_OUT16 0x9F
#define SCSI_ATA_COMMAND_PASS_THROUGH12 0xA1 #define SCSI_ATA_COMMAND_PASS_THROUGH12 0xA1
#define SCSI_REPORT_ID_INFO 0xA3 #define SCSI_REPORT_ID_INFO 0xA3
#define SCSI_READ12 0xA8 #define SCSI_READ12 0xA8
#define SCSI_SERVICE_ACTION_OUT12 0xA9 #define SCSI_SERVICE_ACTION_OUT12 0xA9
#define SCSI_SERVICE_ACTION_IN12 0xAB #define SCSI_SERVICE_ACTION_IN12 0xAB
#define SCSI_VERIFY12 0xAF #define SCSI_VERIFY12 0xAF
/* SCSI Sense Key */ /* SCSI Sense Key */
#define SCSI_SENSE_NONE 0x00 #define SCSI_SENSE_NONE 0x00
@@ -62,6 +62,29 @@
#define SCSI_SENSE_VOLUME_OVERFLOW 0x0d #define SCSI_SENSE_VOLUME_OVERFLOW 0x0d
#define SCSI_SENSE_MISCOMPARE 0x0e #define SCSI_SENSE_MISCOMPARE 0x0e
/* Additional Sense Code */
#define SCSI_ASC_INVALID_CDB 0x20U
#define SCSI_ASC_INVALID_FIELED_IN_COMMAND 0x24U
#define SCSI_ASC_PARAMETER_LIST_LENGTH_ERROR 0x1AU
#define SCSI_ASC_INVALID_FIELD_IN_PARAMETER_LIST 0x26U
#define SCSI_ASC_ADDRESS_OUT_OF_RANGE 0x21U
#define SCSI_ASC_MEDIUM_NOT_PRESENT 0x3AU
#define SCSI_ASC_MEDIUM_HAVE_CHANGED 0x28U
#define SCSI_ASC_WRITE_PROTECTED 0x27U
#define SCSI_ASC_UNRECOVERED_READ_ERROR 0x11U
#define SCSI_ASC_WRITE_FAULT 0x03U
#define READ_FORMAT_CAPACITY_DATA_LEN 0x0CU
#define READ_CAPACITY10_DATA_LEN 0x08U
#define REQUEST_SENSE_DATA_LEN 0x12U
#define STANDARD_INQUIRY_DATA_LEN 0x24U
#define MODE_SENSE6_DATA_LEN 0x17U
#define MODE_SENSE10_DATA_LEN 0x1BU
#define SCSI_MEDIUM_STATUS_UNLOCKED 0x00U
#define SCSI_MEDIUM_STATUS_LOCKED 0x01U
#define SCSI_MEDIUM_STATUS_EJECTED 0x02U
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// SCSI Primary Command (SPC-4) // SCSI Primary Command (SPC-4)
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+