Skip to content

Fix USB MSC more than 2 LUNs support #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Fix USB MSC more than 2 LUNs support #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a34521c
Fix USB MSC more than 2 LUNs support
Igorbunow Aug 4, 2021
5e1420e
Fix multiLUN address checking
Igorbunow Aug 6, 2021
17d6ba4
Add SCSI_REPORT_LUNS12 command
Igorbunow Aug 6, 2021
06e160e
Add SCSI_Log_Sense10 command
Igorbunow Aug 6, 2021
cb9164d
Add SCSI_RECEIVE_DIAGNOSTIC8 SCSI_ATA_PASSTHROUGH12 simple answer
Igorbunow Aug 6, 2021
bafbdad
Fix MAX_LUN value
Igorbunow Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc/usbd_msc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ extern "C" {
#define BOT_RESET 0xFF
#define USB_MSC_CONFIG_DESC_SIZ 32

#define MSC_BOT_MAX_LUN 0x10

#define MSC_EPIN_ADDR 0x81U
#define MSC_EPOUT_ADDR 0x01U
Expand Down Expand Up @@ -82,25 +83,31 @@ typedef struct _USBD_STORAGE

typedef struct
{
uint32_t max_lun;
uint32_t interface;
uint8_t bot_state;
uint8_t bot_status;
uint32_t bot_data_length;
uint8_t bot_data[MSC_MEDIA_PACKET];
USBD_MSC_BOT_CBWTypeDef cbw;
USBD_MSC_BOT_CSWTypeDef csw;

USBD_SCSI_SenseTypeDef scsi_sense [SENSE_LIST_DEEPTH];
uint8_t scsi_sense_head;
uint8_t scsi_sense_tail;
uint8_t scsi_medium_state;

uint16_t scsi_blk_size;
uint32_t scsi_blk_nbr;

uint32_t scsi_blk_addr;
uint32_t scsi_blk_len;
uint16_t size;
uint32_t nbr;
uint32_t addr;
uint32_t len;
}
USBD_LUN_BLK_HandleTypeDef;

typedef struct
{
uint32_t max_lun;
uint32_t interface;
uint8_t bot_state;
uint8_t bot_status;
uint32_t bot_data_length;
uint8_t bot_data[MSC_MEDIA_PACKET];
USBD_MSC_BOT_CBWTypeDef cbw;
USBD_MSC_BOT_CSWTypeDef csw;

USBD_SCSI_SenseTypeDef scsi_sense [SENSE_LIST_DEEPTH];
uint8_t scsi_sense_head;
uint8_t scsi_sense_tail;
uint8_t scsi_medium_state;

USBD_LUN_BLK_HandleTypeDef scsi_blk[MSC_BOT_MAX_LUN];

}
USBD_MSC_BOT_HandleTypeDef;

Expand Down
5 changes: 5 additions & 0 deletions Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc/usbd_msc_scsi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ extern "C" {
#define SCSI_SEND_DIAGNOSTIC 0x1DU
#define SCSI_READ_FORMAT_CAPACITIES 0x23U

#define SCSI_REPORT_LUNS12 0xA0U
#define SCSI_LOG_SENSE10 0x4DU
#define SCSI_RECEIVE_DIAGNOSTIC8 0x1CU
#define SCSI_ATA_PASSTHROUGH12 0xA1U

#define NO_SENSE 0U
#define RECOVERED_ERROR 1U
#define NOT_READY 2U
Expand Down
1 change: 1 addition & 0 deletions Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Src/usbd_msc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@ uint8_t USBD_MSC_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
((req->bmRequest & 0x80U) == 0x80U))
{
hmsc->max_lun = (uint32_t)((USBD_StorageTypeDef *)pdev->pUserData)->GetMaxLun();
hmsc->max_lun = (hmsc->max_lun > MSC_BOT_MAX_LUN) ? MSC_BOT_MAX_LUN : hmsc->max_lun;
(void)USBD_CtlSendData(pdev, (uint8_t *)&hmsc->max_lun, 1U);
}
else
Expand Down
2 changes: 1 addition & 1 deletion Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Src/usbd_msc_bot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ static void MSC_BOT_CBW_Decode(USBD_HandleTypeDef *pdev)

if ((USBD_LL_GetRxDataSize(pdev, MSC_EPOUT_ADDR) != USBD_BOT_CBW_LENGTH) ||
(hmsc->cbw.dSignature != USBD_BOT_CBW_SIGNATURE) ||
(hmsc->cbw.bLUN > 1U) || (hmsc->cbw.bCBLength < 1U) ||
(hmsc->cbw.bLUN > hmsc->max_lun) || (hmsc->cbw.bCBLength < 1U) ||
(hmsc->cbw.bCBLength > 16U))
{
SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
Expand Down
Loading