Skip to content

Commit

Permalink
ESP32-S3: USB MSC cleanup [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
@lyusupov
lyusupov committed Nov 24, 2023
1 parent c9355d3 commit bcdb3d0
Showing 1 changed file with 52 additions and 159 deletions.
211 changes: 52 additions & 159 deletions software/firmware/source/SoftRF/src/platform/ESP32.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1034,58 +1034,6 @@ static void ESP32_setup()
lmic_pins.rst = SOC_GPIO_PIN_S3_RST;
lmic_pins.busy = SOC_GPIO_PIN_S3_BUSY;

ESP32_has_spiflash = SPIFlash->begin(possible_devices,
EXTERNAL_FLASH_DEVICE_COUNT);
if (ESP32_has_spiflash) {
spiflash_id = SPIFlash->getJEDECID();

uint32_t capacity = spiflash_id & 0xFF;
if (capacity >= 0x17) { /* equal or greater than 1UL << 23 (8 MiB) */
hw_info.storage = STORAGE_FLASH;

#if CONFIG_TINYUSB_MSC_ENABLED
#if defined(USE_ADAFRUIT_MSC)
// Set disk vendor id, product id and revision
// with string up to 8, 16, 4 characters respectively
usb_msc.setID(ESP32SX_Device_Manufacturer, "Internal Flash", "1.0");

// Set callback
usb_msc.setReadWriteCallback(ESP32_msc_read_cb,
ESP32_msc_write_cb,
ESP32_msc_flush_cb);

// Set disk size, block size should be 512 regardless of spi flash page size
usb_msc.setCapacity(SPIFlash->size()/512, 512);

// MSC is ready for read/write
usb_msc.setUnitReady(true);

usb_msc.begin();

#else

// Set disk vendor id, product id and revision
// with string up to 8, 16, 4 characters respectively
usb_msc.vendorID(ESP32SX_Device_Manufacturer);
usb_msc.productID("Internal Flash");
usb_msc.productRevision("1.0");

// Set callback
usb_msc.onRead(ESP32_msc_read_cb);
usb_msc.onWrite(ESP32_msc_write_cb);

// MSC is ready for read/write
usb_msc.mediaPresent(true);

// Set disk size, block size should be 512 regardless of spi flash page size
usb_msc.begin(SPIFlash->size()/512, 512);
#endif /* USE_ADAFRUIT_MSC */
#endif /* CONFIG_TINYUSB_MSC_ENABLED */

FATFS_is_mounted = fatfs.begin(SPIFlash);
}
}

int uSD_SS_pin = (esp32_board == ESP32_S3_DEVKIT) ?
SOC_GPIO_PIN_S3_SD_SS_DK : SOC_GPIO_PIN_S3_SD_SS_TBEAM;

Expand All @@ -1100,11 +1048,6 @@ static void ESP32_setup()

uSD_is_attached = uSD.cardBegin(SD_CONFIG);

if (uSD_is_attached && uSD.card()->cardSize() > 0) {
hw_info.storage = (hw_info.storage == STORAGE_FLASH) ?
STORAGE_FLASH_AND_CARD : STORAGE_CARD;
}

} else if (hw_info.model == SOFTRF_MODEL_HAM) {
Wire.begin(SOC_GPIO_PIN_TWR2_SDA , SOC_GPIO_PIN_TWR2_SCL);
Wire.beginTransmission(AXP2101_SLAVE_ADDRESS);
Expand Down Expand Up @@ -1184,58 +1127,6 @@ static void ESP32_setup()
SOC_GPIO_PIN_TWR2_CONS_TX);
#endif /* ARDUINO_USB_CDC_ON_BOOT */

ESP32_has_spiflash = SPIFlash->begin(possible_devices,
EXTERNAL_FLASH_DEVICE_COUNT);
if (ESP32_has_spiflash) {
spiflash_id = SPIFlash->getJEDECID();

uint32_t capacity = spiflash_id & 0xFF;
if (capacity >= 0x18) { /* equal or greater than 1UL << 24 (16 MiB) */
hw_info.storage = STORAGE_FLASH;

#if CONFIG_TINYUSB_MSC_ENABLED
#if defined(USE_ADAFRUIT_MSC)
// Set disk vendor id, product id and revision
// with string up to 8, 16, 4 characters respectively
usb_msc.setID(ESP32SX_Device_Manufacturer, "Internal Flash", "1.0");

// Set callback
usb_msc.setReadWriteCallback(ESP32_msc_read_cb,
ESP32_msc_write_cb,
ESP32_msc_flush_cb);

// Set disk size, block size should be 512 regardless of spi flash page size
usb_msc.setCapacity(SPIFlash->size()/512, 512);

// MSC is ready for read/write
usb_msc.setUnitReady(true);

usb_msc.begin();

#else

// Set disk vendor id, product id and revision
// with string up to 8, 16, 4 characters respectively
usb_msc.vendorID(ESP32SX_Device_Manufacturer);
usb_msc.productID("Internal Flash");
usb_msc.productRevision("1.0");

// Set callback
usb_msc.onRead(ESP32_msc_read_cb);
usb_msc.onWrite(ESP32_msc_write_cb);

// MSC is ready for read/write
usb_msc.mediaPresent(true);

// Set disk size, block size should be 512 regardless of spi flash page size
usb_msc.begin(SPIFlash->size()/512, 512);
#endif /* USE_ADAFRUIT_MSC */
#endif /* CONFIG_TINYUSB_MSC_ENABLED */

FATFS_is_mounted = fatfs.begin(SPIFlash);
}
}

if (esp32_board == ESP32_LILYGO_T_TWR_V2_0) {
int uSD_SS_pin = SOC_GPIO_PIN_TWR2_SD_SS;

Expand All @@ -1249,11 +1140,6 @@ static void ESP32_setup()
digitalWrite(uSD_SS_pin, HIGH);

uSD_is_attached = uSD.cardBegin(SD_CONFIG);

if (uSD_is_attached && uSD.card()->cardSize() > 0) {
hw_info.storage = (hw_info.storage == STORAGE_FLASH) ?
STORAGE_FLASH_AND_CARD : STORAGE_CARD;
}
}
} else if (hw_info.model == SOFTRF_MODEL_MIDI) {

Expand All @@ -1267,71 +1153,78 @@ static void ESP32_setup()
lmic_pins.rst = SOC_GPIO_PIN_HELTRK_RST;
lmic_pins.busy = SOC_GPIO_PIN_HELTRK_BUSY;

ESP32_has_spiflash = SPIFlash->begin(possible_devices,
EXTERNAL_FLASH_DEVICE_COUNT);
if (ESP32_has_spiflash) {
spiflash_id = SPIFlash->getJEDECID();
#endif /* CONFIG_IDF_TARGET_ESP32S3 */

uint32_t capacity = spiflash_id & 0xFF;
if (capacity >= 0x17) { /* equal or greater than 1UL << 23 (8 MiB) */
hw_info.storage = STORAGE_FLASH;
#if defined(CONFIG_IDF_TARGET_ESP32C3)
} else if (esp32_board == ESP32_C3_DEVKIT) {

lmic_pins.nss = SOC_GPIO_PIN_C3_SS;
lmic_pins.rst = LMIC_UNUSED_PIN;
lmic_pins.busy = SOC_GPIO_PIN_C3_TXE;

/* TBD */

#endif /* CONFIG_IDF_TARGET_ESP32C3 */
}

#if defined(CONFIG_IDF_TARGET_ESP32S3)
ESP32_has_spiflash = SPIFlash->begin(possible_devices,
EXTERNAL_FLASH_DEVICE_COUNT);
if (ESP32_has_spiflash) {
spiflash_id = SPIFlash->getJEDECID();

uint32_t capacity = spiflash_id & 0xFF;
if (capacity >= 0x17) { /* equal or greater than 1UL << 23 (8 MiB) */
hw_info.storage = STORAGE_FLASH;

#if CONFIG_TINYUSB_MSC_ENABLED
#if defined(USE_ADAFRUIT_MSC)
// Set disk vendor id, product id and revision
// with string up to 8, 16, 4 characters respectively
usb_msc.setID(ESP32SX_Device_Manufacturer, "Internal Flash", "1.0");
// Set disk vendor id, product id and revision
// with string up to 8, 16, 4 characters respectively
usb_msc.setID(ESP32SX_Device_Manufacturer, "Internal Flash", "1.0");

// Set callback
usb_msc.setReadWriteCallback(ESP32_msc_read_cb,
ESP32_msc_write_cb,
ESP32_msc_flush_cb);
// Set callback
usb_msc.setReadWriteCallback(ESP32_msc_read_cb,
ESP32_msc_write_cb,
ESP32_msc_flush_cb);

// Set disk size, block size should be 512 regardless of spi flash page size
usb_msc.setCapacity(SPIFlash->size()/512, 512);
// Set disk size, block size should be 512 regardless of spi flash page size
usb_msc.setCapacity(SPIFlash->size()/512, 512);

// MSC is ready for read/write
usb_msc.setUnitReady(true);
// MSC is ready for read/write
usb_msc.setUnitReady(true);

usb_msc.begin();
usb_msc.begin();

#else

// Set disk vendor id, product id and revision
// with string up to 8, 16, 4 characters respectively
usb_msc.vendorID(ESP32SX_Device_Manufacturer);
usb_msc.productID("Internal Flash");
usb_msc.productRevision("1.0");
// Set disk vendor id, product id and revision
// with string up to 8, 16, 4 characters respectively
usb_msc.vendorID(ESP32SX_Device_Manufacturer);
usb_msc.productID("Internal Flash");
usb_msc.productRevision("1.0");

// Set callback
usb_msc.onRead(ESP32_msc_read_cb);
usb_msc.onWrite(ESP32_msc_write_cb);
// Set callback
usb_msc.onRead(ESP32_msc_read_cb);
usb_msc.onWrite(ESP32_msc_write_cb);

// MSC is ready for read/write
usb_msc.mediaPresent(true);
// MSC is ready for read/write
usb_msc.mediaPresent(true);

// Set disk size, block size should be 512 regardless of spi flash page size
usb_msc.begin(SPIFlash->size()/512, 512);
// Set disk size, block size should be 512 regardless of spi flash page size
usb_msc.begin(SPIFlash->size()/512, 512);
#endif /* USE_ADAFRUIT_MSC */
#endif /* CONFIG_TINYUSB_MSC_ENABLED */

FATFS_is_mounted = fatfs.begin(SPIFlash);
}
FATFS_is_mounted = fatfs.begin(SPIFlash);
}
}

#endif /* CONFIG_IDF_TARGET_ESP32S3 */

#if defined(CONFIG_IDF_TARGET_ESP32C3)
} else if (esp32_board == ESP32_C3_DEVKIT) {

lmic_pins.nss = SOC_GPIO_PIN_C3_SS;
lmic_pins.rst = LMIC_UNUSED_PIN;
lmic_pins.busy = SOC_GPIO_PIN_C3_TXE;

/* TBD */

#endif /* CONFIG_IDF_TARGET_ESP32C3 */
if (uSD_is_attached && uSD.card()->cardSize() > 0) {
hw_info.storage = (hw_info.storage == STORAGE_FLASH) ?
STORAGE_FLASH_AND_CARD : STORAGE_CARD;
}
#endif /* CONFIG_IDF_TARGET_ESP32S3 */

#if ARDUINO_USB_CDC_ON_BOOT && \
(defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3))
Expand Down

0 comments on commit bcdb3d0

Please sign in to comment.