USB mass storage device support improved

USB mass storage device support did not work with some drives.
Should be better now.

USBBulkOnlyMassStorageDeviceGetCapacity() added

FIXED: Wrong assert() in lib/usbstring.c

Author: maccasoft

kernel/syscalls.c

@@ -475,7 +475,7 @@ DRESULT disk_ioctl (
             }
             if (cmd == GET_SECTOR_COUNT)
             {
-                *(DWORD *)buff = 340000; // TODO: Get real number of blocks
+                *(DWORD *)buff = USPiMassStorageDeviceGetCapacity(pdrv - USB);
                 return RES_OK;
             }
             if (cmd == GET_SECTOR_SIZE)

uspi/include/uspi.h

@@ -117,6 +117,9 @@ int USPiMassStorageDeviceRead (unsigned long long ullOffset, void *pBuffer, unsi
 // nDeviceIndex is 0-based
 int USPiMassStorageDeviceWrite (unsigned long long ullOffset, const void *pBuffer, unsigned nCount, unsigned nDeviceIndex);
 
+// returns the number of available blocks of USPI_BLOCK_SIZE or 0 on failure
+unsigned USPiMassStorageDeviceGetCapacity (unsigned nDeviceIndex);
+
 //
 // Ethernet services
 //

uspi/include/uspi/usbmassdevice.h

@@ -42,6 +42,7 @@ typedef struct TUSBBulkOnlyMassStorageDevice
 	TUSBEndpoint *m_pEndpointOut;
 
 	unsigned m_nCWBTag;
+	unsigned m_nBlockCount;
 	unsigned long long m_ullOffset;
 }
 TUSBBulkOnlyMassStorageDevice;
@@ -56,6 +57,8 @@ int USBBulkOnlyMassStorageDeviceWrite (TUSBBulkOnlyMassStorageDevice *pThis, con
 
 unsigned long long USBBulkOnlyMassStorageDeviceSeek (TUSBBulkOnlyMassStorageDevice *pThis, unsigned long long ullOffset);
 
+unsigned USBBulkOnlyMassStorageDeviceGetCapacity (TUSBBulkOnlyMassStorageDevice *pThis);
+
 #ifdef __cplusplus
 }
 #endif