diff options
| author | Adrian Hesketh <[email protected]> | 2021-08-26 15:44:50 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-08-26 15:44:50 +0100 |
| commit | 138e77f3b575d641e07a9f068790ba2d854c6061 (patch) | |
| tree | bf7d6f6d840d6540026c4d000ad5ed2cc612c2b3 /src/class/msc | |
| parent | 49bcbf0f5dc57cb11b77800ae7b31ea5e91ab18f (diff) | |
| parent | 8d97f0e81f775d8c7646dfc75ee59b7e938bbf8d (diff) | |
Merge branch 'hathach:master' into master
Diffstat (limited to 'src/class/msc')
| -rw-r--r-- | src/class/msc/msc_host.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c index f02f4550a..8069353cd 100644 --- a/src/class/msc/msc_host.c +++ b/src/class/msc/msc_host.c @@ -69,13 +69,14 @@ typedef struct msc_csw_t csw; }msch_interface_t; -CFG_TUSB_MEM_SECTION static msch_interface_t _msch_itf[CFG_TUSB_HOST_DEVICE_MAX]; +CFG_TUSB_MEM_SECTION static msch_interface_t _msch_itf[CFG_TUH_DEVICE_MAX]; // buffer used to read scsi information when mounted // largest response data currently is inquiry TODO Inquiry is not part of enum anymore CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(4) static uint8_t _msch_buffer[sizeof(scsi_inquiry_resp_t)]; +TU_ATTR_ALWAYS_INLINE static inline msch_interface_t* get_itf(uint8_t dev_addr) { return &_msch_itf[dev_addr-1]; @@ -291,11 +292,13 @@ bool tuh_msc_reset(uint8_t dev_addr) //--------------------------------------------------------------------+ void msch_init(void) { - tu_memclr(_msch_itf, sizeof(msch_interface_t)*CFG_TUSB_HOST_DEVICE_MAX); + tu_memclr(_msch_itf, sizeof(_msch_itf)); } void msch_close(uint8_t dev_addr) { + TU_VERIFY(dev_addr <= CFG_TUH_DEVICE_MAX, ); + msch_interface_t* p_msc = get_itf(dev_addr); // invoke Application Callback |