summaryrefslogtreecommitdiff
path: root/nuttx/drivers/usbdev
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-06-20 20:54:45 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-06-20 20:54:45 +0000
commitd30d34a6c826747aa920cb5495a635cb758858a0 (patch)
tree65e2d9fba872a4c59786de4c1a478b77767c5bcf /nuttx/drivers/usbdev
parente23fb305e00f5c2cca3d5eaa898c556030e92076 (diff)
downloadpx4-nuttx-d30d34a6c826747aa920cb5495a635cb758858a0.tar.gz
px4-nuttx-d30d34a6c826747aa920cb5495a635cb758858a0.tar.bz2
px4-nuttx-d30d34a6c826747aa920cb5495a635cb758858a0.zip
Fix AVR warnings; FAT FS needs to use off_t instead of size_t
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3728 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/usbdev')
-rw-r--r--nuttx/drivers/usbdev/usbdev_scsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/drivers/usbdev/usbdev_scsi.c b/nuttx/drivers/usbdev/usbdev_scsi.c
index 3d5201209..a0bbf8c2a 100644
--- a/nuttx/drivers/usbdev/usbdev_scsi.c
+++ b/nuttx/drivers/usbdev/usbdev_scsi.c
@@ -463,7 +463,7 @@ static inline int usbstrg_cmdread6(FAR struct usbstrg_dev_s *priv)
{
/* Get the Logical Block Address (LBA) from cdb[] as the starting sector */
- priv->sector = (read6->mslba & SCSICMD_READ6_MSLBAMASK) << 16 | usbstrg_getbe16(read6->lslba);
+ priv->sector = (uint32_t)(read6->mslba & SCSICMD_READ6_MSLBAMASK) << 16 | (uint32_t)usbstrg_getbe16(read6->lslba);
/* Verify that a block driver has been bound to the LUN */
@@ -519,7 +519,7 @@ static inline int usbstrg_cmdwrite6(FAR struct usbstrg_dev_s *priv)
{
/* Get the Logical Block Address (LBA) from cdb[] as the starting sector */
- priv->sector = (write6->mslba & SCSICMD_WRITE6_MSLBAMASK) << 16 | usbstrg_getbe16(write6->lslba);
+ priv->sector = (uint32_t)(write6->mslba & SCSICMD_WRITE6_MSLBAMASK) << 16 | (uint32_t)usbstrg_getbe16(write6->lslba);
/* Verify that a block driver has been bound to the LUN */